Merge remote-tracking branch 'origin/consumer_unite' into dev_bd_rm_consumer_od

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java

@@ -3,7 +3,6 @@ package com.liquidnet.commons.lang.util;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.liquidnet.commons.lang.util.spring.RestTemplateConfig;
-import com.liquidnet.commons.lang.util.spring.RestTemplateOkConfig;
 import org.springframework.http.*;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -21,9 +20,9 @@ public class HttpUtil {
 
     static {
         //apache httpClient
-//        restTemplate = RestTemplateConfig.getRestTemplate();
-        //okhttp3 client
-        restTemplate = RestTemplateOkConfig.getRestTemplate();
+        restTemplate = RestTemplateConfig.getRestTemplate();
+//        //okhttp3 client
+//        restTemplate = RestTemplateOkConfig.getRestTemplate();
     }
 
     /**

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/spring/RestTemplateConfig.java

@@ -29,7 +29,7 @@ public class RestTemplateConfig {
     static {
         // 长链接保持时间长度20秒
         PoolingHttpClientConnectionManager poolConnManager =
-                new PoolingHttpClientConnectionManager(20, TimeUnit.SECONDS);
+                new PoolingHttpClientConnectionManager(20, TimeUnit.MINUTES);
         // 设置最大链接数
         poolConnManager.setMaxTotal(80 * getMaxCpuCore() * 5);
         // 单路由的并发数
@@ -48,11 +48,11 @@ public class RestTemplateConfig {
 
         HttpComponentsClientHttpRequestFactory httpComponentsClientHttpRequestFactory = new HttpComponentsClientRestfulHttpRequestFactory(httpClient);
         // 链接超时配置 5秒
-        httpComponentsClientHttpRequestFactory.setConnectTimeout(5000);
+        httpComponentsClientHttpRequestFactory.setConnectTimeout(120000);
         // 连接读取超时配置
-//        httpComponentsClientHttpRequestFactory.setReadTimeout(10000);
+        httpComponentsClientHttpRequestFactory.setReadTimeout(120000);
         // 连接池不够用时候等待时间长度设置，分词那边 500毫秒 ，我们这边设置成1秒
-        httpComponentsClientHttpRequestFactory.setConnectionRequestTimeout(5000);
+        httpComponentsClientHttpRequestFactory.setConnectionRequestTimeout(120000);
 
         // 缓冲请求数据，POST大量数据，可以设定为true 我们这边机器比较内存较大
         httpComponentsClientHttpRequestFactory.setBufferRequestBody(true);