diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index fb251f988..79b5a2922 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -571,4 +571,12 @@ public final class Constants { public static final String TRAFFIC_SYSTEM_CHART=Configurations.getStringProperty("trafficSystemChart","trafficSystemChart"); public static final String TRAFFIC_WEBSITELIST=Configurations.getStringProperty("trafficWebsiteList","trafficWebsiteList"); public static final String TRAFFIC_WEBTYPECHART=Configurations.getStringProperty("trafficWebTypeChart","trafficWebTypeChart"); + + /** + * httpclient 工具超时时间设置 + */ + public static final int HTTP_SOCKET_TIMEOUT= Configurations.getIntProperty("http_socket_timeout", 300000); + public static final int HTTP_CONNECT_TIMEOUT= Configurations.getIntProperty("http_connect_timeout", 10000); + public static final int HTTP_CONNECT_REQUEST_TIMEOUT = Configurations.getIntProperty("http_connect_request_timeout", 50000); + public static final int HTTP_CONNECT_RETRY_TIMES = Configurations.getIntProperty("http_connect_retry_times", 3); } diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index 414651c79..40a5fe223 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -42,6 +42,7 @@ import org.springframework.web.servlet.support.RequestContext; import com.alibaba.fastjson.JSON; import com.nis.exceptions.MaatConvertException; +import com.nis.util.Constants; import com.nis.util.Encodes; /** @@ -226,10 +227,6 @@ public class HttpClientUtil { private static CloseableHttpClient httpClient = null; private static RequestConfig requestConfig; - public static final int HTTP_SOCKET_TIMEOUT= 300000; - public static final int HTTP_CONNECT_TIMEOUT= 10000; - public static final int HTTP_CONNECT_REQUEST_TIMEOUT = 50000; - public static final int HTTP_CONNECT_RETRY_TIMES = 3; //http 连接池 public static CloseableHttpClient getHttpClient() { if (httpClient == null) { @@ -240,14 +237,14 @@ public class HttpClientUtil { // 将每个路由基础的连接增加到20 cm.setDefaultMaxPerRoute(20); requestConfig = RequestConfig.custom() - .setSocketTimeout( HTTP_SOCKET_TIMEOUT) - .setConnectTimeout( HTTP_CONNECT_TIMEOUT) - .setConnectionRequestTimeout( HTTP_CONNECT_REQUEST_TIMEOUT) + .setSocketTimeout( Constants.HTTP_SOCKET_TIMEOUT) + .setConnectTimeout( Constants.HTTP_CONNECT_TIMEOUT) + .setConnectionRequestTimeout( Constants.HTTP_CONNECT_REQUEST_TIMEOUT) .build(); httpClient = HttpClients.custom() .setConnectionManager(cm) .setDefaultRequestConfig(requestConfig) - .setRetryHandler(new DefaultHttpRequestRetryHandler( HTTP_CONNECT_RETRY_TIMES, false)) + .setRetryHandler(new DefaultHttpRequestRetryHandler( Constants.HTTP_CONNECT_RETRY_TIMES, false)) .build(); } return httpClient; diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index d8430cd8d..5de6c2fc0 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -278,14 +278,15 @@ trafficWebTypeChart=trafficWebTypeChart client_connect_timeout=300000 client_read_timeout=300000 -log_time_range=300000 +log_time_range=999300000 #use elasticsearch or not# isUseES=false - - - - +#httpclient 工具设置超时时间 +http_socket_timeout=300000 +http_connect_timeout=10000 +http_connect_request_timeout=50000 +http_connect_retry_times=3 #\u6570\u636e\u4e2d\u5fc3A\u7248\u6570\u636e\u5e93\u540d\u79f0,\u7a0b\u5e8f\u4e2d\u6bcf\u6b21\u67e5\u8be2\u65f6\u4f7f\u7528\u7684\u6570\u636e\u5e93\u540d\u79f0 use dbA