修改JwtUtil->JwtSource, 删除builder()方法

现在使用方式为JwtSource.secret|JwtSource.algorithm

Author: zhangpan

dv-commons-base/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>dv-commons</artifactId>
         <groupId>com.dv.commons</groupId>
-        <version>2.7.2-RELEASE</version>
+        <version>2.7.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dv-commons-bom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>dv-commons</artifactId>
         <groupId>com.dv.commons</groupId>
-        <version>2.7.2-RELEASE</version>
+        <version>2.7.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dv-commons-http/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>dv-commons</artifactId>
         <groupId>com.dv.commons</groupId>
-        <version>2.7.2-RELEASE</version>
+        <version>2.7.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dv-commons-jwt/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>dv-commons</artifactId>
         <groupId>com.dv.commons</groupId>
-        <version>2.7.2-RELEASE</version>
+        <version>2.7.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dv-commons-jwt/src/main/java/com/dv/commons/jwt/Builder.java

@@ -13,7 +13,7 @@
 import java.io.IOException;
 import java.util.*;
 
-public class JwtUtil implements Builder, Secret, Audience, Issure, Token, ExpireAt, Operator {
+public class JwtSource implements Secret, Audience, Issure, Token, ExpireAt, Operator {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     private static final String BEARER = "Bearer ";
@@ -29,28 +29,25 @@ public class JwtUtil implements Builder, Secret, Audience, Issure, Token, Expire
     private JWTVerifier jwtVerifier;
     private DecodedJWT decodedJWT;
     private String subject;
-    private Algorithm algorithm;
-
-    private JwtUtil() {
+    private final Algorithm algorithm;
 
+    private JwtSource(String secret) {
+        this.algorithm = Algorithm.HMAC256(secret);
     }
 
-    public static Builder builder() {
-        return new JwtUtil();
+    private JwtSource(Algorithm algorithm){
+        this.algorithm = algorithm;
     }
 
-    @Override
-    public Secret secret(String secret) {
-        this.algorithm = Algorithm.HMAC256(secret);
-        return this;
+    public static Secret secret(@NonNull String secret){
+        return new JwtSource(secret);
     }
 
-    @Override
-    public Secret algorithm(@NonNull Algorithm algorithm) {
-        this.algorithm = algorithm;
-        return this;
+    public static Secret algorithm(@NonNull Algorithm algorithm){
+        return new JwtSource(algorithm);
     }
 
+
     @Override
     public Audience audience(String... audience) {
         this.audience = audience;
@@ -238,10 +235,10 @@ public String toString() {
         }
         sb.append(",issure=").append(this.issure);
         sb.append(",token=").append(this.token);
-        sb.append(",expireAt=").append(this.expireAt);
+        sb.append(",expireAt=").append(this.expireAt.getTime());
         sb.append(",jwtId=").append(this.jwtId);
         sb.append(",keyId=").append(this.keyId);
-        sb.append(",issuedAt=").append(this.issuedAt);
+        sb.append(",issuedAt=").append(this.issuedAt.getTime());
         sb.append(",subject=").append(this.subject);
         sb.append(",payload={");
         this.payload.forEach((k, v) -> {

…ain/java/com/dv/commons/jwt/JwtUtil.java …n/java/com/dv/commons/jwt/JwtSource.javadv-commons-jwt/src/main/java/com/dv/commons/jwt/JwtUtil.java renamed to dv-commons-jwt/src/main/java/com/dv/commons/jwt/JwtSource.java dv-commons-jwt/src/main/java/com/dv/commons/jwt/JwtUtil.java renamed to dv-commons-jwt/src/main/java/com/dv/commons/jwt/JwtSource.java

@@ -1,6 +1,6 @@
 package com.dv.commons.test;
 
-import com.dv.commons.jwt.JwtUtil;
+import com.dv.commons.jwt.JwtSource;
 import com.dv.commons.jwt.Operator;
 import org.junit.Test;
 
@@ -19,12 +19,12 @@ public void test() throws IOException {
         payload.put("sub","123123123");
         payload.put("test","test");
         // 加签,并获取最终对象
-        Operator operator = JwtUtil.builder().secret(key).audience("admin").issure("admin").expireAt(expireAt).generator(payload);
+        Operator operator = JwtSource.secret(key).audience("admin").issure("admin").expireAt(expireAt).generator(payload);
         // 打印Token
         System.out.println(operator.getToken());
         System.out.println(operator);
         // 验签,并获取对象
-        Operator operator1 = JwtUtil.builder().secret(key).audience("admin").issure("admin").token(operator.getToken()).verify();
+        Operator operator1 = JwtSource.secret(key).audience("admin").issure("admin").token(operator.getToken()).verify();
         System.out.println(operator1);
     }
 }

dv-commons-jwt/src/test/java/com/dv/commons/test/AppTests.java

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>dv-commons</artifactId>
         <groupId>com.dv.commons</groupId>
-        <version>2.7.2-RELEASE</version>
+        <version>2.7.3-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>