fix token;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/core/JwtValidator.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
 import java.util.Date;
 import java.util.Map;
 
@@ -21,6 +23,9 @@ public class JwtValidator {
     private Long expireTtl;
     private Long refreshTtl;
     private Long blacklistGracePeriod;
+
+    SecretKey secretKey = new SecretKeySpec(secret.getBytes(), SignatureAlgorithm.HS256.getJcaName());
+
 //    private static final long EXPIRE_TIME = 15 * 60 * 1000;
 //    private static final String TOKEN_SECRET = "qZHglvNP0n0aOOckHiQXq5JMD468J4eG";
 
@@ -35,16 +40,11 @@ public class JwtValidator {
         long nowMillis = System.currentTimeMillis();
         long expMillis = System.currentTimeMillis() + expireTtl * 60000;
 
-        // 创建一个JwtBuilder，设置jwt的body
         JwtBuilder builder = Jwts.builder()
-                // 保存在Payload（有效载荷）中的内容, 自定义一些数据保存在这里
                 .setClaims(claimsMap)
-                // iat: jwt的签发时间
                 .setIssuedAt(new Date(nowMillis))
-                // 设置过期时间
                 .setExpiration(new Date(expMillis))
-                // 使用HS256算法和签名使用的秘钥生成密文
-                .signWith(SignatureAlgorithm.HS256, secret);
+                .signWith(SignatureAlgorithm.HS256, secretKey);
         return builder.compact();
     }
 
@@ -55,11 +55,8 @@ public class JwtValidator {
      * @return
      */
     public Claims parse(String token) {
-        // 得到DefaultJwtParser
         return Jwts.parser()
-                // 设置签名的秘钥
-                .setSigningKey(secret)
-                // 设置需要解析的token
+                .setSigningKey(secretKey)
                 .parseClaimsJws(token).getBody();
     }
 }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CurrentUtil.java

@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class CurrentUtil {
-    public static final String uID = "uid";
+    public static final String uID = "sub";
     public static final String uTag = "u-tag";
     public static final String uToken = "u-token";
     public static final String CLI_SOURCE = "source";
@@ -27,7 +27,7 @@ public class CurrentUtil {
             Map<String, Object> map = new HashMap<>();
             map.put("mobile", "000");
             map.put("nickname", "111");
-            map.put("uid", "1");
+            map.put("sub", "1");
             return map;
         }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -132,7 +132,7 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
 
         Map<String, Object> claimsMap = new HashMap<>();
-        claimsMap.put("uid", userInfoVo.getUid());
+        claimsMap.put("sub", userInfoVo.getUid());
         // TODO: 2021/5/25 修改手机号更新TOKEN
         claimsMap.put("mobile", userInfoVo.getMobile());
         claimsMap.put("nickname", userInfoVo.getNickname());
@@ -166,7 +166,7 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
 
         Map<String, Object> claimsMap = new HashMap<>();
-        claimsMap.put("uid", userInfoVo.getUid());
+        claimsMap.put("sub", userInfoVo.getUid());
         claimsMap.put("mobile", userInfoVo.getMobile());
         claimsMap.put("nickname", userInfoVo.getNickname());
         loginInfoVo.setToken(this.ssoProcess(claimsMap));
@@ -200,7 +200,7 @@ public class AdamLoginController {
         }
 
         Map<String, Object> claimsMap = new HashMap<>();
-        claimsMap.put("uid", loginInfoVo.getUserInfo().getUid());
+        claimsMap.put("sub", loginInfoVo.getUserInfo().getUid());
         claimsMap.put("mobile", loginInfoVo.getUserInfo().getMobile());
         claimsMap.put("nickname", loginInfoVo.getUserInfo().getNickname());
         loginInfoVo.setToken(this.ssoProcess(claimsMap));
@@ -276,7 +276,7 @@ public class AdamLoginController {
     }
 
     private String ssoProcess(Map<String, Object> claimsMap) {
-        String uid = (String) claimsMap.get("uid");
+        String uid = (String) claimsMap.get("sub");
 
         String uidSso = jwtValidator.getSsoRedisKey().concat(uid);
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinStationController.java

@@ -377,7 +377,7 @@ public class KylinStationController {
         String ssoKeyUid = jwtValidator.getSsoRedisKey().concat(uid);
 
         Map<String, Object> claimsMap = new HashMap<>();
-        claimsMap.put("uid", uid);
+        claimsMap.put("sub", uid);
         claimsMap.put("mobile", checkUserVo.getMobile());
         claimsMap.put("nickname", checkUserVo.getName());