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

This commit is contained in:
duandongmei
2018-08-07 14:36:21 +08:00
3 changed files with 19 additions and 13 deletions

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