From 57145eb45c9b339eecc97a5037c60c2f8da8f8fd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 20:56:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
index df981c5..1e5aa4f 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.security.handler;
import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.DemoModeException;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.exception.InnerAuthException;
@@ -143,8 +144,8 @@
* 捕获全局自定义异常
*/
@ExceptionHandler(GlobalException.class)
- public AjaxResult globalExceptionHandler(GlobalException e) {
- return AjaxResult.error(e.getMessage());
+ public R<String> globalExceptionHandler(GlobalException e) {
+ return R.fail(e.getMessage());
}
}
--
Gitblit v1.7.1