feature-img-1.0:修复登录缓存过多的BUG

bnyer-auth/src/main/java/com/bnyer/auth/controller/TiktokUserController.java

@@ -42,7 +42,7 @@ public class TiktokUserController
     public R<?> logout(HttpServletRequest request)
     {
         String token = SecurityUtils.getTiktokToken(request);
-        //删除快手用户缓存
+        //删除抖音用户缓存
         tiktokUserTokenService.delLoginFhUser(token);
         return R.ok();
     }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class TiktokLoginDto implements Serializable {
 
     @NotNull(message = "code不能为空！")
-    @ApiModelProperty(value = "微信code")
+    @ApiModelProperty(value = "抖音code")
     private String code;
 
     @NotNull(message = "加密数据不能为空！")

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/JwtUtils.java

@@ -155,6 +155,18 @@ public class JwtUtils
     {
         return getValue(claims, SecurityConstants.DETAILS_PHONE);
     }
+
+    /**
+     * 根据令牌获取艺术家手机号
+     *
+     * @param token 令牌
+     * @return 艺术家ID
+     */
+    public static String getCreatorPhone(String token)
+    {
+        Claims claims = parseToken(token);
+        return getValue(claims, SecurityConstants.DETAILS_PHONE);
+    }
     //***************************艺术家信息结束************************************
     //***************************抖音用户信息开始************************************
     /**
@@ -213,6 +225,18 @@ public class JwtUtils
         return getValue(claims, SecurityConstants.DETAILS_TIKTOK_OPENID);
     }
 
+    /**
+     * 根据令牌获取抖音用户openid
+     *
+     * @param token 令牌
+     * @return -
+     */
+    public static String getTiktokUserOpenid(String token)
+    {
+        Claims claims = parseToken(token);
+        return getValue(claims, SecurityConstants.DETAILS_TIKTOK_OPENID);
+    }
+
     //***************************抖音用户信息结束************************************
 
     //***************************微信用户信息开始************************************
@@ -271,6 +295,18 @@ public class JwtUtils
     {
         return getValue(claims, SecurityConstants.DETAILS_WECHAT_OPENID);
     }
+
+    /**
+     * 根据令牌获取微信用户openid
+     *
+     * @param token 令牌
+     * @return -
+     */
+    public static String getWechatUserOpenid(String token)
+    {
+        Claims claims = parseToken(token);
+        return getValue(claims, SecurityConstants.DETAILS_WECHAT_OPENID);
+    }
     //***************************微信用户信息结束************************************
 
     //***************************快手用户信息开始************************************
@@ -330,6 +366,18 @@ public class JwtUtils
         return getValue(claims, SecurityConstants.DETAILS_FH_OPENID);
     }
 
+    /**
+     * 根据令牌获取快手用户openId
+     *
+     * @param token 令牌
+     * @return -
+     */
+    public static String getFhUserOpenid(String token)
+    {
+        Claims claims = parseToken(token);
+        return getValue(claims, SecurityConstants.DETAILS_FH_OPENID);
+    }
+
     //***************************快手用户信息结束************************************
 
     /**

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/CreatorTokenService.java

@@ -71,7 +71,7 @@ public class CreatorTokenService
     {
         if (StringUtils.isNotEmpty(token))
         {
-            String creatorKey = JwtUtils.getCreatorKey(token);
+            String creatorKey = JwtUtils.getCreatorPhone(token);
             redisService.deleteObject(getTokenKey(creatorKey));
         }
     }
@@ -86,7 +86,7 @@ public class CreatorTokenService
         loginCreator.setLoginTime(System.currentTimeMillis());
         loginCreator.setExpireTime(loginCreator.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginCreator缓存
-        String creatorKey = getTokenKey(loginCreator.getToken());
+        String creatorKey = getTokenKey(loginCreator.getCreator().getPhone());
         redisService.setCacheObject(creatorKey, loginCreator, expireTime, TimeUnit.MINUTES);
     }
 

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/FhUserTokenService.java

@@ -74,7 +74,7 @@ public class FhUserTokenService
     {
         if (StringUtils.isNotEmpty(token))
         {
-            String fhUserKey = JwtUtils.getFhUserKey(token);
+            String fhUserKey = JwtUtils.getFhUserOpenid(token);
             redisService.deleteObject(getTokenKey(fhUserKey));
         }
     }
@@ -89,7 +89,7 @@ public class FhUserTokenService
         loginFhUser.setLoginTime(System.currentTimeMillis());
         loginFhUser.setExpireTime(loginFhUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginFhUser缓存
-        String fhUserKey = getTokenKey(loginFhUser.getToken());
+        String fhUserKey = getTokenKey(loginFhUser.getFhUser().getFhCode());
         redisService.setCacheObject(fhUserKey, loginFhUser, expireTime, TimeUnit.MINUTES);
     }
 

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/TiktokUserTokenService.java

@@ -74,8 +74,8 @@ public class TiktokUserTokenService
     {
         if (StringUtils.isNotEmpty(token))
         {
-            String tiktokUserKey = JwtUtils.getTiktokUserKey(token);
+            String tiktokUserOpenid = JwtUtils.getTiktokUserOpenid(token);
-            redisService.deleteObject(getTokenKey(tiktokUserKey));
+            redisService.deleteObject(getTokenKey(tiktokUserOpenid));
         }
     }
 
@@ -89,7 +89,7 @@ public class TiktokUserTokenService
         loginTiktokUser.setLoginTime(System.currentTimeMillis());
         loginTiktokUser.setExpireTime(loginTiktokUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginTiktokUser缓存
-        String tiktokUserKey = getTokenKey(loginTiktokUser.getToken());
+        String tiktokUserKey = getTokenKey(loginTiktokUser.getTiktokUser().getTiktokCode());
         redisService.setCacheObject(tiktokUserKey, loginTiktokUser, expireTime, TimeUnit.MINUTES);
     }
 

bnyer-common/bnyer-common-security/src/main/java/com/bnyer/common/security/service/WxUserTokenService.java

@@ -75,7 +75,7 @@ public class WxUserTokenService
     {
         if (StringUtils.isNotEmpty(token))
         {
-            String wxUserKey = JwtUtils.getWechatUserKey(token);
+            String wxUserKey = JwtUtils.getWechatUserOpenid(token);
             redisService.deleteObject(getTokenKey(wxUserKey));
         }
     }
@@ -90,8 +90,8 @@ public class WxUserTokenService
         loginWechatUser.setLoginTime(System.currentTimeMillis());
         loginWechatUser.setExpireTime(loginWechatUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginWechatUser缓存
-        String fhUserKey = getTokenKey(loginWechatUser.getToken());
+        String wxUserKey = getTokenKey(loginWechatUser.getWxUser().getWxCode());
-        redisService.setCacheObject(fhUserKey, loginWechatUser, expireTime, TimeUnit.MINUTES);
+        redisService.setCacheObject(wxUserKey, loginWechatUser, expireTime, TimeUnit.MINUTES);
     }
 
     private String getTokenKey(String token)