From e17d5db0fb5fd5cc7e0d1ad5d7dda3407c952026 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 26 Aug 2024 22:06:14 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA=E5=8E=9F?=
 =?UTF-8?q?=E7=94=9F=E5=BC=82=E5=B8=B8=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/config/exception/GlobalExceptionHandler.java     | 4 ++--
 .../config/exception/GlobalSaTokenExceptionHandler.java     | 6 +++---
 .../src/main/resources/config/application.yml               | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java
index a7e520d3..4a63d8f8 100644
--- a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java
+++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java
@@ -54,7 +54,7 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(BadRequestException.class)
     public R handleBadRequestException(BadRequestException e, HttpServletRequest request) {
-        log.warn("请求地址 [{}]，自定义验证失败。", request.getRequestURI(), e);
+        log.error("请求地址 [{}]，自定义验证失败。", request.getRequestURI(), e);
         return R.fail(String.valueOf(HttpStatus.BAD_REQUEST.value()), e.getMessage());
     }
 
@@ -81,7 +81,7 @@ public class GlobalExceptionHandler {
             return defaultFail;
         }
         String errorMsg = "请上传小于 %sKB 的文件".formatted(NumberUtil.parseLong(sizeLimit) / 1024);
-        log.warn("请求地址 [{}]，上传文件失败，文件大小超过限制。", request.getRequestURI(), e);
+        log.error("请求地址 [{}]，上传文件失败，文件大小超过限制。", request.getRequestURI(), e);
         return R.fail(String.valueOf(HttpStatus.BAD_REQUEST.value()), errorMsg);
     }
 }
\ No newline at end of file
diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java
index 9b09b3fe..cd94f82f 100644
--- a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java
+++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java
@@ -45,9 +45,9 @@ public class GlobalSaTokenExceptionHandler {
     public R handleNotLoginException(NotLoginException e, HttpServletRequest request) {
         log.error("请求地址 [{}]，认证失败，无法访问系统资源。", request.getRequestURI(), e);
         String errorMsg = switch (e.getType()) {
-            case NotLoginException.KICK_OUT -> "您已被踢下线。";
-            case NotLoginException.BE_REPLACED_MESSAGE -> "您已被顶下线。";
-            default -> "您的登录状态已过期，请重新登录。";
+            case NotLoginException.KICK_OUT -> "您已被踢下线";
+            case NotLoginException.BE_REPLACED_MESSAGE -> "您已被顶下线";
+            default -> "您的登录状态已过期，请重新登录";
         };
         return R.fail(String.valueOf(HttpStatus.UNAUTHORIZED.value()), errorMsg);
     }
diff --git a/continew-admin-webapi/src/main/resources/config/application.yml b/continew-admin-webapi/src/main/resources/config/application.yml
index 6490131b..90b453ff 100644
--- a/continew-admin-webapi/src/main/resources/config/application.yml
+++ b/continew-admin-webapi/src/main/resources/config/application.yml
@@ -61,6 +61,8 @@ continew-starter.web:
     default-error-code: 1
     # 自定义失败提示（默认：error）
     default-error-msg: error
+    # 是否将原生异常错误信息填充到状态信息中
+    origin-exception-using-detail-message: false
 
 --- ### 接口文档配置
 springdoc: