gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复Intercept Policy自定义域{}

Browse Source
This commit is contained in:
wangwei
2019-06-05 15:23:03 +08:00
parent 452e295d8a
commit 77059b8d2c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -432,8 +432,6 @@ public class ConfigSynchronizationService extends BaseService{
if(!StringUtil.isEmpty(cfg.getUserRegion1())&&cfg.getUserRegion1().startsWith("{")) { if(!StringUtil.isEmpty(cfg.getUserRegion1())&&cfg.getUserRegion1().startsWith("{")) {
userRegion=cfg.getUserRegion1(); userRegion=cfg.getUserRegion1();
} }
}else if(entity.getServiceId().equals(521)) {
userRegion="{}";
}else{ }else{
/*if(regionKey.equals("keyring_id") && StringUtil.isEmpty(value)){ /*if(regionKey.equals("keyring_id") && StringUtil.isEmpty(value)){
value = "0"; value = "0";
@@ -479,6 +477,10 @@ public class ConfigSynchronizationService extends BaseService{
if(entity.getServiceId().equals(656)) { if(entity.getServiceId().equals(656)) {
userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion); userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);
} }
//Intercept Policy
else if(entity.getServiceId().equals(521)) {
userRegion="{}";
}
for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId
if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应 if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应

9
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -475,10 +475,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
} }
//entity.getHttpUrlList().get(0).getCfgKeywords(); //entity.getHttpUrlList().get(0).getCfgKeywords();
domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr; domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr;
if(entity.getServiceId().equals(521)) {
domainUserRegion="{}";
}
HttpUrlCfg cfg = new HttpUrlCfg(); HttpUrlCfg cfg = new HttpUrlCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
cfg.setTableName(HttpUrlCfg.getTablename()); cfg.setTableName(HttpUrlCfg.getTablename());
@@ -489,6 +486,10 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
strRegionList=map.get("dstList"); strRegionList=map.get("dstList");
} }
} }
//设置intercept Policy自定义域
if(entity.getServiceId().equals(521)) {
domainUserRegion="{}";
}
//保存区域IP信息 //保存区域IP信息
List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId()); List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
if(!StringUtil.isEmpty(areaIpCfgList)){ if(!StringUtil.isEmpty(areaIpCfgList)){