修改app payload导入属性限制.

This commit is contained in:
zhangwenqing
2019-01-03 10:50:57 +08:00
parent 8da5a2dc96
commit 2c66f541f8

View File

@@ -454,8 +454,8 @@ public class AppMultiFeatureCfgService extends BaseService {
String icmpCode = baseStringCfg.getIcmpCode();
String icmpIdentifier = baseStringCfg.getIcmpIdentifier();
boolean errorFlag = false;
Pattern pattern = Pattern.compile("^([0-9|a-f|A-F]*)$");//.matcher(keyword).matches();
boolean errorFlag = false;// 除“can_not_null”外其它错误 标识
Pattern pattern = Pattern.compile("^([0-9|a-f|A-F]*)$");
StringBuffer errInfoCopy = new StringBuffer();
errInfoCopy.append(errInfo);
@@ -463,12 +463,12 @@ public class AppMultiFeatureCfgService extends BaseService {
boolean ipHeaderFlag = false;
List<Object> ipHeaderList = new ArrayList<>();
if(StringUtils.isNotBlank(baseStringCfg.getVer())) { ipHeaderList.add(baseStringCfg.getVer()); }
if(StringUtils.isNotBlank(baseStringCfg.getIhl())) { ipHeaderList.add(baseStringCfg.getVer()); }
if(StringUtils.isNotBlank(baseStringCfg.getTos())) { ipHeaderList.add(baseStringCfg.getVer()); }
if(StringUtils.isNotBlank(baseStringCfg.getTotalLength())) { ipHeaderList.add(baseStringCfg.getVer()); }
if(StringUtils.isNotBlank(baseStringCfg.getFlags())) { ipHeaderList.add(baseStringCfg.getVer()); }
if(StringUtils.isNotBlank(baseStringCfg.getFragmentOffset())) { ipHeaderList.add(baseStringCfg.getVer()); }
if(StringUtils.isNotBlank(baseStringCfg.getProtocol())) { ipHeaderList.add(baseStringCfg.getVer()); }
if(StringUtils.isNotBlank(baseStringCfg.getIhl())) { ipHeaderList.add(baseStringCfg.getIhl()); }
if(StringUtils.isNotBlank(baseStringCfg.getTos())) { ipHeaderList.add(baseStringCfg.getTos()); }
if(StringUtils.isNotBlank(baseStringCfg.getTotalLength())) { ipHeaderList.add(baseStringCfg.getTotalLength()); }
if(StringUtils.isNotBlank(baseStringCfg.getFlags())) { ipHeaderList.add(baseStringCfg.getFlags()); }
if(StringUtils.isNotBlank(baseStringCfg.getFragmentOffset())) { ipHeaderList.add(baseStringCfg.getFragmentOffset()); }
if(StringUtils.isNotBlank(baseStringCfg.getProtocol())) { ipHeaderList.add(baseStringCfg.getProtocol()); }
if(ipHeaderList.size() > 4) {// IP_header最多填写四个属性值
errInfo.append("IP_header " + prop.getProperty("l3_header_error")+";");
}else {
@@ -581,7 +581,7 @@ public class AppMultiFeatureCfgService extends BaseService {
count++;
}
if((count >0 || count <5) && (!errorFlag)) {
if((count >0 || count <5) && (!errorFlag) && (ipHeaderFlag)) {// 清空错误信息
errInfo.setLength(0);;
errInfo.append(errInfoCopy);
}
@@ -635,7 +635,7 @@ public class AppMultiFeatureCfgService extends BaseService {
count++;
}
if((count >0) && (!errorFlag)) {
if((count >0) && (!errorFlag)) {// 清空错误信息
errInfo.setLength(0);;
errInfo.append(errInfoCopy);
}