From 1f830ecacfd8453eeb8193c5a274899e5c1a6ca2 Mon Sep 17 00:00:00 2001
From: haoyanbing <binary_hao@163.com>
Date: Wed, 17 Nov 2021 18:45:43 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#2390=20=E3=80=90=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=91ApacheHttpClientBuilder=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=92=8C=E8=B6=85=E6=97=B6=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DefaultApacheHttpClientBuilder.java       | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java
index 3bb0d6114c..d1d492c0d9 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java
@@ -12,6 +12,7 @@
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.config.SocketConfig;
+import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -92,7 +93,17 @@ public class DefaultApacheHttpClientBuilder implements ApacheHttpClientBuilder {
    */
   private String userAgent;
 
-  private final HttpRequestRetryHandler httpRequestRetryHandler = new HttpRequestRetryHandler() {
+  /**
+   * 自定义重试策略
+   */
+  private HttpRequestRetryHandler httpRequestRetryHandler;
+
+  /**
+   * 自定义KeepAlive策略
+   */
+  private ConnectionKeepAliveStrategy connectionKeepAliveStrategy;
+
+  private final HttpRequestRetryHandler defaultHttpRequestRetryHandler = new HttpRequestRetryHandler() {
     @Override
     public boolean retryRequest(IOException exception, int executionCount, HttpContext context) {
       return false;
@@ -187,7 +198,16 @@ private synchronized void prepare() {
         .setConnectTimeout(this.connectionTimeout)
         .setConnectionRequestTimeout(this.connectionRequestTimeout)
         .build()
-      ).setRetryHandler(this.httpRequestRetryHandler);
+      );
+
+    // 设置重试策略，没有则使用默认
+    httpRequestRetryHandler = httpRequestRetryHandler == null ? defaultHttpRequestRetryHandler : httpRequestRetryHandler;
+    httpClientBuilder.setRetryHandler(httpRequestRetryHandler);
+
+    // 设置KeepAliveStrategy，没有使用默认
+    if (connectionKeepAliveStrategy != null) {
+      httpClientBuilder.setKeepAliveStrategy(connectionKeepAliveStrategy);
+    }
 
     if (StringUtils.isNotBlank(this.httpProxyHost) && StringUtils.isNotBlank(this.httpProxyUsername)) {
       // 使用代理服务器 需要用户认证的代理服务器