获取配置时间超时时间由10000毫秒改为30000毫秒;但是不能合并到devolop分支因basecontroller文件中添加了公共分组代码,

(cherry picked from commit 6ffdcd0dff)
This commit is contained in:
dongxiaoyan
2019-02-18 11:20:56 +00:00
committed by 董晓燕
parent f91fd57901
commit c3f5cb7851
2 changed files with 2 additions and 2 deletions

View File

@@ -3782,7 +3782,7 @@ public class BaseController {
List<NtcPzReport> list=null;
try {
//调用带有超时时间的方法设置与页面ajax获取total log 超时时间保持一致 页面设置在pzlog.js
String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate),Constants.CLIENT_CONNECT_TIMEOUT,10000);
String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate),Constants.CLIENT_CONNECT_TIMEOUT,30000);
list=getList(json);
} catch (Exception e) {
logger.error("获取日志总量失败!",e);