From 00e40ce8b1de4da44d427a80f46d69fb90a9c075 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 18 七月 2022 09:02:10 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java
index a8493d2..7f2c413 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java
@@ -5,8 +5,12 @@
import com.gkhy.safePlatform.commons.exception.AusinessException;
import com.gkhy.safePlatform.commons.exception.BusinessException;
import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -16,6 +20,15 @@
private final Logger logger = LoggerFactory.getLogger(this.getClass());
+ /**
+ * 应急预案自定义异常
+ */
+ @ResponseBody
+ @ExceptionHandler(value = EmergencyException.class)
+ public ResultVO AHandler(EmergencyException e) {
+ logger.warn(e.getMessage());
+ return new ResultVO(e.getCode(),e.getMessage());
+ }
/**
* 自定义异常
@@ -35,7 +48,46 @@
@ExceptionHandler(value = BusinessException.class)
public ResultVO AHandler(BusinessException e) {
logger.warn(e.getMessage());
- return new ResultVO(e.getError());
+ return new ResultVO(e.getCode(),e.getMessage());
+ }
+
+
+ /**
+ * @Description: AuthenticationException
+ */
+
+ @ResponseBody
+ @ExceptionHandler(value = AuthenticationException.class)
+ public ResultVO CHandler(AuthenticationException e) {
+ logger.warn(e.getMessage());
+ return new ResultVO(ResultCodes.CLIENT_PERMISSION_NOT_ALLOW);
+ }
+
+
+ /**
+ * @Description: AuthenticationException
+ */
+
+ @ResponseBody
+ @ExceptionHandler(value = AccessDeniedException.class)
+ public ResultVO DHandler(AccessDeniedException e) {
+ logger.warn(e.getMessage());
+ return new ResultVO(ResultCodes.CLIENT_PERMISSION_NOT_ALLOW);
+
+ }
+
+
+ /**
+ * @Description: 请求方法
+ */
+ @ResponseBody
+ @ExceptionHandler(value = HttpRequestMethodNotSupportedException.class)
+ public ResultVO DHandler(HttpRequestMethodNotSupportedException e) {
+ ResultVO resultVO = new ResultVO();
+ resultVO.setCode(ResultCodes.CLIENT_METHOD_NOT_MATCH.getCode());
+ resultVO.setMsg(e.getMessage());
+ return resultVO;
+
}
/**
--
Gitblit v1.9.2