抽取获取代理对象的方法到接口中，方便微信支付调用，并优化部分代码

binarywang · binarywang · commit d88a8d3d8392 · 2016-10-29T17:14:05.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.common.util.http.RequestExecutor;
 import me.chanjar.weixin.mp.bean.*;
 import me.chanjar.weixin.mp.bean.result.*;
+import org.apache.http.HttpHost;
 
 /**
  * 微信API的Service
@@ -228,6 +229,11 @@ public interface WxMpService {
    */
   <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException;
 
+  /**
+   * 获取代理对象
+   */
+  HttpHost getHttpProxy();
+
   /**
    * 注入 {@link WxMpConfigStorage} 的实现
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java
@@ -14,6 +14,8 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Consts;
+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.conn.ssl.DefaultHostnameVerifier;
@@ -27,6 +29,7 @@
 import javax.net.ssl.SSLContext;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.security.KeyStore;
 import java.util.*;
 
@@ -199,7 +202,7 @@ public WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo)
 
     String url = PAY_BASE_URL + "/pay/orderquery";
 
-    String responseContent = this.wxMpService.post(url, xstream.toXML(request));
+    String responseContent = this.executeRequest(url, xstream.toXML(request));
     WxPayOrderQueryResult result = (WxPayOrderQueryResult) xstream.fromXML(responseContent);
     result.composeCoupons(responseContent);
     if ("FAIL".equals(result.getResultCode())) {
@@ -233,7 +236,7 @@ public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxErrorExcepti
 
     String url = PAY_BASE_URL + "/pay/closeorder";
 
-    String responseContent = this.wxMpService.post(url, xstream.toXML(request));
+    String responseContent = this.executeRequest(url, xstream.toXML(request));
     WxPayOrderCloseResult result = (WxPayOrderCloseResult) xstream.fromXML(responseContent);
     if ("FAIL".equals(result.getResultCode())) {
       throw new WxErrorException(WxError.newBuilder()
@@ -263,7 +266,7 @@ public WxPayUnifiedOrderResult unifiedOrder(WxPayUnifiedOrderRequest request)
 
     String url = PAY_BASE_URL + "/pay/unifiedorder";
 
-    String responseContent = this.wxMpService.post(url, xstream.toXML(request));
+    String responseContent = this.executeRequest(url, xstream.toXML(request));
     WxPayUnifiedOrderResult result = (WxPayUnifiedOrderResult) xstream
         .fromXML(responseContent);
     if ("FAIL".equals(result.getResultCode())) {
@@ -377,7 +380,27 @@ public WxEntPayQueryResult queryEntPay(String partnerTradeNo, File keyFile) thro
     return result;
   }
 
+  private String executeRequest( String url, String requestStr) throws WxErrorException {
+    HttpPost httpPost = new HttpPost(url);
+    if (this.wxMpService.getHttpProxy() != null) {
+      httpPost.setConfig(RequestConfig.custom().setProxy(this.wxMpService.getHttpProxy()).build());
+    }
+
+    try (CloseableHttpClient httpclient = HttpClients.custom().build()) {
+      httpPost.setEntity(new StringEntity(new String(requestStr.getBytes("UTF-8"), "ISO-8859-1")));
+
+      try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
+        return EntityUtils.toString(response.getEntity(), Consts.UTF_8);
+      }
+    } catch (IOException e) {
+      throw new WxErrorException(WxError.newBuilder().setErrorMsg(e.getMessage()).build(), e);
+    }finally {
+      httpPost.releaseConnection();
+    }
+  }
+
   private String executeRequestWithKeyFile( String url, File keyFile, String requestStr, String mchId) throws WxErrorException {
+
     try (FileInputStream inputStream = new FileInputStream(keyFile)) {
       KeyStore keyStore = KeyStore.getInstance("PKCS12");
       keyStore.load(inputStream, mchId.toCharArray());
@@ -386,13 +409,18 @@ private String executeRequestWithKeyFile( String url, File keyFile, String reque
       SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1" }, null,
           new DefaultHostnameVerifier());
 
+      HttpPost httpPost = new HttpPost(url);
+      if (this.wxMpService.getHttpProxy() != null) {
+        httpPost.setConfig(RequestConfig.custom().setProxy(this.wxMpService.getHttpProxy()).build());
+      }
+
       try (CloseableHttpClient httpclient = HttpClients.custom().setSSLSocketFactory(sslsf).build()) {
-        HttpPost httpPost = new HttpPost(url);
         httpPost.setEntity(new StringEntity(new String(requestStr.getBytes("UTF-8"), "ISO-8859-1")));
-
         try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
-          return EntityUtils.toString(response.getEntity());
+          return EntityUtils.toString(response.getEntity(), Consts.UTF_8);
         }
+      }finally {
+        httpPost.releaseConnection();
       }
     } catch (Exception e) {
       throw new WxErrorException(WxError.newBuilder().setErrorMsg(e.getMessage()).build(), e);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
@@ -425,6 +425,7 @@ protected synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor,
     }
   }
 
+  @Override
   public HttpHost getHttpProxy() {
     return this.httpProxy;
   }

Original file line number	Diff line number	Diff line change
`@@ -425,6 +425,7 @@ protected synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor,`
`425`	`425`	`}`
`426`	`426`	`}`
`427`	`427`
	`428`	`+ @Override`
`428`	`429`	`public HttpHost getHttpProxy() {`
`429`	`430`	`return this.httpProxy;`
`430`	`431`	`}`