From 025182e551ede879348848ffcd6eb12f5743ea69 Mon Sep 17 00:00:00 2001 From: wangxin Date: Sun, 30 Sep 2018 10:54:30 +0800 Subject: [PATCH] =?UTF-8?q?(1)=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E6=9B=BF=E6=8D=A2=E4=B8=BAserviceId=20(2)?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6action=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=BAserviceId=20(3)=E9=85=8D=E7=BD=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F=E5=88=97=E5=8A=A0?= =?UTF-8?q?=E5=85=A5serviceId=20(4)=E9=85=8D=E7=BD=AE=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=80=BB=E9=87=8F=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8action=E6=9B=BF=E6=8D=A2=E4=B8=BAserviceId=20?= =?UTF-8?q?(5)=E9=85=8D=E7=BD=AE=E6=97=A5=E5=BF=97=E7=9B=B8=E5=85=B3js?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=88=B0pzLog=E3=80=82js=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/log/SearchReport.java | 7 + .../configuration/LogSearchController.java | 4 +- .../report/NtcDestIpReportController.java | 8 +- .../report/NtcEntranceReportController.java | 9 +- .../report/NtcLwhhReportController.java | 10 +- .../report/NtcPzReportController.java | 45 ++++--- .../NtcSrcipDomesticReportController.java | 9 +- .../report/NtcTagReportController.java | 9 +- .../report/NtcXzReportController.java | 9 +- src/main/webapp/WEB-INF/include/header.jsp | 1 + .../WEB-INF/views/cfg/app/appByteCfgList.jsp | 2 +- .../views/cfg/app/appDomainCfgList.jsp | 2 +- .../views/cfg/app/appHeaderCfgList.jsp | 2 +- .../WEB-INF/views/cfg/app/appHttpCfgList.jsp | 2 +- .../WEB-INF/views/cfg/app/appIpCfgList.jsp | 2 +- .../views/cfg/app/appMultiFeatureCfgList.jsp | 2 +- .../views/cfg/app/appPolicyCfgList.jsp | 2 +- .../WEB-INF/views/cfg/app/appSslCfgList.jsp | 2 +- .../WEB-INF/views/cfg/app/appTcpCfgList.jsp | 2 +- .../views/cfg/app/appTopicDomainCfgList.jsp | 2 +- .../WEB-INF/views/cfg/asnPolicyCfgList.jsp | 2 +- .../views/cfg/av/contIp/contIpList.jsp | 2 +- .../views/cfg/av/contUrl/contUrlList.jsp | 2 +- .../WEB-INF/views/cfg/av/fileSampleList.jsp | 2 +- .../WEB-INF/views/cfg/av/picIp/picIpList.jsp | 2 +- .../views/cfg/av/picUrl/picUrlList.jsp | 2 +- .../WEB-INF/views/cfg/av/signSampleList.jsp | 2 +- .../WEB-INF/views/cfg/av/voip/voipList.jsp | 2 +- .../WEB-INF/views/cfg/basicprotocol/list.jsp | 2 +- .../WEB-INF/views/cfg/common/ipList.jsp | 2 +- .../WEB-INF/views/cfg/ddosIpCfgList.jsp | 2 +- .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 2 +- .../views/cfg/encryptedtunnelbehav/list.jsp | 2 +- .../views/cfg/fileTransfer/fileDigestList.jsp | 2 +- .../views/cfg/fileTransfer/ftpList.jsp | 2 +- .../views/cfg/fileTransfer/p2pList.jsp | 2 +- .../WEB-INF/views/cfg/ipaddr/ipList.jsp | 4 +- .../WEB-INF/views/cfg/mail/mailList.jsp | 2 +- .../WEB-INF/views/cfg/other/bgpList.jsp | 2 +- .../WEB-INF/views/cfg/other/xmppList.jsp | 2 +- .../cfg/proxy/control/httpRedirectList.jsp | 2 +- .../cfg/proxy/control/httpReqReplaceList.jsp | 2 +- .../cfg/proxy/control/httpResReplaceList.jsp | 2 +- .../WEB-INF/views/cfg/website/dnsList.jsp | 2 +- .../WEB-INF/views/cfg/website/httpList.jsp | 2 +- .../WEB-INF/views/cfg/website/sslList.jsp | 2 +- .../views/cfg/whitelist/domainList.jsp | 2 +- .../WEB-INF/views/cfg/whitelist/ipList.jsp | 2 +- src/main/webapp/WEB-INF/views/report/list.jsp | 49 +++---- .../webapp/static/global/scripts/common.js | 116 ----------------- .../webapp/static/global/scripts/pzLog.js | 121 ++++++++++++++++++ 51 files changed, 235 insertions(+), 240 deletions(-) create mode 100644 src/main/webapp/static/global/scripts/pzLog.js diff --git a/src/main/java/com/nis/domain/log/SearchReport.java b/src/main/java/com/nis/domain/log/SearchReport.java index de1798739..d1b378da7 100644 --- a/src/main/java/com/nis/domain/log/SearchReport.java +++ b/src/main/java/com/nis/domain/log/SearchReport.java @@ -31,6 +31,7 @@ public class SearchReport extends BaseEntity{ private Integer functionId; private String cfgName; private Integer action; + private Integer serviceId; private String services;//service日志总量统计使用 private Integer reportType;//小时报，日报，月报 //标签，性质，来文函号，境内源Ip,各国目的IP，运营商局点 @@ -52,6 +53,12 @@ public class SearchReport extends BaseEntity{ private String reportTime; + public Integer getServiceId() { + return serviceId; + } + public void setServiceId(Integer serviceId) { + this.serviceId = serviceId; + } public String getServices() { return services; } diff --git a/src/main/java/com/nis/web/controller/configuration/LogSearchController.java b/src/main/java/com/nis/web/controller/configuration/LogSearchController.java index 4bd69897c..2c8257044 100644 --- a/src/main/java/com/nis/web/controller/configuration/LogSearchController.java +++ b/src/main/java/com/nis/web/controller/configuration/LogSearchController.java @@ -24,9 +24,9 @@ public class LogSearchController extends BaseController{ */ // 获取相应日志检索菜单URL String logUrl = menuService.getLogUrl(entity.getFunctionId()); - Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction()); +// Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction()); - attr.addAttribute("service", serviceId); + attr.addAttribute("service", entity.getService().intValue()); attr.addAttribute("cfgId", entity.getCfgId()); attr.addAttribute("functionId", entity.getFunctionId()); attr.addAttribute("date", entity.getDate()); diff --git a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java index 28f53cc41..b8d762aa1 100644 --- a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java @@ -35,12 +35,8 @@ public class NtcDestIpReportController extends BaseController { List serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId()); - if(bean.getAction()!=null){ - for(FunctionServiceDict service:serviceList){ - if(service.getAction().intValue()==bean.getAction().intValue()){ - bean.setSearchService(service.getServiceId().toString()); - } - } + if(bean.getServiceId()!=null){ + bean.setServices(bean.getServiceId().toString()); }else{ StringBuffer serviceId=new StringBuffer(); for(int i=0;i serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId()); - if(bean.getAction()!=null){ - for(FunctionServiceDict service:serviceList){ - if(service.getAction().intValue()==bean.getAction().intValue()){ - bean.setSearchService(service.getServiceId().toString()); - } - } + if(bean.getServiceId()!=null){ + bean.setServices(bean.getServiceId().toString()); }else{ StringBuffer serviceId=new StringBuffer(); for(int i=0;i serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId()); List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); - if(bean.getAction()!=null){ - for(FunctionServiceDict service:serviceList){ - if(service.getAction().intValue()==bean.getAction().intValue()){ - bean.setSearchService(service.getServiceId().toString()); - } - } + if(bean.getServiceId()!=null){ + bean.setServices(bean.getServiceId().toString()); }else{ StringBuffer serviceId=new StringBuffer(); for(int i=0;i> ajaxGetLogTotal(Model model,Long endTime,String actions,Integer functionId,String compileIds){ + public List> ajaxGetLogTotal(Model model,Long endTime,String actions,String serviceIds,Integer functionId,String compileIds){ List> dataList=new ArrayList<>(); SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT); Date endDate=null; @@ -95,22 +95,25 @@ public class NtcPzReportController extends BaseController{ logger.info("log search end time:"+sdf.format(endDate)); logger.info("log search start time:"+sdf.format(startDate)); } - - String serviceIdsStr=""; - StringBuffer serviceIds=new StringBuffer(); - List serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); - for(String action:actions.split(",")) { - for(FunctionServiceDict service:serviceList){ - if(service.getAction().intValue()==Integer.parseInt(action)){ - serviceIds.append(service.getServiceId().intValue()); - serviceIds.append(","); - } - } - } - if(serviceIds.toString().endsWith(",")) { - serviceIdsStr=serviceIds.toString().substring(0,serviceIds.toString().lastIndexOf(",")); - } - String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIdsStr, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate)); +// String serviceIdsStr=""; +// if(StringUtils.isBlank(serviceIds)) { +// StringBuffer _serviceIds=new StringBuffer(); +// List serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); +// for(String action:actions.split(",")) { +// for(FunctionServiceDict service:serviceList){ +// if(service.getAction().intValue()==Integer.parseInt(action)){ +// _serviceIds.append(service.getServiceId().intValue()); +// _serviceIds.append(","); +// } +// } +// } +// if(_serviceIds.toString().endsWith(",")) { +// serviceIdsStr=_serviceIds.toString().substring(0,_serviceIds.toString().lastIndexOf(",")); +// } +// }else { +// serviceIdsStr=serviceIds; +// } + String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate)); List list=getList(json); String[] idArr=compileIds.split(","); if(list!=null&&(list.size()>0)){ @@ -136,12 +139,8 @@ public class NtcPzReportController extends BaseController{ List serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId()); List labels=serviceDictInfoService.findAllLableDict(); model.addAttribute("labels", labels); - if(bean.getAction()!=null){ - for(FunctionServiceDict service:serviceList){ - if(service.getAction().intValue()==bean.getAction().intValue()){ - bean.setSearchService(service.getServiceId().toString()); - } - } + if(bean.getServiceId()!=null){ + bean.setSearchService(bean.getServiceId().toString()); }else{ StringBuffer serviceId=new StringBuffer(); for(int i=0;i serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId()); - if(bean.getAction()!=null){ - for(FunctionServiceDict service:serviceList){ - if(service.getAction().intValue()==bean.getAction().intValue()){ - bean.setSearchService(service.getServiceId().toString()); - } - } + if(bean.getServiceId()!=null){ + bean.setServices(bean.getServiceId().toString()); }else{ StringBuffer serviceId=new StringBuffer(); for(int i=0;i serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId()); List labels=serviceDictInfoService.findAllLableDict(); model.addAttribute("labels", labels); - if(bean.getAction()!=null){ - for(FunctionServiceDict service:serviceList){ - if(service.getAction().intValue()==bean.getAction().intValue()){ - bean.setSearchService(service.getServiceId().toString()); - } - } + if(bean.getServiceId()!=null){ + bean.setServices(bean.getServiceId().toString()); }else{ StringBuffer serviceId=new StringBuffer(); for(int i=0;i serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId()); List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - if(bean.getAction()!=null){ - for(FunctionServiceDict service:serviceList){ - if(service.getAction().intValue()==bean.getAction().intValue()){ - bean.setSearchService(service.getServiceId().toString()); - } - } + if(bean.getServiceId()!=null){ + bean.setServices(bean.getServiceId().toString()); }else{ StringBuffer serviceId=new StringBuffer(); for(int i=0;i + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp index 6c1067b9f..d6a8a72f2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -420,7 +420,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp index 92bdfcdfe..7f4ee59c5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -420,7 +420,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp index 8c9cc36e5..21a22bb89 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp @@ -482,7 +482,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp index caa4a46b2..4c0fefdcd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -428,7 +428,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index 2dc71bd31..eb54c4bcc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -418,7 +418,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp index 4527eb0b5..33730fb09 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp @@ -365,7 +365,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index f56105a3c..95015edbd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -468,7 +468,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp index c91f0ba94..99950ac67 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -427,7 +427,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp index 08496368b..3614570a3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp @@ -326,7 +326,7 @@ -<%--
+<%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp index 84ff2a652..b34036351 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp @@ -437,7 +437,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp index afebcb4a0..20b1d7d98 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp @@ -383,7 +383,7 @@ - <%--
--%> + <%--
--%> ${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index b5b76a6df..d74bf884b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -499,7 +499,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index 615fea62e..240391749 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -416,7 +416,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index 4a64476e5..ff164c673 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -404,7 +404,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index cbcbc4f17..0849b8f16 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -500,7 +500,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index aae8fd482..a29ecaf7d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -418,7 +418,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index b249af92a..29c632d69 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -415,7 +415,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index 2d5d4618a..e4892b63f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -466,7 +466,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index ab3ad752c..9761bbfa0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -471,7 +471,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index 7929a3043..a72fbd684 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -492,7 +492,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index c93086414..4f16c5328 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -445,7 +445,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index 25c067939..d9cf24db1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -421,7 +421,7 @@ - <%--
--%> + <%--
--%> ${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index f599d0f2a..def7c346f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -468,7 +468,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index f7ffadb40..acbab3409 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -461,7 +461,7 @@ - <%--
--%> + <%--
--%> ${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index d2e41d5a3..fc6f81c82 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -448,7 +448,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index d523f84dd..1f61043eb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -439,7 +439,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index c2c6b6c17..f53633168 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -143,7 +143,7 @@ - + @@ -441,7 +441,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index 164e1c36f..006661914 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -445,7 +445,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index 0caee3318..3347ac1fa 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -446,7 +446,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp index e4c6300e8..58d9c6efe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -446,7 +446,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index 863c19ffe..d48a7b55a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -712,7 +712,7 @@ -
+
${indexCfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp index c9c2c3a06..93ab7df0d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp @@ -343,7 +343,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp index 52a1e9644..c2476973a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp @@ -346,7 +346,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index 66efa84a6..58539f27b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -450,7 +450,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index 2bbc9d595..eb482ae6c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -602,7 +602,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index b62d87e5d..17cc4ddda 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -443,7 +443,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index 9c99b0c15..d08ac0455 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -444,7 +444,7 @@ - <%--
--%> + <%--
--%> ${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index 4db4874d5..945d8e078 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -443,7 +443,7 @@ - <%--
--%> + <%--
--%> ${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index a5349244c..73d1755c7 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -92,8 +92,8 @@ $(document).ready(function() { }); function getXlsxFileName() { var cfgName = $("[name=cfgName2]").val() + "_"; - if ("${bean.action}") { - var action = $("[name=action]").find('[value=' + "${bean.action}" + ']').text() + "_"; + if ("${bean.serviceId}") { + var action = $("[name=serviceId]").find('[value=' + "${bean.serviceId}" + ']').text() + "_"; } else { var action = ""; } @@ -142,9 +142,16 @@ var reportDate=0; var ajaxServiceLogTotal=function(){ var services=[]; var objs=[]; + var serviceIndex=0; $(".service").each(function(){ + if(serviceIndex%2==0){ + $(this).addClass("btn-primary"); + }else{ + $(this).addClass("btn-default"); + } objs.push($(this)); services.push($(this).data("service")); + serviceIndex++; }); var timeout=$.validator.messages.timeout; var failed=$.validator.messages.failed; @@ -195,7 +202,7 @@ var ajaxReport=function(url,target){ cache:false, url:'${ctx}'+url,// /report/ajaxNtcTagReport data:{ - "action":$('[name="action"]').val(), + "serviceId":$('[name="serviceId"]').val(), "reportType":$('[name="reportType"]').val(), "reportTime":$('[name="reportTime"]').val(), "functionId":$('[name="functionId"]').val() @@ -355,15 +362,13 @@ function customColumnClick(){