🎨 starter模块添加 HttpClient 超时配置

Author: qw8881569

spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/config/storage/AbstractWxMaConfigStorageConfiguration.java

@@ -2,6 +2,8 @@
 
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
+import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
+import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -10,6 +12,7 @@
 public abstract class AbstractWxMaConfigStorageConfiguration {
 
   protected WxMaDefaultConfigImpl config(WxMaDefaultConfigImpl config, WxMaProperties properties) {
+    WxMaProperties.ConfigStorage storage = properties.getConfigStorage();
     config.setAppid(StringUtils.trimToNull(properties.getAppid()));
     config.setSecret(StringUtils.trimToNull(properties.getSecret()));
     config.setToken(StringUtils.trimToNull(properties.getToken()));
@@ -25,6 +28,19 @@ protected WxMaDefaultConfigImpl config(WxMaDefaultConfigImpl config, WxMaPropert
       config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
     }
 
+    // 设置自定义的HttpClient超时配置
+    ApacheHttpClientBuilder clientBuilder = config.getApacheHttpClientBuilder();
+    if (clientBuilder == null) {
+      clientBuilder = DefaultApacheHttpClientBuilder.get();
+    }
+    if (clientBuilder instanceof DefaultApacheHttpClientBuilder) {
+      DefaultApacheHttpClientBuilder defaultBuilder = (DefaultApacheHttpClientBuilder) clientBuilder;
+      defaultBuilder.setConnectionTimeout(storage.getConnectionTimeout());
+      defaultBuilder.setSoTimeout(storage.getSoTimeout());
+      defaultBuilder.setConnectionRequestTimeout(storage.getConnectionRequestTimeout());
+      config.setApacheHttpClientBuilder(defaultBuilder);
+    }
+
     int maxRetryTimes = configStorageProperties.getMaxRetryTimes();
     if (configStorageProperties.getMaxRetryTimes() < 0) {
       maxRetryTimes = 0;

spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java

@@ -112,6 +112,21 @@ public static class ConfigStorage {
      * </pre>
      */
     private int maxRetryTimes = 5;
+
+    /**
+     * 连接超时时间，单位毫秒
+     */
+    private int connectionTimeout = 5000;
+
+    /**
+     * 读数据超时时间，即socketTimeout，单位毫秒
+     */
+    private int soTimeout = 5000;
+
+    /**
+     * 从连接池获取链接的超时时间，单位毫秒
+     */
+    private int connectionRequestTimeout = 5000;
   }
 
 }

spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java

@@ -9,6 +9,8 @@
 import me.chanjar.weixin.common.redis.JedisWxRedisOps;
 import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
 import me.chanjar.weixin.common.redis.WxRedisOps;
+import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
+import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
 import me.chanjar.weixin.mp.config.WxMpHostConfig;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
@@ -122,6 +124,19 @@ private void setWxMpInfo(WxMpDefaultConfigImpl config) {
     config.setSecret(properties.getSecret());
     config.setToken(properties.getToken());
     config.setAesKey(properties.getAesKey());
+    WxMpProperties.ConfigStorage storage = properties.getConfigStorage();
+    // 设置自定义的HttpClient超时配置
+    ApacheHttpClientBuilder clientBuilder = config.getApacheHttpClientBuilder();
+    if (clientBuilder == null) {
+      clientBuilder = DefaultApacheHttpClientBuilder.get();
+    }
+    if (clientBuilder instanceof DefaultApacheHttpClientBuilder) {
+      DefaultApacheHttpClientBuilder defaultBuilder = (DefaultApacheHttpClientBuilder) clientBuilder;
+      defaultBuilder.setConnectionTimeout(storage.getConnectionTimeout());
+      defaultBuilder.setSoTimeout(storage.getSoTimeout());
+      defaultBuilder.setConnectionRequestTimeout(storage.getConnectionRequestTimeout());
+      config.setApacheHttpClientBuilder(defaultBuilder);
+    }
     config.setUseStableAccessToken(wxMpProperties.isUseStableAccessToken());
     config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
     config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());

spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java

@@ -102,6 +102,21 @@ public static class ConfigStorage implements Serializable {
      */
     private String httpProxyPassword;
 
+    /**
+     * 连接超时时间，单位毫秒
+     */
+    private int connectionTimeout = 5000;
+
+    /**
+     * 读数据超时时间，即socketTimeout，单位毫秒
+     */
+    private int soTimeout = 1;
+
+    /**
+     * 从连接池获取链接的超时时间，单位毫秒
+     */
+    private int connectionRequestTimeout = 5000;
+
   }
 
 }

spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/storage/AbstractWxOpenConfigStorageConfiguration.java

@@ -1,6 +1,8 @@
 package com.binarywang.spring.starter.wxjava.open.config.storage;
 
 import com.binarywang.spring.starter.wxjava.open.properties.WxOpenProperties;
+import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
+import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import me.chanjar.weixin.open.api.impl.WxOpenInMemoryConfigStorage;
 
 /**
@@ -28,6 +30,20 @@ protected WxOpenInMemoryConfigStorage config(WxOpenInMemoryConfigStorage config,
     }
     config.setRetrySleepMillis(retrySleepMillis);
     config.setMaxRetryTimes(maxRetryTimes);
+    
+    // 设置自定义的HttpClient超时配置
+    ApacheHttpClientBuilder clientBuilder = config.getApacheHttpClientBuilder();
+    if (clientBuilder == null) {
+      clientBuilder = DefaultApacheHttpClientBuilder.get();
+    }
+    if (clientBuilder instanceof DefaultApacheHttpClientBuilder) {
+      DefaultApacheHttpClientBuilder defaultBuilder = (DefaultApacheHttpClientBuilder) clientBuilder;
+      defaultBuilder.setConnectionTimeout(storage.getConnectionTimeout());
+      defaultBuilder.setSoTimeout(storage.getSoTimeout());
+      defaultBuilder.setConnectionRequestTimeout(storage.getConnectionRequestTimeout());
+      config.setApacheHttpClientBuilder(defaultBuilder);
+    }
+    
     return config;
   }
 }