Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/PayWepayUtils.java

@@ -2,9 +2,16 @@ package com.liquidnet.service.dragon.utils;
 
 import com.alipay.api.internal.util.file.IOUtils;
 import com.liquidnet.commons.lang.util.MD5Utils;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.ssl.SSLContexts;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.dom4j.Document;
@@ -24,6 +31,9 @@ public class PayWepayUtils {
     private CloseableHttpClient httpClient;
     private static PayWepayUtils instance = new PayWepayUtils();
 
+    // 池化管理
+    private static PoolingHttpClientConnectionManager poolConnManager =null;
+
     private final String merchantId = "1551961491";
     private final String partnerKey = "itIuO65O9yKmemOu3S8g1S4orqvCGwXK";
 
@@ -65,9 +75,41 @@ public class PayWepayUtils {
         return merchantId;
     }
 
+//    public CloseableHttpClient getHttpClient() {
+//        try {
+//            if (httpClient == null) {
+//                InputStream certStream = PayWepayUtils.class.getClassLoader().getResourceAsStream("payCert/wepay/wepay_apiclient_cert.p12");
+//                byte[] certData = IOUtils.toByteArray(certStream);
+//                certStream.read(certData);
+//                certStream.close();
+//
+//                KeyStore keyStore = KeyStore.getInstance("PKCS12");
+//                ByteArrayInputStream inputStream = new ByteArrayInputStream(certData);
+//                try {
+//                    keyStore.load(inputStream, merchantId.toCharArray());
+//                } finally {
+//                    inputStream.close();
+//                }
+//                SSLContext sslcontext = SSLContexts.custom()
+//                        .loadKeyMaterial(keyStore, merchantId.toCharArray())
+//                        .build();
+//                SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
+//                        sslcontext,
+//                        SSLConnectionSocketFactory.getDefaultHostnameVerifier());
+//                httpClient = HttpClients.custom()
+//                        .setSSLSocketFactory(sslsf)
+//                        .build();
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return httpClient;
+//    }
+
     public CloseableHttpClient getHttpClient() {
         try {
             if (httpClient == null) {
+
                 InputStream certStream = PayWepayUtils.class.getClassLoader().getResourceAsStream("payCert/wepay/wepay_apiclient_cert.p12");
                 byte[] certData = IOUtils.toByteArray(certStream);
                 certStream.read(certData);
@@ -86,9 +128,17 @@ public class PayWepayUtils {
                 SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
                         sslcontext,
                         SSLConnectionSocketFactory.getDefaultHostnameVerifier());
-                httpClient = HttpClients.custom()
-                        .setSSLSocketFactory(sslsf)
-                        .build();
+
+                // 配置同时支持 HTTP 和 HTPPS
+                Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create().register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", sslsf).build();
+                // 初始化连接管理器
+                poolConnManager =new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+                poolConnManager.setMaxTotal(4000);// 同时最多连接数
+                // 设置最大路由
+                poolConnManager.setDefaultMaxPerRoute(2000);
+
+                // 初始化httpClient
+                httpClient = getConnection();
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -96,6 +146,17 @@ public class PayWepayUtils {
         return httpClient;
     }
 
+    public static CloseableHttpClient getConnection() {
+        RequestConfig config = RequestConfig.custom().setConnectTimeout(5000).setConnectionRequestTimeout(5000).setSocketTimeout(5000).build();
+        CloseableHttpClient httpClient = HttpClients.custom()
+                // 设置连接池管理
+                .setConnectionManager(poolConnManager)
+                .setDefaultRequestConfig(config)
+                // 设置重试次数
+                .setRetryHandler(new DefaultHttpRequestRetryHandler(2,false)).build();
+        return httpClient;
+    }
+
     //生成随机字符串nonce_str
     public String getNonceStr() {
         String base = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";