fix(justauth): 修复授权请求超时

戈灵虎
1 parent d8de2406
Showing 1 changed file with 25 additions and 22 deletions
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/framework/justauth/core/AuthRequestFactory.java
@@ -63,7 +63,7 @@ public class AuthRequestFactory {
      *
      * @return Oauth列表
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public List<String> oauthList() {
         // 默认列表
         List<String> defaultList = new ArrayList<>(properties.getType().keySet());
@@ -100,9 +100,10 @@ public class AuthRequestFactory {
         AuthRequest authRequest = getDefaultRequest(source);
         // 如果获取不到则尝试取自定义的
-//        if (authRequest == null) {
-//            authRequest = getExtendRequest(properties.getExtend().getEnumClass(), source);
-//        }
+        // if (authRequest == null) {
+        // authRequest = getExtendRequest(properties.getExtend().getEnumClass(),
+        // source);
+        // }
         if (authRequest == null) {
             throw new AuthException(AuthResponseStatus.UNSUPPORTED);
@@ -118,7 +119,7 @@ public class AuthRequestFactory {
      * @param source {@link AuthSource}
      * @return {@link AuthRequest}
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private AuthRequest getExtendRequest(Class clazz, String source) {
         String upperSource = source.toUpperCase();
         try {
@@ -151,7 +152,6 @@ public class AuthRequestFactory {
         return null;
     }
-
     /**
      * 获取默认的 Request
      *
@@ -272,13 +272,13 @@ public class AuthRequestFactory {
             case "OKTA":
                 return new AuthOktaRequest(config, authStateCache);
             case "PROGINN":
-                return new AuthProginnRequest(config,authStateCache);
+                return new AuthProginnRequest(config, authStateCache);
             case "AFDIAN":
-                return new AuthAfDianRequest(config,authStateCache);
+                return new AuthAfDianRequest(config, authStateCache);
             case "APPLE":
-                return new AuthAppleRequest(config,authStateCache);
+                return new AuthAppleRequest(config, authStateCache);
             case "FIGMA":
-                return new AuthFigmaRequest(config,authStateCache);
+                return new AuthFigmaRequest(config, authStateCache);
             case "WECHAT_MINI_PROGRAM":
                 config.setIgnoreCheckRedirectUri(true);
                 config.setIgnoreCheckState(true);
@@ -300,23 +300,26 @@ public class AuthRequestFactory {
      * @param authSource {@link AuthSource}
      * @param authConfig {@link AuthConfig}
      */
-    private void configureHttpConfig(String authSource, AuthConfig authConfig, JustAuthProperties.JustAuthHttpConfig httpConfig) {
+    private void configureHttpConfig(String authSource, AuthConfig authConfig,
+            JustAuthProperties.JustAuthHttpConfig httpConfig) {
         if (null == httpConfig) {
             return;
         }
-        Map<String, JustAuthProperties.JustAuthProxyConfig> proxyConfigMap = httpConfig.getProxy();
-        if (CollectionUtils.isEmpty(proxyConfigMap)) {
-            return;
-        }
-        JustAuthProperties.JustAuthProxyConfig proxyConfig = proxyConfigMap.get(authSource);
-        if (null == proxyConfig) {
-            return;
+        // 构建 HttpConfig，优先设置 timeout（独立于 proxy 配置）
+        HttpConfig.HttpConfigBuilder builder = HttpConfig.builder()
+                .timeout(httpConfig.getTimeout());
+
+        // 如果有代理配置，则设置代理
+        Map<String, JustAuthProperties.JustAuthProxyConfig> proxyConfigMap = httpConfig.getProxy();
+        if (!CollectionUtils.isEmpty(proxyConfigMap)) {
+            JustAuthProperties.JustAuthProxyConfig proxyConfig = proxyConfigMap.get(authSource);
+            if (null != proxyConfig) {
+                builder.proxy(new Proxy(Proxy.Type.valueOf(proxyConfig.getType()),
+                        new InetSocketAddress(proxyConfig.getHostname(), proxyConfig.getPort())));
+            }
         }
-        authConfig.setHttpConfig(HttpConfig.builder()
-                .timeout(httpConfig.getTimeout())
-                .proxy(new Proxy(Proxy.Type.valueOf(proxyConfig.getType()), new InetSocketAddress(proxyConfig.getHostname(), proxyConfig.getPort())))
-                .build());
+        authConfig.setHttpConfig(builder.build());
     }
 }