diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 6bc1acbe2..215f5c617 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1526,7 +1526,8 @@ public class BaseController { }else if(regionDict.getFunctionId().equals(214)) { // IpSpoofing BlockingQueue list = ei.getDataList(IpSpoofingTemplate.class ); ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list); - }else if(regionDict.getFunctionId().equals(405)) { // APP IP + }else if(regionDict.getFunctionId().equals(405) || regionDict.getFunctionId().equals(563) || regionDict.getFunctionId().equals(565) + || regionDict.getFunctionId().equals(566)) { // APP IP BlockingQueue list = ei.getDataList(IpAllNotDoLogTemplate.class ); ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list); }else { @@ -1594,6 +1595,9 @@ public class BaseController { } else if(regionDict.getFunctionId().equals(563)){// APP Payload BlockingQueue list = ei.getDataList(AppPayloadTemplate.class); appComplexFeatureCfgs = this.checkAppComplexFeatureStringCfgMulity(errTip,serviceDict, regionDict, list); + } else if(regionDict.getFunctionId().equals(565) || regionDict.getFunctionId().equals(564) || regionDict.getFunctionId().equals(566)){// APP Feature StrPlus + BlockingQueue list = ei.getDataList(ComplexStringAllNotDoLogTemplate.class); + complexkeywordCfgs = this.checkComplexStringCfgMulity(errTip,serviceDict, regionDict, list); } else { BlockingQueue list = ei.getDataList(ComplexStringAllTemplate.class ); @@ -2468,9 +2472,10 @@ public class BaseController { ei.loadInitParams(IpWhitelistTemplate.class, msgProp, regionDict, serviceDict); } else if(regionDict.getFunctionId().equals(214)) { // IpSpoofing ei.loadInitParams(IpSpoofingTemplate.class, msgProp, regionDict, serviceDict); - } else if(regionDict.getFunctionId().equals(405)) { // APP IP - ei.loadInitParams(IpAllNotDoLogTemplate.class, msgProp, regionDict, serviceDict); - } else { + } else if(regionDict.getFunctionId().equals(405) || regionDict.getFunctionId().equals(563) || regionDict.getFunctionId().equals(565) + || regionDict.getFunctionId().equals(566)) { // APP Feature IP + ei.loadInitParams(IpAllNotDoLogTemplate.class, msgProp, regionDict, serviceDict); + } else { ei.loadInitParams(IpAllTemplate.class, msgProp, regionDict, serviceDict); } } else if (regionDict.getRegionType().equals(2)) {// 字符串类 @@ -2514,6 +2519,8 @@ public class BaseController { ei.loadInitParams(ComplexStringAllNotDoLogTemplate.class, this.getMsgProp(), regionDict, serviceDict); }else if(regionDict.getFunctionId().equals(563)) {// APP Payload ei.loadInitParams(AppPayloadTemplate.class, this.getMsgProp(), regionDict, serviceDict); + }else if(regionDict.getFunctionId().equals(565) || regionDict.getFunctionId().equals(564) || regionDict.getFunctionId().equals(566)){// APP Feature StrPlus + ei.loadInitParams(ComplexStringAllNotDoLogTemplate.class, this.getMsgProp(), regionDict, serviceDict); } else { ei.loadInitParams(ComplexStringAllTemplate.class, msgProp, regionDict, serviceDict); }