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

用户提醒异常消息优化

Browse Source
This commit is contained in:
thinkgem
2020-01-14 18:02:37 +08:00
parent 28aa05c24e
commit de77f34353
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
View File

@@ -23,6 +23,8 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import com.jeesite.common.collect.MapUtils;
import com.jeesite.common.io.PropertiesUtils;
import com.jeesite.common.lang.ExceptionUtils;
import com.jeesite.common.lang.ObjectUtils;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.mapper.JsonMapper;
import com.jeesite.common.mapper.XmlMapper;
@@ -184,7 +186,16 @@ public class ServletUtils {
resultMap.put("result", result);
resultMap.put("message", message);
if (data != null){
if (data instanceof Map){
if (data instanceof Throwable){
Throwable ex = (Throwable)data;
String exMsg = ExceptionUtils.getExceptionMessage(ex);
if (StringUtils.isNotBlank(exMsg)){
resultMap.put("message", message + "，" + exMsg);
}else if (ObjectUtils.toBoolean(PropertiesUtils.getInstance()
.getProperty("error.page.printErrorInfo", "true"))){
resultMap.put("message", message + "，" + ex.getMessage());
}
}else if (data instanceof Map){
resultMap.putAll((Map<String, Object>)data);
}else{
resultMap.put("data", data);

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

@@ -23,7 +23,7 @@ if (isBlank(message)){
// 如果是异步请求或是手机端，则直接返回信息
if (@ServletUtils.isAjaxRequest(request)) {
if (@Global.getConfigToBoolean('error.page.printErrorInfo', 'true')
if (@Global.getPropertyToBoolean('error.page.printErrorInfo', 'true')
&& !@StringUtils.equals(message, "演示模式，不允许操作！") && ex != null){
print(@ServletUtils.renderResult(@Global.FALSE, message, @ExceptionUtils.getStackTraceAsString(ex)));
}else{
@@ -49,7 +49,7 @@ else {
href="http://jeesite.com">JeeSite ${@Global.getProperty('jeesiteVersion')}</a>
</div>
</div>
<% if (@Global.getConfigToBoolean('error.page.printErrorInfo', 'true')
<% if (@Global.getPropertyToBoolean('error.page.printErrorInfo', 'true')
&& !@StringUtils.equals(message, "演示模式，不允许操作！")){ %>
<div class="box mt20">
${@StringUtils.toHtml(@ExceptionUtils.getStackTraceAsString(ex))}<br/>