xusl 2 rokov pred
rodič
commit
35bb4b0451

+ 12 - 12
backend/src/main/java/com/jiayue/ssi/filter/JwtAuthenticationTokenFilter.java

@@ -64,20 +64,20 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                 Claims claims = jwtTokenUtil.getClaimsFromToken(token);
                 if (claims==null){
                     // 无效token
-                    ResponseInfo.doResponse(response, "令牌无效,请重新登录!", 403);
+                    ResponseInfo.doResponse(response, "令牌无效,请重新登录!", 406);
                     return;
                 }
 
                 String username = claims.getSubject();
                 if (username != null) {
                     if (CacheConstants.LOGIN_TOKEN_MAP.get(username) == null) {
-                        ResponseInfo.doResponse(response, "令牌无效,请重新登录!", 403);
+                        ResponseInfo.doResponse(response, "令牌无效,请重新登录!", 406);
                         return;
                     } else {
                         String cacheToken = CacheConstants.LOGIN_TOKEN_MAP.get(username);
                         //内存token和当前token一致  说明是当前登陆用户访问
                         if (!token.equals(cacheToken)) {
-                            ResponseInfo.doResponse(response, "账号已在另一台机器登录,请重新登录!", 403);
+                            ResponseInfo.doResponse(response, "账号已在另一台机器登录,请重新登录!", 406);
                             return;
                         }
                     }
@@ -87,7 +87,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                     UserDetails userDetails = userServiceImpl.loadUserByUsername(username);
                     SysUser user = (SysUser) userDetails;
                     if (user.getStatus().equals("2")){
-                        ResponseInfo.doResponse(response, "账号已注销,不能登录!", 403);
+                        ResponseInfo.doResponse(response, "账号已注销,不能登录!", 406);
                         return;
                     }
                     if (user.getExpDate() != null) {
@@ -106,12 +106,12 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                                     log.info(user.getUsername()+"账号已过有效期被锁定成功");
                                 }
                             }
-                            ResponseInfo.doResponse(response, "账号已过有效期被锁定,请联系管理员!", 403);
+                            ResponseInfo.doResponse(response, "账号已过有效期被锁定,请联系管理员!", 406);
                             return;
                         }
                     }
                     if ("1".equals(user.getStatus()) && user.getLockTime()==0){
-                        ResponseInfo.doResponse(response, "账号已被锁定,请联系管理员!", 403);
+                        ResponseInfo.doResponse(response, "账号已被锁定,请联系管理员!", 406);
                         return;
                     }
                     if (jwtTokenUtil.validateToken(token, userDetails)) {
@@ -146,7 +146,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                 String cacheToken = CacheConstants.LOGIN_TOKEN_MAP.get(username);
                 //内存token和当前token一致  说明是当前登陆用户访问
                 if (cacheToken!=null && !token.equals(cacheToken)) {
-                    ResponseInfo.doResponse(response, "账号已在另一台机器登录,请重新登录!", 403);
+                    ResponseInfo.doResponse(response, "账号已在另一台机器登录,请重新登录!", 406);
                     return;
                 }
                 else{
@@ -155,7 +155,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                     // 将token存储内存中,便于重复登录比对
                     CacheConstants.LOGIN_TOKEN_MAP.remove(claims.getSubject());
                     LoginConstants.sessionMap.remove(claims.getSubject());
-                    ResponseInfo.doResponse(response, "令牌无效,请重新登录!", 403);
+                    ResponseInfo.doResponse(response, "令牌无效,请重新登录!", 406);
                     return;
                 }
             }
@@ -171,7 +171,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                     UserDetails userDetails = userServiceImpl.loadUserByUsername(request.getParameter("username"));
                     SysUser user = (SysUser) userDetails;
                     if (user.getStatus().equals("2")){
-                        ResponseInfo.doResponse(response, "账号已注销,不能登录!", 403);
+                        ResponseInfo.doResponse(response, "账号已注销,不能登录!", 406);
                         return;
                     }
                     if (user.getExpDate() != null) {
@@ -190,18 +190,18 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                                     log.info(user.getUsername()+"账号已过有效期被锁定成功");
                                 }
                             }
-                            ResponseInfo.doResponse(response, "账号已过有效期被锁定,请联系管理员!", 403);
+                            ResponseInfo.doResponse(response, "账号已过有效期被锁定,请联系管理员!", 406);
                             return;
                         }
                     }
 
                     if ("1".equals(user.getStatus()) && user.getLockTime()==0){
-                        ResponseInfo.doResponse(response, "账号已被锁定,请联系管理员!", 403);
+                        ResponseInfo.doResponse(response, "账号已被锁定,请联系管理员!", 406);
                         return;
                     }
 
                 } catch (Exception e) {
-                    ResponseInfo.doResponse(response, "用户名或密码错误!", 403);
+                    ResponseInfo.doResponse(response, "用户名或密码错误!", 406);
                     return;
                 }
             }

+ 1 - 2
ui/src/utils/request.js

@@ -149,8 +149,7 @@ service.interceptors.response.use(
             duration: 5 * 1000
           })
           break
-        case 403:
-          console.log('登录超时!')
+        case 406:
           // 返回 401 清除token信息并跳转到登录页面
           removeToken()
           resetRouter()