From 77059b8d2c12f456d9ab95c8c227710a362256c4 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Wed, 5 Jun 2019 15:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DIntercept=20Policy=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9F=9F{}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ConfigSynchronizationService.java      | 6 ++++--
 .../web/service/configuration/InterceptCfgService.java   | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

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 b17b6ca41..2db348d41 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -432,8 +432,6 @@ 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";
@@ -479,6 +477,10 @@ public class ConfigSynchronizationService  extends BaseService{
 			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())){//根据组号对应
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 634100aba..c1c276f8d 100644
--- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
@@ -475,10 +475,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 			}
 			//entity.getHttpUrlList().get(0).getCfgKeywords();
 			
-			domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr;
-			if(entity.getServiceId().equals(521)) {
-				domainUserRegion="{}";
-			}
+			domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr;			
 			HttpUrlCfg cfg = new HttpUrlCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
 			cfg.setTableName(HttpUrlCfg.getTablename());
@@ -489,6 +486,10 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 				strRegionList=map.get("dstList");
 			}
 		}
+		//设置intercept Policy自定义域 
+		if(entity.getServiceId().equals(521)) {
+			domainUserRegion="{}";
+		}
 		//保存区域IP信息 
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		if(!StringUtil.isEmpty(areaIpCfgList)){