diff --git a/src/main/java/com/nis/util/SchedulerTaskUtil.java b/src/main/java/com/nis/util/SchedulerTaskUtil.java index fd465a32e..c134af774 100644 --- a/src/main/java/com/nis/util/SchedulerTaskUtil.java +++ b/src/main/java/com/nis/util/SchedulerTaskUtil.java @@ -254,7 +254,10 @@ public class SchedulerTaskUtil { if(entity.getServiceId().equals(656)) { userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion); } - + //Intercept Policy + else if(entity.getServiceId().equals(521)) { + userRegion="{}"; + } for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应 ip.setIsValid(entity.getIsValid()); diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index f556e24cb..b17b6ca41 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -432,6 +432,8 @@ public class ConfigSynchronizationService extends BaseService{ if(!StringUtil.isEmpty(cfg.getUserRegion1())&&cfg.getUserRegion1().startsWith("{")) { userRegion=cfg.getUserRegion1(); } + }else if(entity.getServiceId().equals(521)) { + userRegion="{}"; }else{ /*if(regionKey.equals("keyring_id") && StringUtil.isEmpty(value)){ value = "0"; diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index dab530ff3..634100aba 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -476,6 +476,9 @@ public class InterceptCfgService extends CrudService //entity.getHttpUrlList().get(0).getCfgKeywords(); domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr; + if(entity.getServiceId().equals(521)) { + domainUserRegion="{}"; + } HttpUrlCfg cfg = new HttpUrlCfg(); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); cfg.setTableName(HttpUrlCfg.getTablename()); diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index 232d68b5a..053b387c8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -836,21 +836,7 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
- -
hidden""> -
- -
-
- checked/> -
-
-
-
-
+
hidden">
@@ -883,6 +869,22 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
+
+
+
+ +
+
+ checked/> +
+
+
+
+
+