From 6b37a95ee28eeffe6a6fbbf1b208bf2b78d5ce34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Thu, 28 Feb 2019 17:55:56 +0800 Subject: [PATCH] =?UTF-8?q?//http=20url=20//dns=20//mail=20address=20//mai?= =?UTF-8?q?l=20advanced=20//https=20monitor=20//https=20block=20//https=20?= =?UTF-8?q?redirect=20//https=20replace=20//https=20whitelist=20#=E4=BB=A5?= =?UTF-8?q?=E4=B8=8A=E4=B8=9A=E5=8A=A1=E7=9A=84=E9=85=8D=E7=BD=AE=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=A4=B1=E6=95=88=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScheduleUpdateInterceptor.java | 1 + .../nis/web/controller/BaseController.java | 9 ++++++++ src/main/resources/service/service_config.xml | 21 +++++++++++-------- src/main/webapp/WEB-INF/tags/sys/delRow.tag | 17 +++++++++++---- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java b/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java index b8b97ce2b..85a793778 100644 --- a/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java +++ b/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java @@ -70,6 +70,7 @@ public class ScheduleUpdateInterceptor extends BaseInterceptor{ EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.SchedulerDao.updateCfgTableStatus"); EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.basics.ServiceDictInfoDao"); EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.PxyObjKeyringDao.updatePxyObjTrustedCaCrl"); + EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.CommonPolicyDao.auditCfgBatch"); } /** * is_valid 字段名 diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 9979908d1..b8f863adb 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3240,6 +3240,15 @@ public class BaseController { } } } + + //批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null + if(!StringUtil.isEmpty(entity)) { + BaseCfg base=(BaseCfg)entity ; + if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) { + base.setIsValid(null); + BeanUtils.copyProperties(base, entity); + } + } } diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml index c573831b3..69d849a3a 100644 --- a/src/main/resources/service/service_config.xml +++ b/src/main/resources/service/service_config.xml @@ -40,7 +40,13 @@ - + + + + + + + - + + - + diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index 0d1d38148..36efa09d7 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -247,18 +247,27 @@ function cancelPassOpt(url){ } }else{ - /* 批量下发待测试 - if(url.indexOf("functionId") > -1){ + //批量下发待测试 + if(url.indexOf("functionId=6") > -1 //http url + || url.indexOf("functionId=7") > -1 //dns + || url.indexOf("functionId=37") > -1 //mail address + || url.indexOf("functionId=35") > -1 //mail advanced + || url.indexOf("functionId=210") > -1 //https monitor + || url.indexOf("functionId=207") > -1 //mail block + || url.indexOf("functionId=208") > -1 //mail redirect + || url.indexOf("functionId=209") > -1 //mail replace + || url.indexOf("functionId=211") > -1 //mail whitelist + ){ top.$.jBox.confirm("","",function(v,h,f){ if(v=="ok"){ $("#searchForm").attr("action",url); page(); } }); - }else{ */ + }else{ top.$.jBox.tip("", ""); return; - /* } */ + } } } function doAll(checkboxes,url){