Merge branch 'test6.9.13' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.13

@@ -55,21 +55,8 @@ public class HttpClient {
     private CloseableHttpClient httpClient;
     private CloseableHttpClient httpClient;
 
 
     @PostConstruct
     @PostConstruct
-    public void init() {
-        new Thread(() -> {
-            while (Objects.isNull(httpClient)) {
-                try {
+    public void init() throws Exception {
         httpClient = this.buildHttpClient();
         httpClient = this.buildHttpClient();
-                } catch (Exception e) {
-                    log.warn("build http client fail, {}", e.getMessage());
-                }
-                try {
-                    Thread.sleep(3 * 1000);
-                } catch (InterruptedException e) {
-
-                }
-            }
-        }, "http-client-builder-" + this.getClass().getSimpleName()).start();
     }
     }
 
 
     public CloseableHttpClient buildHttpClient() throws Exception {
     public CloseableHttpClient buildHttpClient() throws Exception {

@@ -15,7 +15,6 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
-import javax.annotation.PostConstruct;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLContext;
 
 
@@ -32,6 +31,8 @@ public abstract class HttpSslClientAbstract extends HttpClient {
 
 
     protected abstract String getMchId();
     protected abstract String getMchId();
 
 
+    protected abstract String getMchCertPath();
+
 
 
     @Override
     @Override
     public CloseableHttpClient buildHttpClient() throws Exception {
     public CloseableHttpClient buildHttpClient() throws Exception {
@@ -57,7 +58,7 @@ public abstract class HttpSslClientAbstract extends HttpClient {
         SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(
         SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(
                 sslContext, hostnameVerifier);
                 sslContext, hostnameVerifier);
         Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder
         Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder
-				.<ConnectionSocketFactory> create()
+                .<ConnectionSocketFactory>create()
                 .register("http",
                 .register("http",
                         PlainConnectionSocketFactory.getSocketFactory())
                         PlainConnectionSocketFactory.getSocketFactory())
                 .register("https", sslSocketFactory).build();
                 .register("https", sslSocketFactory).build();
@@ -86,7 +87,7 @@ public abstract class HttpSslClientAbstract extends HttpClient {
     }
     }
 
 
     private void loadKeyMaterial(SSLContextBuilder sslContextBuilder) throws Exception {
     private void loadKeyMaterial(SSLContextBuilder sslContextBuilder) throws Exception {
-		wechatHelper.loadKeyMaterial(getMchId(), sslContextBuilder);
+        wechatHelper.loadKeyMaterial(getMchId(), getMchCertPath(), sslContextBuilder);
     }
     }
 
 
 }
 }

@@ -12,4 +12,10 @@ public class WxMiniappHttpSslClient extends HttpSslClientAbstract {
     protected String getMchId() {
     protected String getMchId() {
         return WeixinPayConfig.Miniapp.MALL_ID;
         return WeixinPayConfig.Miniapp.MALL_ID;
     }
     }
+
+    @Override
+    protected String getMchCertPath() {
+        return WeixinPayConfig.Miniapp.APP_PARTNER_CERT;
+    }
+
 }
 }

@@ -11,4 +11,9 @@ public class WxUFORealAppHttpSslClient extends HttpSslClientAbstract {
 		return WeixinPayConfig.PARTNER_ID;
 		return WeixinPayConfig.PARTNER_ID;
 	}
 	}
 
 
+	@Override
+	protected String getMchCertPath() {
+		return WeixinPayConfig.WECHAT_PAY_UFOREAL_APP_PARTNER_CERT;
+	}
+
 }
 }