manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正 beetl3.0 不兼容问题 ex.class.name 修改为 type.fullName(ex)

Browse Source
This commit is contained in:
thinkgem
2019-09-11 21:06:23 +08:00
parent 0ff6238609
commit 2fd5f1356e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/main/resources/config/beetl-core.properties
View File

@@ -83,6 +83,7 @@ FN.json = org.beetl.ext.fn.Json
FN.pageCtx = org.beetl.ext.fn.PageContextFunction FN.pageCtx = org.beetl.ext.fn.PageContextFunction
FN.type.new=org.beetl.ext.fn.TypeNewFunction FN.type.new=org.beetl.ext.fn.TypeNewFunction
FN.type.name=org.beetl.ext.fn.TypeNameFunction FN.type.name=org.beetl.ext.fn.TypeNameFunction
FN.type.fullName=com.jeesite.common.beetl.ext.fn.TypeFullNameFunction
FN.global=org.beetl.ext.fn.DynamicGlobalValueFunction FN.global=org.beetl.ext.fn.DynamicGlobalValueFunction
FN.allGlobal=org.beetl.ext.fn.AllGlobaAsJsonlFunction FN.allGlobal=org.beetl.ext.fn.AllGlobaAsJsonlFunction
FN.hasAttribute=org.beetl.ext.fn.HasAttributeFunction FN.hasAttribute=org.beetl.ext.fn.HasAttributeFunction

4
modules/core/src/main/resources/views/error/400.html
View File

@@ -8,14 +8,14 @@ if (isBlank(message)){
if (ex != null){ if (ex != null){
if(@StringUtils.startsWith(@ex.getMessage(), 'msg:')){ if(@StringUtils.startsWith(@ex.getMessage(), 'msg:')){
message = @StringUtils.replace(@ex.getMessage(), 'msg:', ''); message = @StringUtils.replace(@ex.getMessage(), 'msg:', '');
}else if (ex.class.name == 'org.springframework.validation.BindException'){ }else if (type.fullName(ex) == 'org.springframework.validation.BindException'){
for (var e in ex.globalErrors){ for (var e in ex.globalErrors){
message = message + '☆' + e.defaultMessage + '(' + e.objectName + ')<br/>'; message = message + '☆' + e.defaultMessage + '(' + e.objectName + ')<br/>';
} }
for (var e in ex.fieldErrors){ for (var e in ex.fieldErrors){
message = message + '☆' + e.defaultMessage + '(' + e.field + ')<br/>'; message = message + '☆' + e.defaultMessage + '(' + e.field + ')<br/>';
} }
}else if (ex.class.name == 'javax.validation.ConstraintViolationException'){ }else if (type.fullName(ex) == 'javax.validation.ConstraintViolationException'){
for (var v in ex.constraintViolations) { for (var v in ex.constraintViolations) {
message = message + '☆' + v.message + '(' + v.propertyPath + ')<br/>'; message = message + '☆' + v.message + '(' + v.propertyPath + ')<br/>';
} }

2
modules/core/src/main/resources/views/error/500.html
View File

@@ -11,7 +11,7 @@ if (isBlank(message)){
if (@StringUtils.startsWith(e.message!, "msg:")){ if (@StringUtils.startsWith(e.message!, "msg:")){
message = @StringUtils.replace(e.message!, "msg:", ""); message = @StringUtils.replace(e.message!, "msg:", "");
break; break;
}else if (type.name(e) == 'ServiceException'){ }else if (type.fullName(e) == 'com.jeesite.common.service.ServiceException'){
message = e.message!; message = e.message!;
break; break;
} }