From a154e3065afc9eb259df2f1bf5bfb2d1396881bb Mon Sep 17 00:00:00 2001
From: BinaryWang <wbchn@qq.com>
Date: Sat, 13 Aug 2016 10:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=87=BA=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=B8=BA=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B8=85=E6=99=B0?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/api/impl/WxMpServiceImpl.java   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

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
index f0ca0d17f..eb62ed737 100644
--- 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
@@ -67,10 +67,6 @@ public class WxMpServiceImpl implements WxMpService {
 
   private HttpHost httpProxy;
 
-  public HttpHost getHttpProxy() {
-    return this.httpProxy;
-  }
-
   private int retrySleepMillis = 1000;
 
   private int maxRetryTimes = 5;
@@ -421,6 +417,10 @@ public class WxMpServiceImpl implements WxMpService {
       throw new RuntimeException(e);
     }
   }
+  
+  public HttpHost getHttpProxy() {
+    return this.httpProxy;
+  }
 
   public CloseableHttpClient getHttpclient() {
     return this.httpClient;
@@ -429,19 +429,23 @@ public class WxMpServiceImpl implements WxMpService {
   @Override
   public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider) {
     this.wxMpConfigStorage = wxConfigProvider;
+    this.initHttpClient();
+  }
 
+  private void initHttpClient() {
     ApacheHttpClientBuilder apacheHttpClientBuilder = this.wxMpConfigStorage.getApacheHttpClientBuilder();
     if (null == apacheHttpClientBuilder) {
       apacheHttpClientBuilder = DefaultApacheHttpHttpClientBuilder.get();
     }
-    apacheHttpClientBuilder.httpProxyHost(this.wxMpConfigStorage.getHttp_proxy_host())
-      .httpProxyPort(this.wxMpConfigStorage.getHttp_proxy_port())
-      .httpProxyUsername(this.wxMpConfigStorage.getHttp_proxy_username())
-      .httpProxyPassword(this.wxMpConfigStorage.getHttp_proxy_password());
+    
+    apacheHttpClientBuilder.httpProxyHost(this.wxMpConfigStorage.getHttpProxyHost())
+      .httpProxyPort(this.wxMpConfigStorage.getHttpProxyPort())
+      .httpProxyUsername(this.wxMpConfigStorage.getHttpProxyUsername())
+      .httpProxyPassword(this.wxMpConfigStorage.getHttpProxyPassword());
 
-    if (wxConfigProvider.getSSLContext() != null){
+    if (this.wxMpConfigStorage.getSSLContext() != null){
       SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
-          wxConfigProvider.getSSLContext(),
+          this.wxMpConfigStorage.getSSLContext(),
           new String[] { "TLSv1" },
           null,
           SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);