From 9355918750c08a94bae51a725a0dca357836aa4d Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 18 Dec 2018 10:09:14 +0600 Subject: [PATCH] =?UTF-8?q?(1)Packet=20IP=20Block=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=80=BC=E4=B8=BA6=20(2)=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=B4=A6=E5=8F=B7=E4=BF=9D=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/util/excel/thread/CheckIpFormatThread.java | 6 ++++++ src/main/java/com/nis/web/service/BaseService.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java index 44f6b9f24..3dfc8446d 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -595,6 +595,12 @@ public class CheckIpFormatThread implements Callable{ baseIpCfg.setProtocol(baseIpCfg.getProtocol()); baseIpCfg.setProtocolId(serviceDict==null?0:serviceDict.getProtocolId()); } + if(regionDict!=null&&serviceDict!=null&®ionDict.getFunctionId().intValue()==5&&serviceDict.getServiceId().intValue()==16) { + if(baseIpCfg.getProtocol().intValue()!=6) { + errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("protocol")) + "." + + String.format(prop.getProperty("alternative_values"), 6) + ";"); + } + } // TODO 判断Protocol的值 boolean validProtocol = this.validProtocol(errInfo, baseIpCfg.getProtocol(), protocol); // 验证protocol与port是否符合逻辑 diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index accb9ca9a..e84df21e6 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -1676,6 +1676,10 @@ public abstract class BaseService { if(regionDict.getDictId().intValue()==56){ this.saveStringCfgBatch(regionDict,serviceDict,listPage, "http_url_cfg",send); } + //账号 + else if("subscribe_id".equals(regionDict.getConfigServiceType())){ + this.saveStringCfgBatch(regionDict,serviceDict,listPage, "ntc_subscribe_id_cfg",send); + } }else if("ComplexkeywordCfg".equals(type)) { List listPage = (List) list; // DNS