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

1、修改MaatTestControll中回调类配置 配置Id 的识别方式(isCfgId=true)；

Browse Source 
2、删除原有IR配置(0x340-IP复用策略配置,0x340-IP复用地址池配置)
3、添加新的IR配置：
	#0x342 IP复用静态地址池 IR_STATIC_NOMINEE_IP；
	#0x343 IP复用SNAT策略 IR_SNAT_POLICY；
	#0x344 IP复用DNAT策略 IR_DNAT_POLICY
This commit is contained in:
zhangdongxu
2018-12-03 18:28:48 +08:00
parent 6e2d8bf02f
commit c1ddd76665
4 changed files with 115 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/web/controller/restful/MaatTestController.java
View File

@@ -547,6 +547,7 @@ public class MaatTestController {
String fieldType = commonSourceFieldCfg.getFieldType();
String srcName = commonSourceFieldCfg.getSrcName();
String dstName = commonSourceFieldCfg.getDstName();
Boolean isCfgId = commonSourceFieldCfg.getIsCfgId();
if (!srcList.contains(srcName)) {
jsonString.append("\"");
jsonString.append(srcName);
@@ -575,9 +576,9 @@ public class MaatTestController {
jsonString.append("1");
} else if (srcName.toLowerCase().equals("isvalid")) {
jsonString.append("1");
} else if (srcName.toLowerCase().equals("cfgid")
|| srcName.toLowerCase().equals("keyringid")
|| srcName.toLowerCase().equals("fileid")) {
} else if (srcName.toLowerCase().equals("dolog")) {
jsonString.append("1");
} else if (isCfgId) {
Long incrId = configRedisService.getIncrId("SEQ_COMPILEID");
compileIdList.add(incrId);
jsonString.append(incrId);