From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/core/aop/GlobalExceptionHandler.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/aop/GlobalExceptionHandler.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/aop/GlobalExceptionHandler.java
index c6311a0..4345012 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/aop/GlobalExceptionHandler.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/aop/GlobalExceptionHandler.java
@@ -7,23 +7,19 @@
import com.supersavedriving.driver.core.log.LogManager;
import com.supersavedriving.driver.core.log.factory.LogTaskFactory;
import com.supersavedriving.driver.core.shiro.ShiroKit;
+import com.supersavedriving.driver.core.support.HttpKit;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.CredentialsException;
import org.apache.shiro.authc.DisabledAccountException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
import org.springframework.http.HttpStatus;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import java.lang.reflect.UndeclaredThrowableException;
-
-import static com.supersavedriving.driver.core.support.HttpKit.getIp;
-import static com.supersavedriving.driver.core.support.HttpKit.getRequest;
/**
* 全局的的异常拦截器（拦截所有的控制器）（带有@RequestMapping注解的方法上都会拦截）
@@ -31,8 +27,8 @@
* @author fengshuonan
* @date 2016年11月12日 下午3:19:56
*/
-@ControllerAdvice
-@Order(-1)
+//@ControllerAdvice
+//@Order(-1)
public class GlobalExceptionHandler {
private Logger log = LoggerFactory.getLogger(this.getClass());
@@ -45,7 +41,7 @@
@ResponseBody
public ErrorTip notFount(GunsException e) {
LogManager.me().executeLog(LogTaskFactory.exceptionLog(ShiroKit.getUser().getId(), e));
- getRequest().setAttribute("tip", e.getMessage());
+ HttpKit.getRequest().setAttribute("tip", e.getMessage());
log.error("业务异常:", e);
return new ErrorTip(e.getCode(), e.getMessage());
}
@@ -66,8 +62,8 @@
@ExceptionHandler(DisabledAccountException.class)
@ResponseStatus(HttpStatus.UNAUTHORIZED)
public String accountLocked(DisabledAccountException e, Model model) {
- String username = getRequest().getParameter("username");
- LogManager.me().executeLog(LogTaskFactory.loginLog(username, "账号被冻结", getIp()));
+ String username = HttpKit.getRequest().getParameter("username");
+ LogManager.me().executeLog(LogTaskFactory.loginLog(username, "账号被冻结", HttpKit.getIp()));
model.addAttribute("tips", "账号被冻结");
return "/login.html";
}
@@ -78,8 +74,8 @@
@ExceptionHandler(CredentialsException.class)
@ResponseStatus(HttpStatus.UNAUTHORIZED)
public String credentials(CredentialsException e, Model model) {
- String username = getRequest().getParameter("username");
- LogManager.me().executeLog(LogTaskFactory.loginLog(username, "账号密码错误", getIp()));
+ String username = HttpKit.getRequest().getParameter("username");
+ LogManager.me().executeLog(LogTaskFactory.loginLog(username, "账号密码错误", HttpKit.getIp()));
model.addAttribute("tips", "账号密码错误");
return "/login.html";
}
@@ -90,8 +86,8 @@
@ExceptionHandler(InvalidKaptchaException.class)
@ResponseStatus(HttpStatus.BAD_REQUEST)
public String credentials(InvalidKaptchaException e, Model model) {
- String username = getRequest().getParameter("username");
- LogManager.me().executeLog(LogTaskFactory.loginLog(username, "验证码错误", getIp()));
+ String username = HttpKit.getRequest().getParameter("username");
+ LogManager.me().executeLog(LogTaskFactory.loginLog(username, "验证码错误", HttpKit.getIp()));
model.addAttribute("tips", "验证码错误");
return "/login.html";
}
@@ -103,7 +99,7 @@
@ResponseStatus(HttpStatus.UNAUTHORIZED)
@ResponseBody
public ErrorTip credentials(UndeclaredThrowableException e) {
- getRequest().setAttribute("tip", "权限异常");
+ HttpKit.getRequest().setAttribute("tip", "权限异常");
log.error("权限异常!", e);
return new ErrorTip(BizExceptionEnum.NO_PERMITION.getCode(), BizExceptionEnum.NO_PERMITION.getMessage());
}
@@ -116,7 +112,7 @@
@ResponseBody
public ErrorTip notFount(RuntimeException e) {
LogManager.me().executeLog(LogTaskFactory.exceptionLog(ShiroKit.getUser().getId(), e));
- getRequest().setAttribute("tip", "服务器未知运行时异常");
+ HttpKit.getRequest().setAttribute("tip", "服务器未知运行时异常");
log.error("运行时异常:", e);
return new ErrorTip(BizExceptionEnum.SERVER_ERROR.getCode(), BizExceptionEnum.SERVER_ERROR.getMessage());
}
--
Gitblit v1.7.1