From 6c6d875de1d0537acfa5edf4eb976e87625bd859 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 25 六月 2024 18:05:49 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..21e5861 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;
@@ -30,7 +32,7 @@
public class GlobalExceptionHandler {
private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
- @Value("${spring.servlet.multipart.max-file-size:4MB}")
+ @Value("${spring.servlet.multipart.max-file-size:500MB}")
private String maxFileSize;
@Value("${spring.servlet.multipart.max-request-size:100MB}")
private String maxRequestSize;
@@ -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