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