fix #40

Author: xlorne

springboot-starter-security/src/main/java/com/codingapi/springboot/security/jwt/JWTSecurityConfiguration.java

@@ -21,8 +21,15 @@ public SecurityJWTProperties securityJWTProperties() {
 
     @Bean
     @ConditionalOnMissingBean
-    public TokenGateway jwtTokenGateway(SecurityJWTProperties properties) {
-        return new JWTTokenGatewayImpl(properties);
+    public JwtTokenGateway jwtTokenGateway(SecurityJWTProperties properties) {
+        return new JwtTokenGateway(properties);
+    }
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public TokenGateway jwtTokenGatewayImpl(JwtTokenGateway jwtTokenGateway) {
+        return new JWTTokenGatewayImpl(jwtTokenGateway);
     }
 
 }

springboot-starter-security/src/main/java/com/codingapi/springboot/security/jwt/JWTTokenGatewayImpl.java

@@ -7,19 +7,19 @@
 
 public class JWTTokenGatewayImpl implements TokenGateway {
 
-    private final Jwt jwt;
+    private final JwtTokenGateway jwtTokenGateway;
 
-    public JWTTokenGatewayImpl(SecurityJWTProperties properties) {
-        this.jwt = new Jwt(properties.getSecretKey(), properties.getValidTime(), properties.getRestTime());
+    public JWTTokenGatewayImpl(JwtTokenGateway jwtTokenGateway) {
+        this.jwtTokenGateway = jwtTokenGateway;
     }
 
     @Override
     public Token create(String username, String password, List<String> authorities, String extra) {
-        return jwt.create(username, password, authorities, extra);
+        return jwtTokenGateway.create(username, password, authorities, extra);
     }
 
     @Override
     public Token parser(String sign) {
-        return jwt.parser(sign);
+        return jwtTokenGateway.parser(sign);
     }
 }

springboot-starter-security/src/main/java/com/codingapi/springboot/security/jwt/Jwt.java renamed to springboot-starter-security/src/main/java/com/codingapi/springboot/security/jwt/JwtTokenGateway.java

@@ -12,16 +12,16 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-public class Jwt {
+public class JwtTokenGateway {
 
     private final SecretKey key;
     private final int validTime;
     private final int restTime;
 
-    public Jwt(String secretKey, int validTime, int restTime) {
-        this.key = Keys.hmacShaKeyFor(secretKey.getBytes(StandardCharsets.UTF_8));
-        this.validTime = validTime;
-        this.restTime = restTime;
+    public JwtTokenGateway(SecurityJWTProperties properties) {
+        this.key = Keys.hmacShaKeyFor(properties.getSecretKey().getBytes(StandardCharsets.UTF_8));
+        this.validTime = properties.getValidTime();
+        this.restTime = properties.getRestTime();
     }
 
     public Token create(String username, List<String> authorities, String extra){

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

@@ -22,8 +22,14 @@ public SecurityRedisProperties securityRedisProperties() {
 
     @Bean
     @ConditionalOnMissingBean
-    public TokenGateway redisTokenGateway(RedisTemplate<String, String> redisTemplate, SecurityRedisProperties properties) {
-        return new RedisTokenGatewayImpl(redisTemplate, properties);
+    public RedisTokenGateway redisTokenGateway(RedisTemplate<String, String> redisTemplate, SecurityRedisProperties properties) {
+        return new RedisTokenGateway(redisTemplate, properties);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public TokenGateway redisTokenGatewayImpl(RedisTokenGateway redisTokenGateway) {
+        return new RedisTokenGatewayImpl(redisTokenGateway);
     }
 
 }

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

@@ -0,0 +1,52 @@
+package com.codingapi.springboot.security.redis;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.codingapi.springboot.security.gateway.Token;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+public class RedisTokenGateway {
+
+    private final RedisTemplate<String, String> redisTemplate;
+    private final int validTime;
+    private final int restTime;
+
+    public RedisTokenGateway(RedisTemplate<String, String> redisTemplate, SecurityRedisProperties properties) {
+        this.redisTemplate = redisTemplate;
+        this.validTime = properties.getValidTime();
+        this.restTime = properties.getRestTime();
+    }
+
+    public Token create(String username, String iv, List<String> authorities, String extra) {
+        Token token = new Token(username, iv, extra, authorities, validTime, restTime);
+        String key = String.format("%s:%s", username, UUID.randomUUID().toString().replaceAll("-", ""));
+        token.setToken(key);
+        redisTemplate.opsForValue().set(key, token.toJson(), validTime, TimeUnit.MILLISECONDS);
+        return token;
+    }
+
+    public Token parser(String sign) {
+        String json = redisTemplate.opsForValue().get(sign);
+        if (json == null) {
+            return null;
+        }
+        return JSONObject.parseObject(json, Token.class);
+    }
+
+    public void removeToken(String token) {
+        redisTemplate.delete(token);
+    }
+
+    public void removeUsername(String username) {
+        Set<String> keys = redisTemplate.keys(username + ":*");
+        if (keys != null && !keys.isEmpty()) {
+            redisTemplate.delete(keys);
+        }
+    }
+
+
+}

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

@@ -1,42 +1,26 @@
 package com.codingapi.springboot.security.redis;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.codingapi.springboot.security.gateway.Token;
 import com.codingapi.springboot.security.gateway.TokenGateway;
-import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 public class RedisTokenGatewayImpl implements TokenGateway {
 
-    private final RedisTemplate<String, String> redisTemplate;
-    private final int validTime;
-    private final int restTime;
+    private final RedisTokenGateway redisTokenGateway;
 
-    public RedisTokenGatewayImpl(RedisTemplate<String, String> redisTemplate, SecurityRedisProperties properties) {
-        this.redisTemplate = redisTemplate;
-        this.validTime = properties.getValidTime();
-        this.restTime = properties.getRestTime();
+    public RedisTokenGatewayImpl(RedisTokenGateway redisTokenGateway) {
+        this.redisTokenGateway = redisTokenGateway;
     }
 
     @Override
     public Token create(String username, String iv, List<String> authorities, String extra) {
-        Token token = new Token(username, iv, extra, authorities, validTime, restTime);
-        String key = String.format("%s:%s", username, UUID.randomUUID().toString().replaceAll("-", ""));
-        token.setToken(key);
-        redisTemplate.opsForValue().set(key, token.toJson(), validTime, TimeUnit.MILLISECONDS);
-        return token;
+        return redisTokenGateway.create(username, iv, authorities, extra);
     }
 
     @Override
     public Token parser(String sign) {
-        String json = redisTemplate.opsForValue().get(sign);
-        if (json == null) {
-            return null;
-        }
-        return JSONObject.parseObject(json, Token.class);
+        return redisTokenGateway.parser(sign);
     }
 
 }