From aeeb0eb26b609dae87da13ef23678d5a0b728453 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 06 Aug 2021 17:52:44 +0800
Subject: [PATCH] 字典工具类更换路径
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java | 55 +++++++++++++++++++++----------------------------------
1 files changed, 21 insertions(+), 34 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 ac1ae39..08eb8b7 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
@@ -2,18 +2,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.authentication.AccountExpiredException;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.validation.BindException;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.servlet.NoHandlerFoundException;
-import com.ruoyi.common.core.constant.HttpStatus;
import com.ruoyi.common.core.exception.BaseException;
import com.ruoyi.common.core.exception.CustomException;
import com.ruoyi.common.core.exception.DemoModeException;
+import com.ruoyi.common.core.exception.InnerAuthException;
+import com.ruoyi.common.core.exception.PreAuthorizeException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -33,7 +30,7 @@
@ExceptionHandler(BaseException.class)
public AjaxResult baseException(BaseException e)
{
- return AjaxResult.error(e.getMessage());
+ return AjaxResult.error(e.getDefaultMessage());
}
/**
@@ -47,34 +44,6 @@
return AjaxResult.error(e.getMessage());
}
return AjaxResult.error(e.getCode(), e.getMessage());
- }
-
- @ExceptionHandler(NoHandlerFoundException.class)
- public AjaxResult handlerNoFoundException(Exception e)
- {
- log.error(e.getMessage(), e);
- return AjaxResult.error(HttpStatus.NOT_FOUND, "路径不存在，请检查路径是否正确");
- }
-
- @ExceptionHandler(AccessDeniedException.class)
- public AjaxResult handleAuthorizationException(AccessDeniedException e)
- {
- log.error(e.getMessage());
- return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
- }
-
- @ExceptionHandler(AccountExpiredException.class)
- public AjaxResult handleAccountExpiredException(AccountExpiredException e)
- {
- log.error(e.getMessage(), e);
- return AjaxResult.error(e.getMessage());
- }
-
- @ExceptionHandler(UsernameNotFoundException.class)
- public AjaxResult handleUsernameNotFoundException(UsernameNotFoundException e)
- {
- log.error(e.getMessage(), e);
- return AjaxResult.error(e.getMessage());
}
@ExceptionHandler(Exception.class)
@@ -107,6 +76,24 @@
}
/**
+ * 权限异常
+ */
+ @ExceptionHandler(PreAuthorizeException.class)
+ public AjaxResult preAuthorizeException(PreAuthorizeException e)
+ {
+ return AjaxResult.error("没有权限，请联系管理员授权");
+ }
+
+ /**
+ * 内部认证异常
+ */
+ @ExceptionHandler(InnerAuthException.class)
+ public AjaxResult InnerAuthException(InnerAuthException e)
+ {
+ return AjaxResult.error(e.getMessage());
+ }
+
+ /**
* 演示模式异常
*/
@ExceptionHandler(DemoModeException.class)
--
Gitblit v1.9.3