From 92b0a0ccb4e0e7177050cff85b4dcf0b1ddb0e87 Mon Sep 17 00:00:00 2001 From: macro Date: Sun, 12 May 2019 15:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9B=B8=E5=85=B3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../macro/mall/portal/component/GoAccessDeniedHandler.java | 4 +++- .../mall/portal/component/GoAuthenticationEntryPoint.java | 4 +++- .../mall/portal/component/GoAuthenticationFailureHandler.java | 4 +++- .../mall/portal/component/GoAuthenticationSuccessHandler.java | 4 +++- .../macro/mall/portal/component/GoLogoutSuccessHandler.java | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/mall-portal/src/main/java/com/macro/mall/portal/component/GoAccessDeniedHandler.java b/mall-portal/src/main/java/com/macro/mall/portal/component/GoAccessDeniedHandler.java index 49d6924..6b17a68 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/component/GoAccessDeniedHandler.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/component/GoAccessDeniedHandler.java @@ -1,5 +1,7 @@ package com.macro.mall.portal.component; +import cn.hutool.json.JSONUtil; +import com.macro.mall.common.api.CommonResult; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; @@ -15,7 +17,7 @@ public class GoAccessDeniedHandler implements AccessDeniedHandler{ @Override public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { response.setHeader("Content-Type", "application/json;charset=utf-8"); - response.getWriter().print("{\"code\":401,\"message\":\""+"未认证："+accessDeniedException.getMessage()+"\"}"); + response.getWriter().print(JSONUtil.parse(CommonResult.unauthorized(accessDeniedException.getMessage()))); response.getWriter().flush(); } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationEntryPoint.java b/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationEntryPoint.java index 92c603c..bf3ab76 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationEntryPoint.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationEntryPoint.java @@ -1,5 +1,7 @@ package com.macro.mall.portal.component; +import cn.hutool.json.JSONUtil; +import com.macro.mall.common.api.CommonResult; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; @@ -15,7 +17,7 @@ public class GoAuthenticationEntryPoint implements AuthenticationEntryPoint { @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { response.setHeader("Content-Type", "application/json;charset=utf-8"); - response.getWriter().print("{\"code\":403,\"message\":\""+"未授权："+authException.getMessage()+"\"}"); + response.getWriter().print(JSONUtil.parse(CommonResult.forbidden(authException.getMessage()))); response.getWriter().flush(); } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationFailureHandler.java b/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationFailureHandler.java index d312932..fddbe63 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationFailureHandler.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationFailureHandler.java @@ -1,5 +1,7 @@ package com.macro.mall.portal.component; +import cn.hutool.json.JSONUtil; +import com.macro.mall.common.api.CommonResult; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.AuthenticationFailureHandler; @@ -15,7 +17,7 @@ public class GoAuthenticationFailureHandler implements AuthenticationFailureHand @Override public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException { response.setHeader("Content-Type", "application/json;charset=utf-8"); - response.getWriter().print("{\"code\":500,\"message\":\""+"登录失败："+exception.getMessage()+"\"}"); + response.getWriter().print(JSONUtil.parse(CommonResult.failed("登录失败："+exception.getMessage()))); response.getWriter().flush(); } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationSuccessHandler.java b/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationSuccessHandler.java index 727a109..c3f6c7c 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationSuccessHandler.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/component/GoAuthenticationSuccessHandler.java @@ -1,5 +1,7 @@ package com.macro.mall.portal.component; +import cn.hutool.json.JSONUtil; +import com.macro.mall.common.api.CommonResult; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; @@ -15,7 +17,7 @@ public class GoAuthenticationSuccessHandler implements AuthenticationSuccessHand @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { response.setHeader("Content-Type", "application/json;charset=utf-8"); - response.getWriter().print("{\"code\":200,\"message\":\"登录成功\"}"); + response.getWriter().print(JSONUtil.parse(CommonResult.success(null,"登录成功"))); response.getWriter().flush(); } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/component/GoLogoutSuccessHandler.java b/mall-portal/src/main/java/com/macro/mall/portal/component/GoLogoutSuccessHandler.java index 0c9cde4..13ec6fc 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/component/GoLogoutSuccessHandler.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/component/GoLogoutSuccessHandler.java @@ -1,5 +1,7 @@ package com.macro.mall.portal.component; +import cn.hutool.json.JSONUtil; +import com.macro.mall.common.api.CommonResult; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; @@ -15,7 +17,7 @@ public class GoLogoutSuccessHandler implements LogoutSuccessHandler { @Override public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { response.setHeader("Content-Type", "application/json;charset=utf-8"); - response.getWriter().print("{\"code\":200,\"message\":\"已注销\"}"); + response.getWriter().print(JSONUtil.parse(CommonResult.success(null,"已注销"))); response.getWriter().flush(); } }