From fa06e9ec7a8106a450c6ef26edbf73a276cc5854 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 28 五月 2024 17:35:03 +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 | 14 ++++++++++++--
1 files changed, 12 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..fa88c03 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,12 +1,14 @@
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;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.exception.auth.NotPermissionException;
import com.ruoyi.common.core.exception.auth.NotRoleException;
+import com.ruoyi.common.core.exception.user.StudyLoginException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import org.slf4j.Logger;
@@ -143,8 +145,16 @@
* 捕获全局自定义异常
*/
@ExceptionHandler(GlobalException.class)
- public AjaxResult globalExceptionHandler(GlobalException e) {
- return AjaxResult.error(e.getMessage());
+ public R<String> globalExceptionHandler(GlobalException e) {
+ return R.fail(e.getMessage());
+ }
+
+ /**
+ * 学生端单点登录-异常信息
+ */
+ @ExceptionHandler(StudyLoginException.class)
+ public R<String> studyLoginExceptionHandler(StudyLoginException e) {
+ return R.fail(e.getCode(), e.getMessage());
}
}
--
Gitblit v1.7.1