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

asn关键字配置下发时，asnno前加上AS前缀

Browse Source
This commit is contained in:
duandongmei
2019-01-16 17:26:06 +06:00
parent 924ec9c945
commit 81da172c70
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -584,7 +584,7 @@ public abstract class BaseService {
cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid());
// 处理配置关键字转译
cfg.setCfgKeywords(keywordsEscape(asnKeywordCfg.getCfgKeywords()));
cfg.setCfgKeywords(Constants.ASN_KEY+keywordsEscape(asnKeywordCfg.getCfgKeywords()));
dstList.add(cfg);
}
}
@@ -3079,9 +3079,10 @@ public abstract class BaseService {
* @param srcMap
* @param isValid
* @param cfgType
* @param commonType 公共组类型 4 ASN
* @return
*/
public static <T> List<GroupReuseCfg> convertCommonRegion(Map<Integer,List<T>> srcMap,List<GroupReuseCfg> commonGroupList,Integer isValid,Integer cfgType) {
public static <T> List<GroupReuseCfg> convertCommonRegion(Map<Integer,List<T>> srcMap,List<GroupReuseCfg> commonGroupList,Integer isValid,Integer cfgType,Integer commonType) {
for (Integer groupId : srcMap.keySet()) {
GroupReuseCfg groupCfg=new GroupReuseCfg();
List<StringCfg> strRegionList=new ArrayList<>();
@@ -3119,7 +3120,12 @@ public abstract class BaseService {
cfg.setIsHexbin(strCfg.getIsHexbin());
cfg.setExprType(strCfg.getExprType());
// 处理配置关键字转译
cfg.setCfgKeywords(keywordsEscape(cfg.getCfgKeywords()));
if(commonType == 4){
cfg.setCfgKeywords(Constants.ASN_KEY+keywordsEscape(cfg.getCfgKeywords()));
}else{
cfg.setCfgKeywords(keywordsEscape(cfg.getCfgKeywords()));
}
// 增强字符串转换
cfg.setDistrict(keywordsEscape(cfg.getDistrict()));
strRegionList.add(cfg);