From 2efe68b33f2f175324581d7e25361a66ab17715b Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 7 May 2023 09:58:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E5=88=A0=E6=8E=89Projec?= =?UTF-8?q?tUtil=E7=9A=84=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guns/core/error/GlobalExceptionHandler.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java b/src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java index c0feb209..46a77dcf 100644 --- a/src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java +++ b/src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java @@ -13,7 +13,6 @@ import cn.stylefeng.roses.kernel.rule.exception.enums.defaults.DefaultBusinessEx import cn.stylefeng.roses.kernel.rule.pojo.response.ErrorResponseData; import cn.stylefeng.roses.kernel.rule.util.ExceptionUtil; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; -import cn.stylefeng.roses.kernel.rule.util.ProjectUtil; import cn.stylefeng.roses.kernel.rule.util.ResponseRenderUtil; import cn.stylefeng.roses.kernel.validator.api.exception.ParamValidateException; import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum; @@ -360,16 +359,10 @@ public class GlobalExceptionHandler { * @since 2021/5/18 10:48 */ private String renderLoginResult(HttpServletResponse response, AuthException authException, Model model) { - - if (ProjectUtil.getSeparationFlag()) { - response.setHeader("Guns-Session-Timeout", "true"); - ErrorResponseData errorResponseData = renderJson(authException.getErrorCode(), authException.getUserTip(), authException); - ResponseRenderUtil.renderJsonResponse(response, errorResponseData); - return null; - } - - model.addAttribute("tips", authException.getUserTip()); - return "/login.html"; + response.setHeader("Guns-Session-Timeout", "true"); + ErrorResponseData errorResponseData = renderJson(authException.getErrorCode(), authException.getUserTip(), authException); + ResponseRenderUtil.renderJsonResponse(response, errorResponseData); + return null; } }