From 526b73b4f89ba45b8df8a61f0e16bfe79e408e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Fri, 24 Jul 2020 16:47:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blog/configuration/filter/AuthenticationFilter.java | 5 ++++- src/main/java/cn/celess/blog/enmu/ResponseEnum.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java b/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java index b26597a..71b28aa 100644 --- a/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java +++ b/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java @@ -56,10 +56,13 @@ public class AuthenticationFilter implements HandlerInterceptor { return writeResponse(ResponseEnum.LOGIN_EXPIRED, response, request); } String email = jwtUtil.getUsernameFromToken(jwtStr); - if (!redisUtil.hasKey(email + "-login") || jwtUtil.isTokenExpired(jwtStr)) { + if (jwtUtil.isTokenExpired(jwtStr)) { // 登陆过期 return writeResponse(ResponseEnum.LOGIN_EXPIRED, response, request); } + if (!redisUtil.hasKey(email + "-login")) { + return writeResponse(ResponseEnum.LOGOUT, response, request); + } String role = userService.getUserRoleByEmail(email); if (role.equals(ROLE_USER) || role.equals(ROLE_ADMIN)) { // 更新token diff --git a/src/main/java/cn/celess/blog/enmu/ResponseEnum.java b/src/main/java/cn/celess/blog/enmu/ResponseEnum.java index 5e68d5c..9cca273 100644 --- a/src/main/java/cn/celess/blog/enmu/ResponseEnum.java +++ b/src/main/java/cn/celess/blog/enmu/ResponseEnum.java @@ -33,6 +33,7 @@ public enum ResponseEnum { PWD_SAME(3601, "新密码与原密码相同"), PWD_NOT_SAME(3602, "新密码与原密码不相同"), LOGIN_EXPIRED(3700, "登陆过期"), + LOGOUT(3710, "账户已注销"), PWD_WRONG(3800, "密码不正确"), JWT_EXPIRED(3810, "Token过期"),