diff --git a/src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java b/src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java index ef778abd8..24ec9ba98 100644 --- a/src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java +++ b/src/main/java/com/zhgd/xmgl/security/JwtTokenProvider.java @@ -33,7 +33,7 @@ public class JwtTokenProvider { private Integer userTokenExpireMinute; @Autowired private RedisRepository redisRepository; - private final String USER_TOKEN_EXPIRE_PREFIX = "USER_TOKEN_EXPIRE:" + EnvironmentUtil.activeEnvironment + ":"; + private final String USER_TOKEN_EXPIRE_PREFIX = "USER_TOKEN_EXPIRE:"; private static ConcurrentHashMap userMap = new ConcurrentHashMap<>(); @Autowired @@ -76,7 +76,7 @@ public class JwtTokenProvider { .compact(); userMap.put(username, token); //刷新token - String key = USER_TOKEN_EXPIRE_PREFIX + username + ":" + uuid; + String key = USER_TOKEN_EXPIRE_PREFIX + EnvironmentUtil.activeEnvironment + ":" + username + ":" + uuid; redisRepository.set(key, "", userTokenExpireMinute * 60L); return token; } @@ -111,7 +111,7 @@ public class JwtTokenProvider { Map cs = (Map) body; if (Objects.equals(cs.get("loginTimeOut"), 1)) { //判断token过期没有 - String key = USER_TOKEN_EXPIRE_PREFIX + cs.get("account") + ":" + cs.get("uuid"); + String key = USER_TOKEN_EXPIRE_PREFIX + EnvironmentUtil.activeEnvironment + ":" + cs.get("account") + ":" + cs.get("uuid"); if (redisRepository.get(key) == null) { return false; } @@ -121,8 +121,6 @@ public class JwtTokenProvider { return true; } catch (JwtException | IllegalArgumentException e) { throw new CustomException("Expired or invalid JWT token", HttpStatus.FORBIDDEN); - //throw new CustomException("Expired or invalid JWT token", HttpStatus.OK); - //throw new OpenAlertException(403,"Expired or invalid JWT token"); } }