From 6ffdcd0dff062d271f8043a3ae02ab5d008df06d Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Mon, 18 Feb 2019 19:20:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=85=8D=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E7=94=B110000?= =?UTF-8?q?=E6=AF=AB=E7=A7=92=E6=94=B9=E4=B8=BA30000=E6=AF=AB=E7=A7=92?= =?UTF-8?q?=EF=BC=9B=E4=BD=86=E6=98=AF=E4=B8=8D=E8=83=BD=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=88=B0devolop=E5=88=86=E6=94=AF=E5=9B=A0basecontroller?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E5=88=86=E7=BB=84=E4=BB=A3=E7=A0=81=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/controller/BaseController.java | 2 +- src/main/webapp/static/global/scripts/pzLog.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 2a44f7680..720b8f58b 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3782,7 +3782,7 @@ public class BaseController { List 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); diff --git a/src/main/webapp/static/global/scripts/pzLog.js b/src/main/webapp/static/global/scripts/pzLog.js index dc84db96e..204b1b320 100644 --- a/src/main/webapp/static/global/scripts/pzLog.js +++ b/src/main/webapp/static/global/scripts/pzLog.js @@ -161,7 +161,7 @@ var GetLogTotal=function(_data){ var failed=$.validator.messages.failed; var request=$.ajax({ type:'post', - timeout:10000,//超时时间设置，查询接口时间过长超时 + timeout:30000,//超时时间设置，查询接口时间过长超时 url:pathName+'/report/ajaxGetLogTotal', data:{"endTime":timeStamp,"serviceIds":_data.serviceIds.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')}, dataType:'json',