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

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

Browse Source
This commit is contained in:
dongxiaoyan
2019-02-18 19:20:56 +08:00
parent e5d8f038ea
commit 6ffdcd0dff
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -3782,7 +3782,7 @@ public class BaseController {
List<NtcPzReport> list=null; List<NtcPzReport> list=null;
try { try {
//调用带有超时时间的方法，设置与页面ajax获取total log 超时时间保持一致 页面设置在pzlog.js //调用带有超时时间的方法，设置与页面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); list=getList(json);
} catch (Exception e) { } catch (Exception e) {
logger.error("获取日志总量失败！",e); logger.error("获取日志总量失败！",e);

2
src/main/webapp/static/global/scripts/pzLog.js
View File

@@ -161,7 +161,7 @@ var GetLogTotal=function(_data){
var failed=$.validator.messages.failed; var failed=$.validator.messages.failed;
var request=$.ajax({ var request=$.ajax({
type:'post', type:'post',
timeout:10000,//超时时间设置，查询接口时间过长超时 timeout:30000,//超时时间设置，查询接口时间过长超时
url:pathName+'/report/ajaxGetLogTotal', url:pathName+'/report/ajaxGetLogTotal',
data:{"endTime":timeStamp,"serviceIds":_data.serviceIds.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')}, data:{"endTime":timeStamp,"serviceIds":_data.serviceIds.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')},
dataType:'json', dataType:'json',