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

(1)修复共用页面左上角显示配置类别

Browse Source 
(2)域名转发提交，与域名拦截复用页面
This commit is contained in:
wangxin
2018-06-23 14:34:27 +08:00
parent 02fc089f41
commit 3206972ee9
14 changed files with 219 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,6 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
groupRelationList=map.get("groupList");
strRegionList=map.get("dstList");
maatCfg.setAreaEffectiveIds("0");
maatCfg.setUserRegion(cfg.getCompileId()+"");
maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime());
maatCfg.setIpRegionList(ipRegionList);
@@ -274,8 +273,9 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
groupRelationList=areaMap.get("groupList");
areaIpRegionList=areaMap.get("dstList");
maatCfg.setAreaEffectiveIds(StringUtils.isBlank(cfg.getAreaEffectiveIds())?"0":cfg.getAreaEffectiveIds());
String userRegion=cfg.getCfgKeywords().replaceAll(Constants.KEYWORD_EXPR , "&");
maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+userRegion+Constants.USER_REGION_SPLIT);
if(cfg.getServiceId().intValue()==Constants.SERVICE_PXY_DOMAIN_INTERCEPT){
maatCfg.setUserRegion(this.keywordsEscape(cfg.getCfgKeywords()));
}
maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime());
maatCfg.setIpRegionList(ipRegionList);