add #40

Author: xlorne

pom.xml

@@ -32,7 +32,7 @@
         <maven.gpg.plugin>3.1.0</maven.gpg.plugin>
         <codingapi.framework.version>${project.version}</codingapi.framework.version>
         <fastjson.version>2.0.42</fastjson.version>
-        <jsonwebtoken.jjwt.version>0.12.3</jsonwebtoken.jjwt.version>
+        <jsonwebtoken.jjwt.version>0.12.5</jsonwebtoken.jjwt.version>
         <commons-io.version>2.15.0</commons-io.version>
         <commons-dbutils.version>1.8.1</commons-dbutils.version>
         <commons-text.version>1.11.0</commons-text.version>

springboot-starter-security/pom.xml

@@ -33,16 +33,19 @@
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-impl</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

springboot-starter-security/src/main/java/com/codingapi/springboot/security/gateway/TokenGateway.java

@@ -6,6 +6,18 @@ public interface TokenGateway {
 
     Token create(String username, String password, List<String> authorities, String extra);
 
+    default Token create(String username, String password, List<String> authorities) {
+        return create(username, password, authorities, null);
+    }
+
+    default Token create(String username, List<String> authorities) {
+        return create(username, null, authorities, null);
+    }
+
+    default Token create(String username, List<String> authorities, String extra) {
+        return create(username, null, authorities, extra);
+    }
+
     Token parser(String sign);
 
 }

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

@@ -15,7 +15,7 @@ public JWTTokenGatewayImpl(SecurityJWTProperties properties) {
 
     @Override
     public Token create(String username, String password, List<String> authorities, String extra) {
-        return jwt.create(username, authorities, extra);
+        return jwt.create(username, password, authorities, extra);
     }
 
     @Override

springboot-starter-security/src/test/java/com/codingapi/springboot/security/jwt/TokenTest.java

@@ -2,6 +2,7 @@
 
 import com.codingapi.springboot.security.exception.TokenExpiredException;
 import com.codingapi.springboot.security.gateway.Token;
+import com.codingapi.springboot.security.gateway.TokenGateway;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -15,18 +16,18 @@
 class TokenTest {
 
     @Autowired
-    private Jwt jwt;
+    private TokenGateway tokenGateway;
 
     @Test
     void verify1() throws TokenExpiredException {
         String username = "admin";
         String iv = "123456";
         List<String> authorities = Collections.singletonList("ADMIN");
 
-        Token token =jwt.create(username,iv,authorities);
+        Token token =tokenGateway.create(username,iv,authorities);
         token.verify();
 
-        Token data = jwt.parser(token.getToken());
+        Token data = tokenGateway.parser(token.getToken());
         assertEquals(data.decodeIv(),iv);
         assertEquals(data.getAuthorities(),authorities);
     }
@@ -36,10 +37,10 @@ void verify2() throws TokenExpiredException {
         String username = "admin";
         List<String> authorities = Collections.singletonList("ADMIN");
 
-        Token token =jwt.create(username,authorities);
+        Token token =tokenGateway.create(username,authorities);
         token.verify();
 
-        Token data = jwt.parser(token.getToken());
+        Token data = tokenGateway.parser(token.getToken());
         assertEquals(data.getUsername(),username);
         assertEquals(data.getAuthorities(),authorities);
     }
@@ -53,10 +54,10 @@ void verify3() throws TokenExpiredException {
         String extra = testVO.toJson();
         List<String> authorities = Collections.singletonList("ADMIN");
 
-        Token token =jwt.create(username,authorities,extra);
+        Token token =tokenGateway.create(username,authorities,extra);
         token.verify();
 
-        Token data = jwt.parser(token.getToken());
+        Token data = tokenGateway.parser(token.getToken());
         assertEquals(data.parseExtra(TestVO.class).getName(), testVO.getName());
         assertEquals(data.getAuthorities(),authorities);
     }

springboot-starter-security/src/test/resources/application.properties

@@ -3,6 +3,7 @@ server.port=8088
 codingapi.security.jwt.jwt-time=10000
 codingapi.security.jwt.jwt-rest-time=5000
 
+codingapi.security.jwt.enable=true
 # JWT密钥 需大于32位的字符串
 codingapi.security.jwt.secret-key=codingapi.security.jwt.secretkey
 # JWT AES密钥
@@ -27,3 +28,5 @@ codingapi.security.ignore-urls=/open/**
 codingapi.security.disable-csrf=true
 # 禁用CORS
 codingapi.security.disable-cors=true
+
+spring.main.allow-bean-definition-overriding=true