diff --git a/system/src/main/java/com/njcn/gather/system/auth/filter/AuthGlobalFilter.java b/system/src/main/java/com/njcn/gather/system/auth/filter/AuthGlobalFilter.java index 34536d54..a4c1fabb 100644 --- a/system/src/main/java/com/njcn/gather/system/auth/filter/AuthGlobalFilter.java +++ b/system/src/main/java/com/njcn/gather/system/auth/filter/AuthGlobalFilter.java @@ -53,19 +53,19 @@ public class AuthGlobalFilter implements Filter, Ordered { filterChain.doFilter(req, res); } else { String accessTokenStr = req.getHeader(SecurityConstants.AUTHORIZATION_KEY); - String refreshToken = req.getHeader(SecurityConstants.REFRESH_TOKEN_KEY); - if (StrUtil.isBlank(accessTokenStr) || !accessTokenStr.startsWith(SecurityConstants.AUTHORIZATION_PREFIX) || StrUtil.isBlank(refreshToken)) { + String isRefreshToken = req.getHeader(SecurityConstants.IS_REFRESH_TOKEN); + if (StrUtil.isBlank(accessTokenStr) || !accessTokenStr.startsWith(SecurityConstants.AUTHORIZATION_PREFIX)) { res.getWriter().write("{\"code\": 4001, \"message\":\"" + SystemValidMessage.TOKEN_VALID_ERROR + "\"}"); //前端重定向到登录页面 return; } String accessToken = accessTokenStr.substring(SecurityConstants.AUTHORIZATION_PREFIX.length()); try { - if (StrUtil.isBlank(accessToken) || !JwtUtil.verifyToken(accessToken) || !JwtUtil.verifyToken(refreshToken)) { + if (StrUtil.isBlank(accessToken) || !JwtUtil.verifyToken(accessToken)) { res.getWriter().write("{\"code\": 4001, \"message\":\"" + SystemValidMessage.TOKEN_VALID_ERROR + "\"}"); //前端重定向到登录页面 } else if (JwtUtil.isExpired(accessToken)) { - if (JwtUtil.isExpired(refreshToken)) { + if ("true".equals(isRefreshToken)) { res.getWriter().write("{\"code\": 4001, \"message\":\"" + SystemValidMessage.TOKEN_EXPIRED + "\"}"); //前端重定向到登录页面 - }else{ + } else { res.getWriter().write("{\"code\": 401, \"message\":\"" + SystemValidMessage.TOKEN_EXPIRED + "\"}"); //前端发起refreshToken请求 } } else {