refactor: 修改方法名更加具体

Author: cadecode

framework/framework_base/src/main/java/com/github/cadecode/uniboot/framework/base/config/SecurityConfig.java

@@ -197,6 +197,8 @@ public static class TokenConfig {
         /**
          * 单个账号最多允许几个 token（大于 0）
          * 为 1 时即不允许多次登录同时在线
+         * 为 null 或小于 0 时表示不限制
+         * 仅在 Redis 模式下生效
          */
         private Integer maxCount = 1;
 

framework/framework_base/src/main/java/com/github/cadecode/uniboot/framework/base/security/strategy/JwtTokenAuthStrategyImpl.java

@@ -39,12 +39,12 @@ public void handler(HttpServletRequest request, HttpServletResponse response, Fi
             return;
         }
         // token 不合法
-        if (!TokenUtil.verifyToken(jwtToken, SecurityUtil.getSecret())) {
+        if (!TokenUtil.verifyToken(jwtToken, SecurityUtil.getTokenSecret())) {
             writeResponse(response, AuthErrorEnum.TOKEN_ERROR, requestURI);
             return;
         }
         // token 已过期
-        if (TokenUtil.isExpired(jwtToken, SecurityUtil.getSecret())) {
+        if (TokenUtil.isExpired(jwtToken, SecurityUtil.getTokenSecret())) {
             writeResponse(response, AuthErrorEnum.TOKEN_EXPIRED, requestURI);
             return;
         }
@@ -57,15 +57,15 @@ public void handler(HttpServletRequest request, HttpServletResponse response, Fi
         // 获取过期时间，单位秒
         long expiresAt = Long.parseLong(String.valueOf(payload.get("exp")));
         // 过期时间的一半，秒转为毫秒
-        long halfExpiration = SecurityUtil.getExpiration() / 2;
+        long halfExpiration = SecurityUtil.getTokenExpiration() / 2;
         // 如果当时时间距离过期时间不到配置的 expiration 一半，就下发新的 token
         if (expiresAt - System.currentTimeMillis() / 1000 < halfExpiration) {
             // 生成 jwt token
             String newJwtToken = TokenUtil.generateToken(sysUserDetails.getId(), sysUserDetails.getUsername(), sysUserDetails.getRoles(),
-                    SecurityUtil.getExpiration(), SecurityUtil.getSecret());
+                    SecurityUtil.getTokenExpiration(), SecurityUtil.getTokenSecret());
             // token 放在请求头
             response.addHeader(HttpConst.HEAD_TOKEN, newJwtToken);
-            ServletUtil.addCookie(response, HttpConst.HEAD_TOKEN, newJwtToken, SecurityUtil.getExpiration().intValue());
+            ServletUtil.addCookie(response, HttpConst.HEAD_TOKEN, newJwtToken, SecurityUtil.getTokenExpiration().intValue());
         }
         filterChain.doFilter(request, response);
     }

framework/framework_base/src/main/java/com/github/cadecode/uniboot/framework/base/security/strategy/RedisTokenAuthStrategyImpl.java

@@ -50,11 +50,11 @@ public void handler(HttpServletRequest request, HttpServletResponse response, Fi
             return;
         }
         // 用户存在，刷新过期时间
-        RedisUtil.expire(loginUserTokenKey, SecurityUtil.getExpiration(), TimeUnit.SECONDS);
+        RedisUtil.expire(loginUserTokenKey, SecurityUtil.getTokenExpiration(), TimeUnit.SECONDS);
         String loginUsernameKey = KeyGeneUtil.key(KeyPrefixConst.LOGIN_USER, sysUserDetails.getUsername());
-        RedisUtil.expire(loginUsernameKey, SecurityUtil.getExpiration(), TimeUnit.SECONDS);
+        RedisUtil.expire(loginUsernameKey, SecurityUtil.getTokenExpiration(), TimeUnit.SECONDS);
 
-        ServletUtil.addCookie(response, HttpConst.HEAD_TOKEN, uuidToken, SecurityUtil.getExpiration().intValue());
+        ServletUtil.addCookie(response, HttpConst.HEAD_TOKEN, uuidToken, SecurityUtil.getTokenExpiration().intValue());
         // 设置 AuthenticationToken
         setAuthentication(request, sysUserDetails);
         filterChain.doFilter(request, response);

framework/framework_base/src/main/java/com/github/cadecode/uniboot/framework/base/util/SecurityUtil.java

@@ -36,15 +36,15 @@ public static SecurityProperties properties() {
         return PROPERTIES;
     }
 
-    public static Long getExpiration() {
+    public static Long getTokenExpiration() {
         return PROPERTIES.getTokenConfig().getExpiration();
     }
 
-    public static String getSecret() {
+    public static String getTokenSecret() {
         return PROPERTIES.getTokenConfig().getSecret();
     }
 
-    public static Integer getMaxCount() {
+    public static Integer getTokenMaxCount() {
         return PROPERTIES.getTokenConfig().getMaxCount();
     }
 

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/security/JwtLoginSuccessHandleService.java

@@ -29,7 +29,7 @@ public ApiResult<SysUserDetails> getResult(HttpServletRequest request, HttpServl
         SysUserDetails sysUserDetails = (SysUserDetails) authentication.getPrincipal();
         // 生成 jwt token
         String jwtToken = TokenUtil.generateToken(sysUserDetails.getId(), sysUserDetails.getUsername(), sysUserDetails.getRoles(),
-                SecurityUtil.getExpiration(), SecurityUtil.getSecret());
+                SecurityUtil.getTokenExpiration(), SecurityUtil.getTokenSecret());
         // token 放在请求头
         response.addHeader(HttpConst.HEAD_TOKEN, jwtToken);
         return ApiResult.ok(sysUserDetails).path(FrameSecurityConfig.LOGOUT_URL);

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/security/RedisLoginSuccessHandleService.java

@@ -46,8 +46,8 @@ public ApiResult<SysUserDetails> getResult(HttpServletRequest request, HttpServl
         String loginUsernameKey = KeyGeneUtil.key(KeyPrefixConst.LOGIN_USER, sysUserDetails.getUsername());
         // 获取当前账号 token 列表
         List<String> tokenList = getTokenList(loginUsernameKey, loginUserTokenKey);
-        RedisUtil.set(loginUserTokenKey, sysUserDetails, SecurityUtil.getExpiration(), TimeUnit.SECONDS);
-        RedisUtil.set(loginUsernameKey, tokenList, SecurityUtil.getExpiration(), TimeUnit.SECONDS);
+        RedisUtil.set(loginUserTokenKey, sysUserDetails, SecurityUtil.getTokenExpiration(), TimeUnit.SECONDS);
+        RedisUtil.set(loginUsernameKey, tokenList, SecurityUtil.getTokenExpiration(), TimeUnit.SECONDS);
         return ApiResult.ok(sysUserDetails).path(FrameSecurityConfig.LOGOUT_URL);
     }
 
@@ -57,7 +57,7 @@ private List<String> getTokenList(String loginUsernameKey, String loginUserToken
             return new ArrayList<>(Collections.singletonList(loginUserTokenKey));
         }
         // 当配置了最大 token 数
-        Integer maxTokenCount = SecurityUtil.getMaxCount();
+        Integer maxTokenCount = SecurityUtil.getTokenMaxCount();
         if (Objects.nonNull(maxTokenCount) && maxTokenCount > 0) {
             tokenList.add(loginUserTokenKey);
             if (tokenList.size() > maxTokenCount) {