fix resetToken

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.12</version>
+    <version>2.9.13</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.12</version>
+        <version>2.9.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.12</version>
+        <version>2.9.13</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.12</version>
+        <version>2.9.13</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter-security/src/main/java/com/codingapi/springboot/security/redis/RedisTokenGateway.java

@@ -4,6 +4,7 @@
 import com.codingapi.springboot.security.gateway.Token;
 import org.springframework.data.redis.core.RedisTemplate;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -30,8 +31,14 @@ public Token create(String username, String iv, List<String> authorities, String
         return token;
     }
 
-    public Token parser(String sign) {
-        String json = redisTemplate.opsForValue().get(sign);
+    /**
+     * 根据token获取用户信息
+     *
+     * @param token token
+     * @return 用户信息
+     */
+    public Token getToken(String token) {
+        String json = redisTemplate.opsForValue().get(token);
         if (json == null) {
             return null;
         }
@@ -40,6 +47,7 @@ public Token parser(String sign) {
 
     /**
      * 删除token
+     *
      * @param token token
      */
     public void removeToken(String token) {
@@ -48,33 +56,49 @@ public void removeToken(String token) {
 
     /**
      * 重置token
+     *
      * @param token token
      */
-    public void resetToken(Token token){
+    public void resetToken(Token token) {
         redisTemplate.opsForValue().set(token.getToken(), token.toJson(), validTime, TimeUnit.MILLISECONDS);
     }
 
     /**
      * 删除用户
+     *
      * @param username 用户名
      */
     public void removeUsername(String username) {
         Set<String> keys = redisTemplate.keys(username + ":*");
-        if (keys != null && !keys.isEmpty()) {
+        if (!keys.isEmpty()) {
             redisTemplate.delete(keys);
         }
     }
 
+
     /**
-     * 自定义删除用户
+     * 获取用户的所有token
+     *
      * @param username 用户名
+     * @return token列表
+     */
+    public List<String> getTokensByUsername(String username) {
+        Set<String> keys = redisTemplate.keys(username + ":*");
+        return new ArrayList<>(keys);
+    }
+
+
+    /**
+     * 自定义删除用户
+     *
+     * @param username  用户名
      * @param predicate 条件
      */
     public void removeUsername(String username, Predicate<Token> predicate) {
         Set<String> keys = redisTemplate.keys(username + ":*");
-        if (keys != null && !keys.isEmpty()) {
+        if (!keys.isEmpty()) {
             for (String key : keys) {
-                Token token = parser(key);
+                Token token = getToken(key);
                 if (token != null && predicate.test(token)) {
                     redisTemplate.delete(key);
                 }

springboot-starter-security/src/main/java/com/codingapi/springboot/security/redis/RedisTokenGatewayImpl.java

@@ -20,7 +20,7 @@ public Token create(String username, String iv, List<String> authorities, String
 
     @Override
     public Token parser(String sign) {
-        return redisTokenGateway.parser(sign);
+        return redisTokenGateway.getToken(sign);
     }
 
 }

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.9.12</version>
+        <version>2.9.13</version>
     </parent>
     <artifactId>springboot-starter</artifactId>