fix: 修复token有效期问题

Author: zhoutaoo

src/main/java/io/github/opensabre/authorization/entity/RegisteredClientConvert.java

@@ -14,12 +14,16 @@
 import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static org.springframework.security.oauth2.server.authorization.settings.ConfigurationSettingNames.Token.*;
+
 @Component
 public class RegisteredClientConvert {
 
@@ -44,6 +48,7 @@ public RegisteredClient convertToRegisteredClient(RegisteredClientPo registeredC
         Set<ClientAuthenticationMethod> methods = Arrays.stream(StringUtils.split(registeredClientPo.getClientAuthenticationMethods(), ","))
                 .map(ClientAuthenticationMethod::new)
                 .collect(Collectors.toSet());
+        Map<String, Object> tokenSettings = registeredClientPo.getTokenSettings();
         // 构建 RegisteredClient对象
         RegisteredClient.Builder registeredClientBuilder = RegisteredClient.withId(registeredClientPo.getId())
                 .clientId(registeredClientPo.getClientId())
@@ -54,16 +59,18 @@ public RegisteredClient convertToRegisteredClient(RegisteredClientPo registeredC
                 .clientAuthenticationMethods(methodSet -> methodSet.addAll(methods))
                 .scopes(scopeSet -> scopeSet.addAll(scopes))
                 .authorizationGrantTypes(grantType -> grantType.addAll(grantTypes))
+                // Client相关设置
                 .clientSettings(ClientSettings.withSettings(registeredClientPo.getClientSettings()).build())
+                // Token相关设置
                 .tokenSettings(TokenSettings.builder()
                                 // token有效期5小时
-//                        .accessTokenTimeToLive(registeredClientPo.getTokenSettings().getAccessTokenTimeToLive())
+                        .accessTokenTimeToLive(Duration.ofSeconds(((Double)tokenSettings.get(ACCESS_TOKEN_TIME_TO_LIVE)).longValue()))
                                 // 使用默认JWT相关格式
                                 .accessTokenFormat(OAuth2TokenFormat.SELF_CONTAINED)
                                 // 开启刷新token
-                                .reuseRefreshTokens(true)
+                                .reuseRefreshTokens((Boolean)tokenSettings.get(REUSE_REFRESH_TOKENS))
                                 // refreshToken有效期120分钟
-//                        .refreshTokenTimeToLive(registeredClientPo.getTokenSettings().getRefreshTokenTimeToLive())
+                        .refreshTokenTimeToLive(Duration.ofSeconds(((Double)tokenSettings.get(REFRESH_TOKEN_TIME_TO_LIVE)).longValue()))
                                 // idToken签名算法
                                 .idTokenSignatureAlgorithm(SignatureAlgorithm.RS256).build()
                 );

src/main/java/io/github/opensabre/authorization/provider/SmsCodeProvider.java

@@ -2,19 +2,18 @@
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
 
 /**
- * todo 实现短信验证码的服务
+ * 实现短信验证码的服务
  */
-@FeignClient(name = "base-sms", fallback = OrganizationProviderFallback.class)
+@FeignClient(name = "base-sysadmin", fallback = OrganizationProviderFallback.class)
 public interface SmsCodeProvider {
 
     /**
-     * @param mobile 手机号
+     * @param phoneNo 手机号
      * @return String 验证码
      */
-    @GetMapping(value = "/sms/{mobile}")
-    String getSmsCode(@PathVariable("mobile") String mobile, @RequestParam("businessType") String businessType);
+    @GetMapping(value = "/captcha/send/sms")
+    String getSmsCode(@RequestPart("phoneNo") String phoneNo, @RequestPart("scenario") String scenario);
 }