Merge commit 'bb22974d6553dc85202bee5b027ccddde3a2e7b2' into develop

* commit 'bb22974d6553dc85202bee5b027ccddde3a2e7b2':
  统一使用getHttpClient，使得可以复用httpClient

Author: ukid

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java

@@ -108,8 +108,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
               RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
               httpGet.setConfig(config);
             }
-            CloseableHttpClient httpclient = getHttpclient();
-            CloseableHttpResponse response = httpclient.execute(httpGet);
+            CloseableHttpResponse response = getHttpclient().execute(httpGet);
             String resultContent = new BasicResponseHandler().handleResponse(response);
             WxError error = WxError.fromJson(resultContent);
             if (error.getErrorCode() != 0) {
@@ -673,7 +672,7 @@ public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double a
     StringEntity entity = new StringEntity(xml, Consts.UTF_8);
     httpPost.setEntity(entity);
     try {
-      CloseableHttpResponse response = httpClient.execute(httpPost);
+      CloseableHttpResponse response = getHttpclient().execute(httpPost);
       String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
       XStream xstream = XStreamInitializer.getInstance();
       xstream.alias("xml", WxMpPrepayIdResult.class);