feat(system/client): 添加双token认证配置

Author: luoqiz

continew-server/src/main/resources/config/application-dev.yml

@@ -12,9 +12,9 @@ server:
 spring.datasource:
   type: com.zaxxer.hikari.HikariDataSource
   # 请务必提前创建好名为 continew_admin 的数据库，如果使用其他数据库名请注意同步修改 DB_NAME 配置
-  url: jdbc:p6spy:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+  url: jdbc:p6spy:mysql://${DB_HOST:hw.luoqiz.top}:${DB_PORT:3396}/${DB_NAME:continew_admin_tenant5}?serverTimezone=Asia/Shanghai&useSSL=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&autoReconnect=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
   username: ${DB_USER:root}
-  password: ${DB_PWD:123456}
+  password: ${DB_PWD:!qaz2wsX}
   driver-class-name: com.p6spy.engine.spy.P6SpyDriver
   #  # PostgreSQL 配置
   #  url: jdbc:p6spy:postgresql://${DB_HOST:127.0.0.1}:${DB_PORT:5432}/${DB_NAME:continew_admin}?options=-c%20TimeZone=Asia/Shanghai&sslmode=prefer&channelBinding=prefer&stringtype=unspecified
@@ -46,13 +46,13 @@ spring.data:
   ## Redis 配置（单机模式）
   redis:
     # 地址
-    host: ${REDIS_HOST:127.0.0.1}
+    host: ${REDIS_HOST:hw.luoqiz.top}
     # 端口（默认 6379）
-    port: ${REDIS_PORT:6379}
+    port: ${REDIS_PORT:6397}
     # 密码（未设置密码时请注释掉）
-    password: ${REDIS_PWD:123456}
+    password: ${REDIS_PWD:luoqiz666}
     # 数据库索引
-    database: ${REDIS_DB:0}
+    database: ${REDIS_DB:15}
     # 连接超时时间
     timeout: 10s
     # 是否开启 SSL

continew-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java

@@ -141,7 +141,7 @@ protected LoginResp authenticate(UserDO user, ClientResp client) {
         extraData.put(AuthConstants.LOGIN_USER, userContext);
         loginParameter.setExtraData(extraData);
         UserContextHolder.setContext(userContext);
-        return LoginHandler.bulderLoginResp(loginParameter, userContext, client);
+        return LoginHandler.buildLoginResp(loginParameter, userContext, client);
     }
 
     /**

continew-system/src/main/java/top/continew/admin/auth/LoginHandler.java

@@ -81,13 +81,12 @@ public interface LoginHandler<T extends LoginReq> {
      * @param client         客户端信息
      * @return
      */
-    static LoginResp bulderLoginResp(SaLoginParameter loginParameter, UserContext userContext, ClientResp client) {
+    static LoginResp buildLoginResp(SaLoginParameter loginParameter, UserContext userContext, ClientResp client) {
         StpUtil.login(userContext.getId(), loginParameter);
-        if (client.getIsEnableRefreshToken()) {
+        if (Boolean.TRUE.equals(client.getIsEnableRefreshToken())) {
             // 刷新令牌设置的有效时长
-            long refreshExpiresIn = client.getRefreshTokenTimeout() > 0L
-                    ? client.getRefreshTokenTimeout()
-                    : client.getTimeout();
+            long refreshExpiresIn = (client.getRefreshTokenTimeout() != null && client.getRefreshTokenTimeout() > 0L)
+                    ? client.getRefreshTokenTimeout() : client.getTimeout();
             String refreshToken = SaTempUtil.createToken(userContext.getId(), refreshExpiresIn, false);
             // 将生成的token保存一份，方便刷新token时删除先前的token
             loginParameter.setToken(StpUtil.getTokenValue());

continew-system/src/main/java/top/continew/admin/auth/controller/AuthController.java

@@ -25,6 +25,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import me.zhyd.oauth.request.AuthRequest;
 import me.zhyd.oauth.utils.AuthStateUtils;
@@ -75,7 +76,7 @@ public LoginResp login(@RequestBody @Valid LoginReq req, HttpServletRequest requ
     @SaIgnore
     @Operation(summary = "刷新token", description = "刷新token")
     @PostMapping("/refreshToken")
-    public LoginResp refreshToken(String refreshToken) {
+    public LoginResp refreshToken(@RequestParam("refreshToken") @NotBlank String refreshToken) {
         return authService.refreshToken(refreshToken);
     }
 
@@ -95,8 +96,8 @@ public Object logout() {
     public SocialAuthAuthorizeResp authorize(@PathVariable @EnumValue(value = SocialSourceEnum.class, message = "第三方平台无效") String source) {
         AuthRequest authRequest = authRequestFactory.getAuthRequest(source);
         return SocialAuthAuthorizeResp.builder()
-            .authorizeUrl(authRequest.authorize(AuthStateUtils.createState()))
-            .build();
+                .authorizeUrl(authRequest.authorize(AuthStateUtils.createState()))
+                .build();
     }
 
     @Log(ignore = true)

continew-system/src/main/java/top/continew/admin/auth/model/resp/DoubleTokenLoginResp.java

@@ -18,13 +18,15 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 /**
  * 双token模式
  */
 @Data
 @SuperBuilder
+@EqualsAndHashCode(callSuper = true)
 public class DoubleTokenLoginResp extends LoginResp {
 
     /**

continew-system/src/main/java/top/continew/admin/auth/model/resp/SingleTokenLoginResp.java

@@ -18,13 +18,15 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 /**
  * 单token模式，只有访问的token
  */
 @Data
 @SuperBuilder
+@EqualsAndHashCode(callSuper = true)
 public class SingleTokenLoginResp extends LoginResp {
 
     /**

continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java

@@ -144,7 +144,7 @@ public LoginResp refreshToken(String refreshToken) {
         ClientResp client = clientService.getByClientId(userContext.getClientId());
         // 删除原先的 Token
         StpUtil.kickoutByTokenValue(loginParameter.getToken());
-        LoginResp loginResp = LoginHandler.bulderLoginResp(loginParameter, userContext, client);
+        LoginResp loginResp = LoginHandler.buildLoginResp(loginParameter, userContext, client);
         // 删除原先的 Refresh token
         SaTempUtil.deleteToken(refreshToken);
         return loginResp;