From a17b49b37fb8e917e57c19d8eecf393845d68dcd Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Tue, 31 Oct 2023 09:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhgd/xmgl/security/JwtTokenProvider.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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<String, String> 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<String, Object> cs = (Map<String, Object>) 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");
         }
     }