From de77f34353ad5e15db05e828b9b270aceb4be0c1 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 14 Jan 2020 18:02:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8F=90=E9=86=92=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=B6=88=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/web/http/ServletUtils.java   | 13 ++++++++++++-
 .../core/src/main/resources/views/error/500.html    |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
index fb232faa..74dc8dfa 100644
--- a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
+++ b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
@@ -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);
diff --git a/modules/core/src/main/resources/views/error/500.html b/modules/core/src/main/resources/views/error/500.html
index 69d0cbf6..11189e19 100644
--- a/modules/core/src/main/resources/views/error/500.html
+++ b/modules/core/src/main/resources/views/error/500.html
@@ -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/>