From d559bd5704442eff7bcd70642574ff84992704f7 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 4 Oct 2019 12:29:14 +0800
Subject: [PATCH] =?UTF-8?q?500=E9=A1=B5=E9=9D=A2=EF=BC=8Cjson=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=94=AF=E6=8C=81=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/views/error/500.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/views/error/500.html b/modules/core/src/main/resources/views/error/500.html
index acf4186b..69d0cbf6 100644
--- a/modules/core/src/main/resources/views/error/500.html
+++ b/modules/core/src/main/resources/views/error/500.html
@@ -23,7 +23,12 @@ if (isBlank(message)){
 
 // 如果是异步请求或是手机端，则直接返回信息
 if (@ServletUtils.isAjaxRequest(request)) {
-	print(@ServletUtils.renderResult(@Global.FALSE, message));
+	if (@Global.getConfigToBoolean('error.page.printErrorInfo', 'true')
+			&& !@StringUtils.equals(message, "演示模式，不允许操作！") && ex != null){
+		print(@ServletUtils.renderResult(@Global.FALSE, message, @ExceptionUtils.getStackTraceAsString(ex)));
+	}else{
+		print(@ServletUtils.renderResult(@Global.FALSE, message));
+	}
 }
 
 // 输出异常信息页面