From 2c66f541f8b8bae16ca56f8eddbaa043029e0836 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Thu, 3 Jan 2019 10:50:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=20payload=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=B1=9E=E6=80=A7=E9=99=90=E5=88=B6.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMultiFeatureCfgService.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java index a251d9143..52b9c744a 100644 --- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java @@ -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 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); }