refactor: 调整注解路径至common包下

src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java

@@ -7,7 +7,7 @@ import com.youlai.boot.shared.auth.model.RefreshTokenRequest;
 import com.youlai.boot.shared.auth.service.AuthService;
 import com.youlai.boot.shared.auth.model.CaptchaResponse;
 import com.youlai.boot.shared.auth.model.AuthTokenResponse;
-import com.youlai.boot.core.annotation.Log;
+import com.youlai.boot.common.annotation.Log;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 /**
  * 认证控制层
  *
- * @author Ray
+ * @author Ray.Hao
  * @since 2022/10/16
  */
 @Tag(name = "01.认证中心")

src/main/java/com/youlai/boot/shared/auth/service/impl/AuthServiceImpl.java

@@ -9,7 +9,7 @@ import com.youlai.boot.common.constant.SecurityConstants;
 import com.youlai.boot.common.exception.BusinessException;
 import com.youlai.boot.common.result.ResultCode;
 import com.youlai.boot.config.property.CaptchaProperties;
-import com.youlai.boot.core.security.extension.WeChatAuthenticationToken;
+import com.youlai.boot.core.security.extension.WechatAuthenticationToken;
 import com.youlai.boot.core.security.util.SecurityUtils;
 import com.youlai.boot.shared.auth.enums.CaptchaTypeEnum;
 import com.youlai.boot.shared.auth.model.AuthTokenResponse;
@@ -78,7 +78,7 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public AuthTokenResponse wechatLogin(String code) {
         // 1. 创建用户微信认证的令牌（未认证）
-        WeChatAuthenticationToken authenticationToken = new WeChatAuthenticationToken(code);
+        WechatAuthenticationToken authenticationToken = new WechatAuthenticationToken(code);
 
         // 2. 执行认证（认证中）
         Authentication authentication = authenticationManager.authenticate(authenticationToken);

src/main/java/com/youlai/boot/shared/auth/service/impl/JwtTokenService.java

@@ -59,17 +59,17 @@ public class JwtTokenService implements TokenService {
      */
     @Override
     public AuthTokenResponse generateToken(Authentication authentication) {
-        int accessTokenExpiration = securityProperties.getJwt().getAccessTokenExpiration();
-        int refreshTokenExpiration = securityProperties.getJwt().getRefreshTokenExpiration();
+        int accessTokenTimeToLive = securityProperties.getJwt().getAccessTokenTimeToLive();
+        int refreshTokenTimeToLive = securityProperties.getJwt().getRefreshTokenTimeToLive();
 
-        String accessToken = generateToken(authentication, accessTokenExpiration);
-        String refreshToken = generateToken(authentication, refreshTokenExpiration);
+        String accessToken = generateToken(authentication, accessTokenTimeToLive);
+        String refreshToken = generateToken(authentication, refreshTokenTimeToLive);
 
         return AuthTokenResponse.builder()
                 .accessToken(accessToken)
                 .refreshToken(refreshToken)
                 .tokenType("Bearer")
-                .expiresIn(accessTokenExpiration)
+                .expiresIn(accessTokenTimeToLive)
                 .build();
     }
 
@@ -172,7 +172,7 @@ public class JwtTokenService implements TokenService {
         }
 
         Authentication authentication = parseToken(refreshToken);
-        int accessTokenExpiration = securityProperties.getJwt().getAccessTokenExpiration();
+        int accessTokenExpiration = securityProperties.getJwt().getRefreshTokenTimeToLive();
         String newAccessToken = generateToken(authentication, accessTokenExpiration);
 
         return AuthTokenResponse.builder()
@@ -187,11 +187,11 @@ public class JwtTokenService implements TokenService {
     /**
      * 生成 JWT Token
      *
-     * @param authentication
-     * @param expiration
+     * @param authentication 认证信息
+     * @param ttl           过期时间
      * @return
      */
-    private String generateToken(Authentication authentication, int expiration) {
+    private String generateToken(Authentication authentication, int ttl) {
 
         SysUserDetails userDetails = (SysUserDetails) authentication.getPrincipal();
 
@@ -210,8 +210,8 @@ public class JwtTokenService implements TokenService {
         payload.put(JWTPayload.ISSUED_AT, now);
 
         // 设置过期时间 -1 表示永不过期
-        if (expiration != -1) {
-            Date expiresAt = DateUtil.offsetSecond(now, expiration);
+        if (ttl != -1) {
+            Date expiresAt = DateUtil.offsetSecond(now, ttl);
             payload.put(JWTPayload.EXPIRES_AT, expiresAt);
         }
         payload.put(JWTPayload.SUBJECT, authentication.getName());

src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java

@@ -10,7 +10,7 @@ import com.youlai.boot.shared.codegen.model.form.GenConfigForm;
 import com.youlai.boot.shared.codegen.model.query.TablePageQuery;
 import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO;
 import com.youlai.boot.shared.codegen.model.vo.TablePageVO;
-import com.youlai.boot.core.annotation.Log;
+import com.youlai.boot.common.annotation.Log;
 import com.youlai.boot.shared.codegen.service.GenConfigService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;