From 913a86dcc74e359d9898e07143c2ee9362b5c014 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Mon, 24 Feb 2025 09:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=BF=E7=94=A8RequestUtil?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=9D=A5=E8=8E=B7=E5=8F=96=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/auth/controller/AuthController.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java b/system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java index 96a9029e..5f56cd38 100644 --- a/system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java +++ b/system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java @@ -24,6 +24,7 @@ import com.njcn.gather.user.user.service.ISysUserService; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.HttpResultUtil; import com.njcn.web.utils.HttpServletUtil; +import com.njcn.web.utils.RequestUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -100,13 +101,11 @@ public class AuthController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_SERIOUS, operateType = OperateType.LOGOUT) @ApiOperation("注销登录") @PostMapping("/logout") - public HttpResult logout(HttpServletRequest request) { + public HttpResult logout() { String methodDescribe = getMethodDescribe("logout"); LogUtil.njcnDebug(log, "{}，注销登录", methodDescribe); - String accessTokenStr = request.getHeader(SecurityConstants.AUTHORIZATION_KEY); - if (StrUtil.isNotBlank(accessTokenStr)) { - String accessToken = accessTokenStr.replace(SecurityConstants.AUTHORIZATION_PREFIX, Strings.EMPTY); - + String accessToken = RequestUtil.getAccessToken(); + if (StrUtil.isNotBlank(accessToken)) { CustomCacheUtil customCacheUtil = SpringUtil.getBean(CustomCacheUtil.CACHE_NAME); customCacheUtil.remove(accessToken); @@ -122,14 +121,13 @@ public class AuthController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiOperation("刷新token") @GetMapping("/refreshToken") - public HttpResult refreshToken(HttpServletRequest request) { + public HttpResult refreshToken() { String methodDescribe = getMethodDescribe("refreshToken"); LogUtil.njcnDebug(log, "{}，刷新token", methodDescribe); - String accessTokenStr = request.getHeader(SecurityConstants.AUTHORIZATION_KEY); + String accessToken = RequestUtil.getAccessToken(); Token token = new Token(); - if (StrUtil.isNotBlank(accessTokenStr)) { - String accessToken = accessTokenStr.replace(SecurityConstants.AUTHORIZATION_PREFIX, Strings.EMPTY); + if (StrUtil.isNotBlank(accessToken)) { Map map = JwtUtil.parseToken(accessToken); String userId = (String) map.get(SecurityConstants.USER_ID); SysUser user = sysUserService.getById(userId); @@ -148,6 +146,4 @@ public class AuthController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } } - - }