From 4ac34013b31419f6fe438008db2528b20bd9e6a0 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 23 Aug 2020 23:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E4=BD=BF=E7=94=A8=20=5F=5Fajax=3Djson?=
 =?UTF-8?q?=20=E5=8F=82=E6=95=B0=E7=9A=84=E6=97=B6=E5=80=99=20403=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E=E7=A9=BA=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/common/web/http/ServletUtils.java    | 4 +++-
 modules/core/src/main/resources/config/jeesite-core.yml   | 6 ++++--
 modules/core/src/main/resources/views/error/403.html      | 8 +++-----
 3 files changed, 10 insertions(+), 8 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 9ada8e4f..9061a505 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
@@ -362,7 +362,9 @@ public class ServletUtils {
 					type = MediaType.TEXT_PLAIN_VALUE;
 				}
 			}
-			response.setContentType(type);
+			if (type != null) {
+				response.setContentType(type);
+			}
 			response.getWriter().print(string);
 		} catch (IOException e) {
 			e.printStackTrace();
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index d1cdc7cc..d96070fd 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -505,10 +505,12 @@ web:
     # 使用智能参数接收器，同时支持 JSON 和 FormData 的参数接受
     smartMethodArgumentResolver: true
     
-    # 使用 .json、.xml 后缀匹配视图（不推荐使用，推荐使用 favorParameter）
+    # 使用 .json、.xml 后缀匹配返回视图数据（Spring官方已不推荐使用）
     favorPathExtension: false
-    # 使用 __ajax=json、__ajax=xml 参数名匹配视图
+    # 使用 __ajax=json、__ajax=xml 后缀匹配返回视图数据
     favorParameter: true
+    # 使用 __ajax=json、__ajax=xml 请求头匹配返回视图数据
+    favorHeader: true
 
   # MVC 拦截器
   interceptor:
diff --git a/modules/core/src/main/resources/views/error/403.html b/modules/core/src/main/resources/views/error/403.html
index 96e99a76..0b5e80b8 100644
--- a/modules/core/src/main/resources/views/error/403.html
+++ b/modules/core/src/main/resources/views/error/403.html
@@ -6,11 +6,9 @@ var message = @ObjectUtils.toString(@request.getAttribute("message"));
 if (isBlank(message)){
 	var ex = @ExceptionUtils.getThrowable(request);
 	if (ex != null){
-		for (e in [ex, ex.cause!, ex.cause.cause!]){
-			if (@StringUtils.startsWith(e.message!, "msg:")){
-				message = @StringUtils.replace(e.message!, "msg:", "");
-				break;
-			}
+		var m = @ExceptionUtils.getExceptionMessage(ex);
+		if (isNotBlank(m)){
+			message = m;
 		}
 	}
 }