gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-08-07 14:36:21 +08:00
parent a963a8d730 a1978864b3
commit e6c6a9fff7
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/util/Constants.java
View File

@@ -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);
}

13
src/main/java/com/nis/util/httpclient/HttpClientUtil.java
View File

@@ -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;

11
src/main/resources/nis.properties
View File

@@ -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