🎨 修复CloseableHttpClient相关的误用代码

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceHttpClientImpl.java

@@ -1,28 +1,28 @@
 package me.chanjar.weixin.channel.api.impl;
 
-import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.GET_ACCESS_TOKEN_URL;
-import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.GET_STABLE_ACCESS_TOKEN_URL;
-
-import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.channel.bean.token.StableTokenParam;
 import me.chanjar.weixin.channel.config.WxChannelConfig;
 import me.chanjar.weixin.channel.util.JsonUtils;
 import me.chanjar.weixin.common.util.http.HttpType;
+import me.chanjar.weixin.common.util.http.apache.ApacheBasicResponseHandler;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 
+import java.io.IOException;
+
+import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.GET_ACCESS_TOKEN_URL;
+import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.GET_STABLE_ACCESS_TOKEN_URL;
+
 /**
  * @author <a href="https://github.com/lixize">Zeyes</a>
  */
@@ -76,27 +76,12 @@ public class WxChannelServiceHttpClientImpl extends BaseWxChannelServiceImpl<Htt
 
     url = String.format(url, config.getAppid(), config.getSecret());
 
-    HttpGet httpGet = null;
+    HttpGet httpGet = new HttpGet(url);
-    CloseableHttpResponse response = null;
-    try {
-      httpGet = new HttpGet(url);
     if (this.getRequestHttpProxy() != null) {
       RequestConfig requestConfig = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();
       httpGet.setConfig(requestConfig);
     }
-      response = getRequestHttpClient().execute(httpGet);
+    return getRequestHttpClient().execute(httpGet, ApacheBasicResponseHandler.INSTANCE);
-      return new BasicResponseHandler().handleResponse(response);
-    } finally {
-      if (httpGet != null) {
-        httpGet.releaseConnection();
-      }
-      if (response != null) {
-        try {
-          response.close();
-        } catch (IOException ignored) {
-        }
-      }
-    }
   }
 
   /**
@@ -125,10 +110,6 @@ public class WxChannelServiceHttpClientImpl extends BaseWxChannelServiceImpl<Htt
     assert requestJson != null;
 
     httpPost.setEntity(new StringEntity(requestJson, ContentType.APPLICATION_JSON));
-    try (CloseableHttpResponse response = getRequestHttpClient().execute(httpPost)) {
+    return getRequestHttpClient().execute(httpPost, ApacheBasicResponseHandler.INSTANCE);
-      return new BasicResponseHandler().handleResponse(response);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/executor/ChannelFileUploadRequestExecutor.java

@@ -1,9 +1,5 @@
 package me.chanjar.weixin.channel.executor;
 
-
-import java.io.File;
-import java.io.IOException;
-
 import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestExecutor;
@@ -13,12 +9,14 @@ import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 
+import java.io.File;
+import java.io.IOException;
+
 /**
  * 视频号小店 图片上传接口 请求的参数是File, 返回的结果是String
  *
@@ -47,11 +45,7 @@ public class ChannelFileUploadRequestExecutor implements RequestExecutor<String,
         .build();
       httpPost.setEntity(entity);
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    return requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      return Utf8ResponseHandler.INSTANCE.handleResponse(response);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 
   @Override
@@ -60,6 +54,7 @@ public class ChannelFileUploadRequestExecutor implements RequestExecutor<String,
     handler.handle(this.execute(uri, data, wxType));
   }
 
+  @SuppressWarnings("unchecked")
   public static RequestExecutor<String, File> create(RequestHttp<?, ?> requestHttp) throws WxErrorException {
     switch (requestHttp.getRequestType()) {
       case APACHE_HTTP:

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/executor/ChannelMediaDownloadRequestExecutor.java

@@ -1,14 +1,5 @@
 package me.chanjar.weixin.channel.executor;
 
-import static org.apache.commons.io.FileUtils.openOutputStream;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.channel.bean.image.ChannelImageResponse;
 import me.chanjar.weixin.channel.util.JsonUtils;
@@ -30,6 +21,16 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.CloseableHttpClient;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.apache.commons.io.FileUtils.openOutputStream;
+
 /**
  * 下载媒体文件请求执行器
  *
@@ -90,10 +91,7 @@ public class ChannelMediaDownloadRequestExecutor implements RequestExecutor<Chan
         extension = "unknown";
       }
       File file = createTmpFile(inputStream, baseName, extension, tmpDirFile);
-      ChannelImageResponse result = new ChannelImageResponse(file, contentType);
+      return new ChannelImageResponse(file, contentType);
-      return result;
-    } finally {
-      httpGet.releaseConnection();
     }
   }
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/executor/CommonUploadRequestExecutorApacheImpl.java

@@ -8,10 +8,10 @@ import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.HttpMultipartMode;
@@ -52,9 +52,8 @@ public class CommonUploadRequestExecutorApacheImpl
         .build();
       httpPost.setEntity(entity);
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+    if (StringUtils.isEmpty(responseContent)) {
-      if (responseContent == null || responseContent.isEmpty()) {
       throw new WxErrorException(String.format("上传失败，服务器响应空 url:%s param:%s", uri, param));
     }
     WxError error = WxError.fromJson(responseContent, wxType);
@@ -62,9 +61,6 @@ public class CommonUploadRequestExecutorApacheImpl
       throw new WxErrorException(error);
     }
     return responseContent;
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 
   /**

weixin-java-common/src/main/java/me/chanjar/weixin/common/requestexecuter/ocr/OcrDiscernApacheHttpRequestExecutor.java

@@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -43,15 +42,11 @@ public class OcrDiscernApacheHttpRequestExecutor extends OcrDiscernRequestExecut
         .build();
       httpPost.setEntity(entity);
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, wxType);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
     return responseContent;
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheBasicResponseHandler.java

@@ -0,0 +1,9 @@
+package me.chanjar.weixin.common.util.http.apache;
+
+import org.apache.http.impl.client.BasicResponseHandler;
+
+public class ApacheBasicResponseHandler extends BasicResponseHandler {
+
+  public static final ApacheBasicResponseHandler INSTANCE = new ApacheBasicResponseHandler();
+
+}

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaDownloadRequestExecutor.java

@@ -68,11 +68,7 @@ public class ApacheMediaDownloadRequestExecutor extends BaseMediaDownloadRequest
         baseName = String.valueOf(System.currentTimeMillis());
       }
 
-      return FileUtils.createTmpFile(inputStream, baseName, FilenameUtils.getExtension(fileName),
+      return FileUtils.createTmpFile(inputStream, baseName, FilenameUtils.getExtension(fileName), super.tmpDirFile);
-        super.tmpDirFile);
-
-    } finally {
-      httpGet.releaseConnection();
     }
   }
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaInputStreamUploadRequestExecutor.java

@@ -10,7 +10,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.HttpMultipartMode;
@@ -45,15 +44,11 @@ public class ApacheMediaInputStreamUploadRequestExecutor extends MediaInputStrea
         .build();
       httpPost.setEntity(entity);
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, wxType);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
     return WxMediaUploadResult.fromJson(responseContent);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaUploadRequestExecutor.java

@@ -1,7 +1,7 @@
 package me.chanjar.weixin.common.util.http.apache;
 
-import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
@@ -9,7 +9,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -41,15 +40,11 @@ public class ApacheMediaUploadRequestExecutor extends MediaUploadRequestExecutor
         .build();
       httpPost.setEntity(entity);
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, wxType);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
     return WxMediaUploadResult.fromJson(responseContent);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMinishopMediaUploadRequestCustomizeExecutor.java

@@ -10,7 +10,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -58,16 +57,12 @@ public class ApacheMinishopMediaUploadRequestCustomizeExecutor extends MinishopU
               .build();
       httpPost.setEntity(entity);
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, wxType);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
     log.info("responseContent: {}", responseContent);
     return WxMinishopImageUploadCustomizeResult.fromJson(responseContent);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMinishopMediaUploadRequestExecutor.java

@@ -10,7 +10,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -43,16 +42,12 @@ public class ApacheMinishopMediaUploadRequestExecutor extends MinishopUploadRequ
         .build();
       httpPost.setEntity(entity);
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, wxType);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
     log.info("responseContent: {}", responseContent);
     return WxMinishopImageUploadResult.fromJson(responseContent);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java

@@ -6,7 +6,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 
@@ -37,12 +36,8 @@ public class ApacheSimpleGetRequestExecutor extends SimpleGetRequestExecutor<Clo
       httpGet.setConfig(config);
     }
 
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpGet)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpGet, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     return handleResponse(wxType, responseContent);
-    } finally {
-      httpGet.releaseConnection();
-    }
   }
 
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java

@@ -7,7 +7,6 @@ import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
 import org.apache.http.Consts;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -39,12 +38,8 @@ public class ApacheSimplePostRequestExecutor extends SimplePostRequestExecutor<C
       httpPost.setEntity(entity);
     }
 
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     return this.handleResponse(wxType, responseContent);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ByteArrayResponseHandler.java

@@ -0,0 +1,17 @@
+package me.chanjar.weixin.common.util.http.apache;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.impl.client.AbstractResponseHandler;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+
+public class ByteArrayResponseHandler extends AbstractResponseHandler<byte[]> {
+
+  public static final ByteArrayResponseHandler INSTANCE = new ByteArrayResponseHandler();
+
+  @Override
+  public byte[] handleEntity(HttpEntity entity) throws IOException {
+    return EntityUtils.toByteArray(entity);
+  }
+}

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/InputStreamResponseHandler.java

@@ -1,33 +1,23 @@
 package me.chanjar.weixin.common.util.http.apache;
 
+import org.apache.http.HttpEntity;
+import org.apache.http.client.ResponseHandler;
+import org.apache.http.impl.client.AbstractResponseHandler;
+
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.util.EntityUtils;
-
 /**
  * 输入流响应处理器.
  *
- * @author Daniel Qian
+ * @author altusea
  */
-public class InputStreamResponseHandler implements ResponseHandler<InputStream> {
+public class InputStreamResponseHandler extends AbstractResponseHandler<InputStream> {
+
   public static final ResponseHandler<InputStream> INSTANCE = new InputStreamResponseHandler();
-  private static final int STATUS_CODE_300 = 300;
 
   @Override
-  public InputStream handleResponse(final HttpResponse response) throws IOException {
+  public InputStream handleEntity(HttpEntity entity) throws IOException {
-    final StatusLine statusLine = response.getStatusLine();
+    return entity.getContent();
-    final HttpEntity entity = response.getEntity();
-    if (statusLine.getStatusCode() >= STATUS_CODE_300) {
-      EntityUtils.consume(entity);
-      throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
   }
-    return entity == null ? null : entity.getContent();
-  }
-
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/Utf8ResponseHandler.java

@@ -1,33 +1,24 @@
 package me.chanjar.weixin.common.util.http.apache;
 
-import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.HttpResponseException;
 import org.apache.http.client.ResponseHandler;
+import org.apache.http.impl.client.AbstractResponseHandler;
 import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 /**
- * copy from {@link org.apache.http.impl.client.BasicResponseHandler}
+ * Utf8ResponseHandler
  *
- * @author Daniel Qian
+ * @author altusea
  */
-public class Utf8ResponseHandler implements ResponseHandler<String> {
+public class Utf8ResponseHandler extends AbstractResponseHandler<String> {
 
   public static final ResponseHandler<String> INSTANCE = new Utf8ResponseHandler();
 
   @Override
-  public String handleResponse(final HttpResponse response) throws IOException {
+  public String handleEntity(HttpEntity entity) throws IOException {
-    final StatusLine statusLine = response.getStatusLine();
+    return EntityUtils.toString(entity, StandardCharsets.UTF_8);
-    final HttpEntity entity = response.getEntity();
-    if (statusLine.getStatusCode() >= 300) {
-      EntityUtils.consume(entity);
-      throw new HttpResponseException(statusLine.getStatusCode(), statusLine.toString());
   }
-    return entity == null ? null : EntityUtils.toString(entity, Consts.UTF_8);
-  }
-
 }

weixin-java-common/src/test/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilderTest.java

@@ -79,13 +79,13 @@ public class DefaultApacheHttpClientBuilderTest {
       HttpUriRequest request = new HttpGet("http://localhost:8080");
       HttpContext context = HttpClientContext.create();
       try (CloseableHttpResponse resp = client.execute(request, context)) {
-        Assert.assertEquals("requestInterceptor1", context.getAttribute("interceptor_called"), "成功调用 requestInterceptor1 并向 content 中写入了数据");
+        Assert.assertEquals(context.getAttribute("interceptor_called"), "requestInterceptor1", "成功调用 requestInterceptor1 并向 content 中写入了数据");
 
         // 测试拦截器执行顺序
-        Assert.assertEquals("requestInterceptor1", interceptorOrder.get(0));
+        Assert.assertEquals(interceptorOrder.get(0), "requestInterceptor1");
-        Assert.assertEquals("requestInterceptor2", interceptorOrder.get(1));
+        Assert.assertEquals(interceptorOrder.get(1), "requestInterceptor2");
-        Assert.assertEquals("responseInterceptor1", interceptorOrder.get(2));
+        Assert.assertEquals(interceptorOrder.get(2), "responseInterceptor1");
-        Assert.assertEquals("responseInterceptor2", interceptorOrder.get(3));
+        Assert.assertEquals(interceptorOrder.get(3), "responseInterceptor2");
       }
     }
   }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java

@@ -1,21 +1,19 @@
 package me.chanjar.weixin.cp.api.impl;
 
-
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.error.WxRuntimeException;
 import me.chanjar.weixin.common.util.http.HttpType;
+import me.chanjar.weixin.common.util.http.apache.ApacheBasicResponseHandler;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import me.chanjar.weixin.cp.config.WxCpConfigStorage;
 import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.IOException;
@@ -61,13 +59,7 @@ public class WxCpServiceApacheHttpClientImpl extends BaseWxCpServiceImpl<Closeab
             .setProxy(this.httpProxy).build();
           httpGet.setConfig(config);
         }
-        String resultContent;
+        String resultContent = getRequestHttpClient().execute(httpGet, ApacheBasicResponseHandler.INSTANCE);
-        try (CloseableHttpClient httpClient = getRequestHttpClient();
-             CloseableHttpResponse response = httpClient.execute(httpGet)) {
-          resultContent = new BasicResponseHandler().handleResponse(response);
-        } finally {
-          httpGet.releaseConnection();
-        }
         WxError error = WxError.fromJson(resultContent, WxType.CP);
         if (error.getErrorCode() != 0) {
           throw new WxErrorException(error);

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceImpl.java

@@ -6,14 +6,12 @@ import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.error.WxRuntimeException;
+import me.chanjar.weixin.common.util.http.apache.ApacheBasicResponseHandler;
 import me.chanjar.weixin.common.util.json.GsonParser;
 import me.chanjar.weixin.cp.config.WxCpConfigStorage;
 import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicResponseHandler;
-import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.IOException;
 import java.util.concurrent.locks.Lock;
@@ -55,13 +53,7 @@ public class WxCpServiceImpl extends WxCpServiceApacheHttpClientImpl {
           RequestConfig config = RequestConfig.custom().setProxy(getRequestHttpProxy()).build();
           httpGet.setConfig(config);
         }
-        String resultContent;
+        String resultContent = getRequestHttpClient().execute(httpGet, ApacheBasicResponseHandler.INSTANCE);
-        try (CloseableHttpClient httpClient = getRequestHttpClient();
-             CloseableHttpResponse response = httpClient.execute(httpGet)) {
-          resultContent = new BasicResponseHandler().handleResponse(response);
-        } finally {
-          httpGet.releaseConnection();
-        }
         WxError error = WxError.fromJson(resultContent, WxType.CP);
         if (error.getErrorCode() != 0) {
           throw new WxErrorException(error);

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpServiceApacheHttpClientImpl.java

@@ -1,12 +1,12 @@
 package me.chanjar.weixin.cp.tp.service.impl;
 
-
 import com.google.gson.JsonObject;
 import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.error.WxRuntimeException;
 import me.chanjar.weixin.common.util.http.HttpType;
+import me.chanjar.weixin.common.util.http.apache.ApacheBasicResponseHandler;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.json.GsonParser;
@@ -15,10 +15,8 @@ import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
 import org.apache.http.Consts;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.IOException;
@@ -68,20 +66,14 @@ public class WxCpTpServiceApacheHttpClientImpl extends BaseWxCpTpServiceImpl<Clo
         StringEntity entity = new StringEntity(jsonObject.toString(), Consts.UTF_8);
         httpPost.setEntity(entity);
 
-        String resultContent;
+        String resultContent = getRequestHttpClient().execute(httpPost, ApacheBasicResponseHandler.INSTANCE);
-        try (CloseableHttpClient httpclient = getRequestHttpClient();
-             CloseableHttpResponse response = httpclient.execute(httpPost)) {
-          resultContent = new BasicResponseHandler().handleResponse(response);
-        } finally {
-          httpPost.releaseConnection();
-        }
         WxError error = WxError.fromJson(resultContent, WxType.CP);
         if (error.getErrorCode() != 0) {
           throw new WxErrorException(error);
         }
         jsonObject = GsonParser.parse(resultContent);
         String suiteAccussToken = jsonObject.get("suite_access_token").getAsString();
-        Integer expiresIn = jsonObject.get("expires_in").getAsInt();
+        int expiresIn = jsonObject.get("expires_in").getAsInt();
         this.configStorage.updateSuiteAccessToken(suiteAccussToken, expiresIn);
       } catch (IOException e) {
         throw new WxRuntimeException(e);

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceHttpClientImpl.java

@@ -5,18 +5,16 @@ import cn.binarywang.wx.miniapp.bean.WxMaStableAccessTokenRequest;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.util.http.HttpType;
+import me.chanjar.weixin.common.util.http.apache.ApacheBasicResponseHandler;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.IOException;
@@ -75,22 +73,12 @@ public class WxMaServiceHttpClientImpl extends BaseWxMaServiceImpl {
 
     url = String.format(url, this.getWxMaConfig().getAppid(), this.getWxMaConfig().getSecret());
 
-    HttpGet httpGet = null;
+    HttpGet httpGet = new HttpGet(url);
-    CloseableHttpResponse response = null;
-    try {
-      httpGet = new HttpGet(url);
     if (this.getRequestHttpProxy() != null) {
       RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();
       httpGet.setConfig(config);
     }
-      response = getRequestHttpClient().execute(httpGet);
+    return getRequestHttpClient().execute(httpGet, ApacheBasicResponseHandler.INSTANCE);
-      return new BasicResponseHandler().handleResponse(response);
-    } finally {
-      if (httpGet != null) {
-        httpGet.releaseConnection();
-      }
-      IOUtils.closeQuietly(response);
-    }
   }
 
   @Override
@@ -100,10 +88,7 @@ public class WxMaServiceHttpClientImpl extends BaseWxMaServiceImpl {
       GET_STABLE_ACCESS_TOKEN.replace("https://api.weixin.qq.com", this.getWxMaConfig().getApiHostUrl()) :
       GET_STABLE_ACCESS_TOKEN;
 
-    HttpPost httpPost = null;
+    HttpPost httpPost = new HttpPost(url);
-    CloseableHttpResponse response = null;
-    try {
-      httpPost = new HttpPost(url);
     if (this.getRequestHttpProxy() != null) {
       RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();
       httpPost.setConfig(config);
@@ -114,14 +99,7 @@ public class WxMaServiceHttpClientImpl extends BaseWxMaServiceImpl {
     wxMaAccessTokenRequest.setGrantType("client_credential");
     wxMaAccessTokenRequest.setForceRefresh(forceRefresh);
     httpPost.setEntity(new StringEntity(wxMaAccessTokenRequest.toJson(), ContentType.APPLICATION_JSON));
-      response = getRequestHttpClient().execute(httpPost);
+    return getRequestHttpClient().execute(httpPost, ApacheBasicResponseHandler.INSTANCE);
-      return new BasicResponseHandler().handleResponse(response);
-    } finally {
-      if (httpPost != null) {
-        httpPost.releaseConnection();
-      }
-      IOUtils.closeQuietly(response);
-    }
   }
 
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheApiSignaturePostRequestExecutor.java

@@ -1,9 +1,6 @@
 package cn.binarywang.wx.miniapp.executor;
 
 import cn.binarywang.wx.miniapp.bean.WxMaApiResponse;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestHttp;
@@ -19,6 +16,10 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
 public class ApacheApiSignaturePostRequestExecutor
     extends ApiSignaturePostRequestExecutor<CloseableHttpClient, HttpHost> {
   private static final Logger logger =
@@ -64,8 +65,6 @@ public class ApacheApiSignaturePostRequestExecutor
         }
       }
       return this.handleResponse(wxType, responseContent, respHeaders);
-    } finally {
-      httpPost.releaseConnection();
     }
   }
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheQrcodeBytesRequestExecutor.java

@@ -63,8 +63,6 @@ public class ApacheQrcodeBytesRequestExecutor extends QrcodeBytesRequestExecutor
       }
 
       return IOUtils.toByteArray(inputStream);
-    } finally {
-      httpPost.releaseConnection();
     }
   }
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheQrcodeFileRequestExecutor.java

@@ -71,8 +71,6 @@ public class ApacheQrcodeFileRequestExecutor extends QrcodeRequestExecutor<Close
         return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
       }
       return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg", Paths.get(filePath).toFile());
-    } finally {
-      httpPost.releaseConnection();
     }
   }
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheUploadAuthMaterialRequestExecutor.java

@@ -9,7 +9,6 @@ import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -43,15 +42,11 @@ public class ApacheUploadAuthMaterialRequestExecutor extends UploadAuthMaterialR
         .build();
       httpPost.setEntity(entity);
     }
-        try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-            String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, wxType);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
     return WxMaUploadAuthMaterialResult.fromJson(responseContent);
-        } finally {
-            httpPost.releaseConnection();
-        }
   }
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheVodSingleUploadRequestExecutor.java

@@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -24,7 +23,6 @@ public class ApacheVodSingleUploadRequestExecutor extends VodSingleUploadRequest
 
   public ApacheVodSingleUploadRequestExecutor(RequestHttp<CloseableHttpClient, HttpHost> requestHttp, String mediaName, String mediaType, String coverType, File coverData, String sourceContext) {
     super(requestHttp, mediaName, mediaType, coverType, coverData, sourceContext);
-
   }
 
   @Override
@@ -54,15 +52,11 @@ public class ApacheVodSingleUploadRequestExecutor extends VodSingleUploadRequest
 
       httpPost.setEntity(entityBuilder.build());
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, wxType);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
     return WxMaVodSingleFileUploadResult.fromJson(responseContent);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheVodUploadPartRequestExecutor.java

@@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -45,15 +44,12 @@ public class ApacheVodUploadPartRequestExecutor extends VodUploadPartRequestExec
 
       httpPost.setEntity(entityBuilder.build());
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
     WxError error = WxError.fromJson(responseContent, wxType);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
     return WxMaVodUploadPartResult.fromJson(responseContent);
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java

@@ -1,18 +1,17 @@
 package me.chanjar.weixin.mp.api.impl;
 
 import me.chanjar.weixin.common.util.http.HttpType;
+import me.chanjar.weixin.common.util.http.apache.ApacheBasicResponseHandler;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.bean.WxMpStableAccessTokenRequest;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.IOException;
@@ -68,37 +67,19 @@ public class WxMpServiceHttpClientImpl extends BaseWxMpServiceImpl<CloseableHttp
   protected String doGetAccessTokenRequest() throws IOException {
     String url = String.format(GET_ACCESS_TOKEN_URL.getUrl(getWxMpConfigStorage()), getWxMpConfigStorage().getAppId(), getWxMpConfigStorage().getSecret());
 
-    HttpGet httpGet = null;
+    HttpGet httpGet = new HttpGet(url);
-    CloseableHttpResponse response = null;
-    try {
-      httpGet = new HttpGet(url);
     if (this.getRequestHttpProxy() != null) {
       RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();
       httpGet.setConfig(config);
     }
-      response = getRequestHttpClient().execute(httpGet);
+    return getRequestHttpClient().execute(httpGet, ApacheBasicResponseHandler.INSTANCE);
-      return new BasicResponseHandler().handleResponse(response);
-    } finally {
-      if (httpGet != null) {
-        httpGet.releaseConnection();
-      }
-      if (response != null) {
-        try {
-          response.close();
-        } catch (IOException e) {
-        }
-      }
-    }
   }
 
   @Override
   protected String doGetStableAccessTokenRequest(boolean forceRefresh) throws IOException {
     String url = GET_STABLE_ACCESS_TOKEN_URL.getUrl(getWxMpConfigStorage());
 
-    HttpPost httpPost = null;
+    HttpPost httpPost = new HttpPost(url);
-    CloseableHttpResponse response = null;
-    try {
-      httpPost = new HttpPost(url);
     if (this.getRequestHttpProxy() != null) {
       RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();
       httpPost.setConfig(config);
@@ -110,19 +91,7 @@ public class WxMpServiceHttpClientImpl extends BaseWxMpServiceImpl<CloseableHttp
     wxMaAccessTokenRequest.setForceRefresh(forceRefresh);
 
     httpPost.setEntity(new StringEntity(wxMaAccessTokenRequest.toJson(), ContentType.APPLICATION_JSON));
-      response = getRequestHttpClient().execute(httpPost);
+    return getRequestHttpClient().execute(httpPost, ApacheBasicResponseHandler.INSTANCE);
-      return new BasicResponseHandler().handleResponse(response);
-    } finally {
-      if (httpPost != null) {
-        httpPost.releaseConnection();
-      }
-      if (response != null) {
-        try {
-          response.close();
-        } catch (IOException e) {
-        }
-      }
-    }
   }
 
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteApacheHttpRequestExecutor.java

@@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -36,16 +35,11 @@ public class MaterialDeleteApacheHttpRequestExecutor extends MaterialDeleteReque
     Map<String, String> params = new HashMap<>();
     params.put("media_id", materialId);
     httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params)));
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, WxType.MP);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
-      } else {
+    }
     return true;
   }
-    } finally {
-      httpPost.releaseConnection();
-    }
-  }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoApacheHttpRequestExecutor.java

@@ -51,8 +51,6 @@ public class MaterialNewsInfoApacheHttpRequestExecutor
       } else {
         return WxMpGsonBuilder.create().fromJson(responseContent, WxMpMaterialNews.class);
       }
-    } finally {
-      httpPost.releaseConnection();
     }
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadApacheHttpRequestExecutor.java

@@ -68,8 +68,6 @@ public class MaterialUploadApacheHttpRequestExecutor extends MaterialUploadReque
       } else {
         return WxMpMaterialUploadResult.fromJson(responseContent);
       }
-    } finally {
-      httpPost.releaseConnection();
     }
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoApacheHttpRequestExecutor.java

@@ -9,7 +9,6 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -37,16 +36,12 @@ public class MaterialVideoInfoApacheHttpRequestExecutor extends MaterialVideoInf
     Map<String, String> params = new HashMap<>();
     params.put("media_id", materialId);
     httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params)));
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, WxType.MP);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     } else {
       return WxMpMaterialVideoInfoResult.fromJson(responseContent);
     }
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadApacheHttpRequestExecutor.java

@@ -57,8 +57,6 @@ public class MaterialVoiceAndImageDownloadApacheHttpRequestExecutor extends Mate
         }
       }
       return new ByteArrayInputStream(responseContent);
-    } finally {
-      httpPost.releaseConnection();
     }
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadApacheHttpRequestExecutor.java

@@ -55,8 +55,6 @@ public class MediaImgUploadApacheHttpRequestExecutor extends MediaImgUploadReque
       }
 
       return WxMediaImgUploadResult.fromJson(responseContent);
-    } finally {
-      httpPost.releaseConnection();
     }
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeApacheHttpRequestExecutor.java

@@ -59,8 +59,6 @@ public class QrCodeApacheHttpRequestExecutor extends QrCodeRequestExecutor<Close
         }
       }
       return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
-    } finally {
-      httpGet.releaseConnection();
     }
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/voice/VoiceUploadApacheHttpRequestExecutor.java

@@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
@@ -48,16 +47,11 @@ public class VoiceUploadApacheHttpRequestExecutor extends VoiceUploadRequestExec
       .build();
     httpPost.setEntity(entity);
 
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
     WxError error = WxError.fromJson(responseContent, WxType.MP);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
     }
-
     return true;
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 }

weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/CommonUploadMultiRequestExecutorApacheImpl.java

@@ -2,17 +2,17 @@ package me.chanjar.weixin.open.executor;
 
 import lombok.Getter;
 import me.chanjar.weixin.common.bean.CommonUploadData;
-import me.chanjar.weixin.open.bean.CommonUploadMultiParam;
 import me.chanjar.weixin.common.bean.CommonUploadParam;
 import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
+import me.chanjar.weixin.open.bean.CommonUploadMultiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Consts;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.HttpMultipartMode;
@@ -64,9 +64,8 @@ public class CommonUploadMultiRequestExecutorApacheImpl extends CommonUploadMult
 
       httpPost.setEntity(entity.build());
     }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
+    String responseContent = requestHttp.getRequestHttpClient().execute(httpPost, Utf8ResponseHandler.INSTANCE);
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+    if (StringUtils.isEmpty(responseContent)) {
-      if (responseContent == null || responseContent.isEmpty()) {
       throw new WxErrorException(String.format("上传失败，服务器响应空 url:%s param:%s", uri, param));
     }
     WxError error = WxError.fromJson(responseContent, wxType);
@@ -74,9 +73,6 @@ public class CommonUploadMultiRequestExecutorApacheImpl extends CommonUploadMult
       throw new WxErrorException(error);
     }
     return responseContent;
-    } finally {
-      httpPost.releaseConnection();
-    }
   }
 
   /**

weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/GenericUploadRequestExecutor.java

@@ -131,11 +131,7 @@ public class GenericUploadRequestExecutor implements RequestExecutor<String, Inp
       bodyRequest.setEntity(entity);
       bodyRequest.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
 
-      try (CloseableHttpResponse response = getRequestHttp().getRequestHttpClient().execute(bodyRequest)) {
+      return getRequestHttp().getRequestHttpClient().execute(bodyRequest, Utf8ResponseHandler.INSTANCE);
-        return Utf8ResponseHandler.INSTANCE.handleResponse(response);
-      } finally {
-        bodyRequest.releaseConnection();
-      }
     }
   }
 

weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeApacheHttpRequestExecutor.java

@@ -61,8 +61,6 @@ public class MaQrCodeApacheHttpRequestExecutor extends MaQrCodeRequestExecutor<C
         }
       }
       return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
-    } finally {
-      httpGet.releaseConnection();
     }
   }
 }

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java

@@ -7,6 +7,7 @@ import com.github.binarywang.wxpay.v3.WxPayV3DownloadHttpGet;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.util.http.apache.ByteArrayResponseHandler;
 import me.chanjar.weixin.common.util.json.GsonParser;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.*;
@@ -54,16 +55,12 @@ public class WxPayServiceApacheHttpImpl extends BaseWxPayServiceImpl {
       HttpClientBuilder httpClientBuilder = createHttpClientBuilder(useKey);
       HttpPost httpPost = this.createHttpPost(url, requestStr);
       try (CloseableHttpClient httpClient = httpClientBuilder.build()) {
-        try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
+        final byte[] bytes = httpClient.execute(httpPost, ByteArrayResponseHandler.INSTANCE);
-          final byte[] bytes = EntityUtils.toByteArray(response.getEntity());
         final String responseData = Base64.getEncoder().encodeToString(bytes);
         this.logRequestAndResponse(url, requestStr, responseData);
         wxApiData.set(new WxPayApiData(url, requestStr, responseData, null));
         return bytes;
       }
-      } finally {
-        httpPost.releaseConnection();
-      }
     } catch (Exception e) {
       this.logError(url, requestStr, e);
       wxApiData.set(new WxPayApiData(url, requestStr, null, e.getMessage()));
@@ -134,7 +131,7 @@ public class WxPayServiceApacheHttpImpl extends BaseWxPayServiceImpl {
   @Override
   public String patchV3(String url, String requestStr) throws WxPayException {
     HttpPatch httpPatch = new HttpPatch(url);
-    httpPatch.setEntity(this.createEntry(requestStr));
+    httpPatch.setEntity(createEntry(requestStr));
     return this.requestV3(url, requestStr, httpPatch);
   }
 
@@ -187,7 +184,7 @@ public class WxPayServiceApacheHttpImpl extends BaseWxPayServiceImpl {
       }
 
       if (HttpStatus.SC_OK == statusCode || HttpStatus.SC_NO_CONTENT == statusCode) {
-        this.log.info("\n【请求地址】：{}\n【响应数据】：{}", url, responseString);
+        log.info("\n【请求地址】：{}\n【响应数据】：{}", url, responseString);
         return responseString;
       }
 
@@ -249,7 +246,7 @@ public class WxPayServiceApacheHttpImpl extends BaseWxPayServiceImpl {
   @Override
   public String putV3(String url, String requestStr) throws WxPayException {
     HttpPut httpPut = new HttpPut(url);
-    StringEntity entity = this.createEntry(requestStr);
+    StringEntity entity = createEntry(requestStr);
     httpPut.setEntity(entity);
     return requestV3(url, httpPut);
   }
@@ -284,8 +281,8 @@ public class WxPayServiceApacheHttpImpl extends BaseWxPayServiceImpl {
     return apiV3HttpClient;
   }
 
-  private StringEntity createEntry(String requestStr) {
+  private static StringEntity createEntry(String requestStr) {
-    return new StringEntity(requestStr, ContentType.create(APPLICATION_JSON, "utf-8"));
+    return new StringEntity(requestStr, ContentType.create(APPLICATION_JSON, StandardCharsets.UTF_8));
     //return new StringEntity(new String(requestStr.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
   }
 
@@ -320,7 +317,7 @@ public class WxPayServiceApacheHttpImpl extends BaseWxPayServiceImpl {
 
   private HttpPost createHttpPost(String url, String requestStr) {
     HttpPost httpPost = new HttpPost(url);
-    httpPost.setEntity(this.createEntry(requestStr));
+    httpPost.setEntity(createEntry(requestStr));
 
     httpPost.setConfig(RequestConfig.custom()
       .setConnectionRequestTimeout(this.getConfig().getHttpConnectionTimeout())

weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/api/impl/WxQidianServiceHttpClientImpl.java

@@ -3,14 +3,13 @@ package me.chanjar.weixin.qidian.api.impl;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.error.WxRuntimeException;
 import me.chanjar.weixin.common.util.http.HttpType;
+import me.chanjar.weixin.common.util.http.apache.ApacheBasicResponseHandler;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import me.chanjar.weixin.qidian.config.WxQidianConfigStorage;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.IOException;
@@ -86,11 +85,8 @@ public class WxQidianServiceHttpClientImpl extends BaseWxQidianServiceImpl<Close
           RequestConfig requestConfig = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();
           httpGet.setConfig(requestConfig);
         }
-        try (CloseableHttpResponse response = getRequestHttpClient().execute(httpGet)) {
+        String responseContent = getRequestHttpClient().execute(httpGet, ApacheBasicResponseHandler.INSTANCE);
-          return this.extractAccessToken(new BasicResponseHandler().handleResponse(response));
+        return this.extractAccessToken(responseContent);
-        } finally {
-          httpGet.releaseConnection();
-        }
       } catch (IOException e) {
         throw new WxRuntimeException(e);
       }