From 81ddac4f9faffe0994939924088b4a07c0f8faa5 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 20 Dec 2018 15:53:02 +0600 Subject: [PATCH] =?UTF-8?q?(1)dns=E6=AC=BA=E9=AA=97ip=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=EF=BC=8C=E4=B8=8D=E5=92=8Cdnsip=E5=85=B1?= =?UTF-8?q?=E7=94=A8=20(2)=E5=AF=BC=E5=85=A5=E4=B8=80=E8=A1=8C=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AF=E4=B8=8D=E7=BB=88=E6=AD=A2=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=EF=BC=8C=E7=95=A5=E8=BF=87=E8=AF=A5=E8=A1=8C=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/DnsFakeIpTemplate.java | 35 ++++++++++ .../java/com/nis/util/excel/ExportExcel.java | 30 ++++++--- .../com/nis/util/excel/ImportBigExcel.java | 2 +- .../CheckComplexStringFormatThread.java | 28 ++++---- .../CheckDnsResStrategyFormatThread.java | 20 +++--- .../excel/thread/CheckIpFormatThread.java | 26 ++++---- .../excel/thread/CheckStringFormatThread.java | 28 ++++---- .../nis/web/controller/BaseController.java | 66 +++++++++++-------- .../configuration/ntc/IpController.java | 5 +- 9 files changed, 157 insertions(+), 83 deletions(-) create mode 100644 src/main/java/com/nis/domain/configuration/template/DnsFakeIpTemplate.java diff --git a/src/main/java/com/nis/domain/configuration/template/DnsFakeIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/DnsFakeIpTemplate.java new file mode 100644 index 000000000..7ed93e988 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/template/DnsFakeIpTemplate.java @@ -0,0 +1,35 @@ +/** + *@Title: BaseStringConfig.java + *@Package com.nis.domain.restful + *@Description TODO + *@author dell + *@date 2018年2月5日 下午5:26:02 + *@version 版本号 + */ +package com.nis.domain.configuration.template; + +import com.nis.util.excel.ExcelField; + +/** + * @Description: excel导入DNS IP类配置 + */ +public class DnsFakeIpTemplate extends IpAllTemplate { + + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + + private Integer dnsStrategyId; + + @ExcelField(title="group",align=2,sort=2) + public Integer getDnsStrategyId() { + return dnsStrategyId; + } + public void setDnsStrategyId(Integer dnsStrategyId) { + this.dnsStrategyId = dnsStrategyId; + } + +} diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index afcaf298c..437c05430 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -339,16 +339,30 @@ public class ExportExcel { } if("group".equals(headerStr)) { commentStr=""; - //查询ip复用地址池配置的policyGroup列表 - List list=policyGroupInfoDao.findPolicyGroupInfosByType(2); - if(!StringUtil.isEmpty(list)){ - for (PolicyGroupInfo policyGroupInfo : list) { - commentStr=commentStr+policyGroupInfo.getGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n"; - index++; + if(region.getFunctionId()==401) { + //查询dns fake ip policyGroup列表 + List list=policyGroupInfoDao.findPolicyGroupInfosByType(1); + if(!StringUtil.isEmpty(list)){ + for (PolicyGroupInfo policyGroupInfo : list) { + commentStr=commentStr+policyGroupInfo.getGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n"; + index++; + } } + commentStr=msgProp.getProperty("select")+":\n"+commentStr; + index++; + }else { + //查询ip复用地址池配置的policyGroup列表 + List list=policyGroupInfoDao.findPolicyGroupInfosByType(2); + if(!StringUtil.isEmpty(list)){ + for (PolicyGroupInfo policyGroupInfo : list) { + commentStr=commentStr+policyGroupInfo.getGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n"; + index++; + } + } + commentStr=msgProp.getProperty("select")+":\n"+commentStr; + index++; } - commentStr=msgProp.getProperty("select")+":\n"+commentStr; - index++; + } if("isp".equals(headerStr)) { commentStr=""; diff --git a/src/main/java/com/nis/util/excel/ImportBigExcel.java b/src/main/java/com/nis/util/excel/ImportBigExcel.java index 6c1af1b62..c6c99bf96 100644 --- a/src/main/java/com/nis/util/excel/ImportBigExcel.java +++ b/src/main/java/com/nis/util/excel/ImportBigExcel.java @@ -480,7 +480,7 @@ public class ImportBigExcel extends XLSXCovertCSVReader{ } } } catch (Exception ex) { - log.info("Get cell value ["+i+","+column+"] error: " + ex.toString()); + log.debug("Get cell value ["+i+","+column+"] error: " + ex.toString()); val = null; } // set entity value diff --git a/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java index d75be7b66..d9469a734 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java @@ -42,24 +42,26 @@ public class CheckComplexStringFormatThread implements Callable{ @Override public String call() throws Exception { List dataList=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE); - String msg=null; + StringBuffer msg=new StringBuffer(); while(!srcQueue.isEmpty()) { int size=srcQueue.drainTo(dataList,Constants.MAAT_JSON_SEND_SIZE); if(regionDict.getRegionType().intValue()==3) { try { - List cfgs=this.checkComplexStringCfg(dataList); + List cfgs=this.checkComplexStringCfg(msg,dataList); destQueue.addAll(cfgs); }catch (Exception e) { + logger.error("checkComplexStringCfg error,",e); // TODO: handle exception - msg=e.getMessage(); - break; + //msg=e.getMessage(); + //msg.append(e.getMessage()); + //break; } } dataList.clear(); } - return msg; + return msg.toString(); } - public List checkComplexStringCfg( + public List checkComplexStringCfg(StringBuffer msg, List list) throws ServiceException { logger.warn("start to validate complexString data..."); long start=System.currentTimeMillis(); @@ -233,9 +235,9 @@ public class CheckComplexStringFormatThread implements Callable{ Integer isCaseInsenstive = baseStringCfg.getIsCaseInsenstive(); if (isHex == null || isCaseInsenstive == null) { if (isHex == null) { - if (hexP.equals("0") || hexP.equals("2")) { + if (hexP.indexOf("0")>-1 || hexP.indexOf("2")>-1) { baseStringCfg.setIsHex(0); - } else if (hexP.equals("1")) { + } else if (hexP.indexOf("1")>-1) { baseStringCfg.setIsHex(1); } else { errInfo.append( @@ -243,9 +245,9 @@ public class CheckComplexStringFormatThread implements Callable{ } } if (isCaseInsenstive == null) { - if (hexP.equals("0") || hexP.equals("1")) { + if (hexP.indexOf("0")>-1 || hexP.indexOf("1")>-1) { baseStringCfg.setIsCaseInsenstive(0); - } else if (hexP.equals("2")) { + } else if (hexP.indexOf("2")>-1) { baseStringCfg.setIsCaseInsenstive(1); } else { errInfo.append(String.format(prop.getProperty("can_not_null"), @@ -299,11 +301,13 @@ public class CheckComplexStringFormatThread implements Callable{ errTip.append(String.format(prop.getProperty("line"), baseStringCfg.getIndex()) + ","); errTip.append(errInfo); errTip.append("
"); + }else { + stringList.add(baseStringCfg); } - stringList.add(baseStringCfg); } if (errTip.toString().length() > 0) { - throw new ServiceException(errTip.toString()); + msg.append(errTip); + //throw new ServiceException(errTip.toString()); } long end=System.currentTimeMillis(); logger.warn("validate complexString data finish,cost:"+(end-start)); diff --git a/src/main/java/com/nis/util/excel/thread/CheckDnsResStrategyFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckDnsResStrategyFormatThread.java index c11a55c72..107ae5be1 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckDnsResStrategyFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckDnsResStrategyFormatThread.java @@ -41,24 +41,25 @@ public class CheckDnsResStrategyFormatThread implements Callable{ @Override public String call() throws Exception { List dataList=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE); - String msg=null; + StringBuffer msg=new StringBuffer(); while(!srcQueue.isEmpty()) { int size=srcQueue.drainTo(dataList,Constants.MAAT_JSON_SEND_SIZE); if(regionDict.getRegionType().intValue()==6) { try { - List cfgs=this.checkDnsResStrategyCfg(dataList); + List cfgs=this.checkDnsResStrategyCfg(msg,dataList); destQueue.addAll(cfgs); }catch (Exception e) { + logger.error("checkDnsResStrategyCfg error",e); // TODO: handle exception - msg=e.getMessage(); - break; + //msg=e.getMessage(); + //break; } } dataList.clear(); } - return msg; + return msg.toString(); } - public List checkDnsResStrategyCfg(List list) + public List checkDnsResStrategyCfg(StringBuffer msg,List list) throws ServiceException { List dnsResStrategies=Lists.newArrayList(); StringBuffer errTip = new StringBuffer(); @@ -129,11 +130,14 @@ public class CheckDnsResStrategyFormatThread implements Callable{ errTip.append(String.format(prop.getProperty("line"), dnsResStrategy.getIndex()) + ","); errTip.append(errInfo); errTip.append("
"); + }else { + dnsResStrategies.add(dnsResStrategy); } - dnsResStrategies.add(dnsResStrategy); + } if (errTip.toString().length() > 0) { - throw new ServiceException(errTip.toString()); + msg.append(errTip); + //throw new ServiceException(errTip.toString()); } return dnsResStrategies; } 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 e27076410..be6b0fb91 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -18,6 +18,7 @@ import com.beust.jcommander.internal.Lists; import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionServiceDict; import com.nis.domain.SysDataDictionaryItem; +import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.configuration.IpPortCfg; @@ -48,25 +49,26 @@ public class CheckIpFormatThread implements Callable{ @Override public String call() throws Exception { List dataList=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE); - String msg=null; + StringBuffer msg=new StringBuffer(); while(!srcQueue.isEmpty()) { int size=srcQueue.drainTo(dataList,Constants.MAAT_JSON_SEND_SIZE); if(regionDict.getRegionType().intValue()==1) { try { - List ipcfgs=this.checkIpCfg(asnNoMaps, dataList); + List ipcfgs=this.checkIpCfg(msg,asnNoMaps, dataList); boolean success=destQueue.addAll(ipcfgs); }catch (Exception e) { + logger.error("checkIpCfg error,",e); e.printStackTrace(); // TODO: handle exception - msg=e.getMessage(); - break; + //msg.append(e.getMessage()); + //break; } } dataList.clear(); } - return msg; + return msg.toString(); } - public List checkIpCfg(List> asnNos, List list) + public List checkIpCfg(StringBuffer msg,List> asnNos, List list) throws ServiceException { logger.warn("start to validate ip..."); long start=System.currentTimeMillis(); @@ -188,10 +190,10 @@ public class CheckIpFormatThread implements Callable{ Integer dnsStrategyId = baseIpCfg.getDnsStrategyId(); if (dnsStrategyId != null) { if(dnsStrategyId>0) { - List dnsStrategys = DictUtils.getDnsResStrategyList(Long.valueOf(dnsStrategyId)); - if (dnsStrategys == null || dnsStrategys.size() == 0) { + PolicyGroupInfo dnsStrategy = DictUtils.getDnsGroups(dnsStrategyId); + if (dnsStrategy == null ) { errInfo.append( - String.format(prop.getProperty("is_incorrect"), prop.getProperty("dns_res_strategy")) + String.format(prop.getProperty("is_incorrect"), prop.getProperty("group")) + ";"); } } @@ -649,11 +651,13 @@ public class CheckIpFormatThread implements Callable{ errTip.append(String.format(prop.getProperty("line"), baseIpCfg.getIndex()) + ","); errTip.append(errInfo); errTip.append("
"); + }else { + ipList.add(baseIpCfg); } - ipList.add(baseIpCfg); } if (errTip.toString().length() > 0) { - throw new ServiceException(errTip.toString()); + msg.append(errTip); + //throw new ServiceException(errTip.toString()); } long end=System.currentTimeMillis(); logger.warn("validate ip finish,cost:"+(end-start)); diff --git a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java index ff9b4cc55..e50768a3c 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -42,25 +42,26 @@ public class CheckStringFormatThread implements Callable{ @Override public String call() throws Exception { List dataList=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE); - String msg=null; + StringBuffer msg=new StringBuffer(); while(!srcQueue.isEmpty()) { int size=srcQueue.drainTo(dataList,Constants.MAAT_JSON_SEND_SIZE); if(regionDict.getRegionType().intValue()==2) { try { - List> cfgs=this.checkStringCfg(dataList); + List> cfgs=this.checkStringCfg(msg,dataList); destQueue.addAll(cfgs); }catch (Exception e) { + logger.error("checkStringCfg error",e); // TODO: handle exception - msg=e.getMessage(); - break; + //msg=e.getMessage(); + //break; } } dataList.clear(); } - return msg; + return msg.toString(); } - public List> checkStringCfg(List list) throws ServiceException { + public List> checkStringCfg(StringBuffer msg,List list) throws ServiceException { logger.warn("start to validate stringCfg data..."); long start=System.currentTimeMillis(); List> stringList = new ArrayList>(); @@ -276,9 +277,9 @@ public class CheckStringFormatThread implements Callable{ Integer isCaseInsenstive = baseStringCfg.getIsCaseInsenstive(); if (isHex == null || isCaseInsenstive == null) { if (isHex == null) { - if (hexP.equals("0") || hexP.equals("2")) { + if (hexP.indexOf("0")>-1 || hexP.indexOf("2")>-1) { baseStringCfg.setIsHex(0); - } else if (hexP.equals("1")) { + } else if (hexP.indexOf("1")>-1) { baseStringCfg.setIsHex(1); } else { errInfo.append( @@ -286,9 +287,9 @@ public class CheckStringFormatThread implements Callable{ } } if (isCaseInsenstive == null) { - if (hexP.equals("0") || hexP.equals("1")) { + if (hexP.indexOf("0")>-1 || hexP.indexOf("1")>-1) { baseStringCfg.setIsCaseInsenstive(0); - } else if (hexP.equals("2")) { + } else if (hexP.indexOf("2")>-1) { baseStringCfg.setIsCaseInsenstive(1); } else { errInfo.append(String.format(prop.getProperty("can_not_null"), @@ -343,11 +344,14 @@ public class CheckStringFormatThread implements Callable{ errTip.append(String.format(prop.getProperty("line"), baseStringCfg.getIndex()) + ","); errTip.append(errInfo); errTip.append("
"); + }else { + stringList.add(baseStringCfg); } - stringList.add(baseStringCfg); + } if (errTip.toString().length() > 0) { - throw new ServiceException(errTip.toString()); + msg.append(errTip); + //throw new ServiceException(errTip.toString()); } long end=System.currentTimeMillis(); logger.warn("validate stringCfg data finish,cost:"+(end-start)); diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index e320c393f..5a438b059 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -79,6 +79,7 @@ import com.nis.domain.configuration.template.AsnIpTemplate; import com.nis.domain.configuration.template.ComplexStringAllTemplate; import com.nis.domain.configuration.template.DdosIpTemplate; import com.nis.domain.configuration.template.DnsComplexStringTemplate; +import com.nis.domain.configuration.template.DnsFakeIpTemplate; import com.nis.domain.configuration.template.DnsIpTemplate; import com.nis.domain.configuration.template.DnsResStrategyTemplate; import com.nis.domain.configuration.template.DomainInterceptMonitTemplate; @@ -931,7 +932,7 @@ public class BaseController { * @throws InterruptedException * @throws ExecutionException */ - public BlockingQueue checkIpCfgMulity(FunctionServiceDict serviceDict, FunctionRegionDict regionDict,List> asnNos, BlockingQueue list) throws ServiceException, InterruptedException, ExecutionException{ + public BlockingQueue checkIpCfgMulity(StringBuffer _msg,FunctionServiceDict serviceDict, FunctionRegionDict regionDict,List> asnNos, BlockingQueue list) throws ServiceException, InterruptedException, ExecutionException{ logger.warn("start checkIpCfgMulity ,size "+list.size()); long start=System.currentTimeMillis(); BlockingQueue queue=new ArrayBlockingQueue<>(list.size()); @@ -954,7 +955,8 @@ public class BaseController { for(Future future:futures) { String msg = future.get(); if(StringUtils.isNotBlank(msg)) { - throw new ServiceException(msg); + //throw new ServiceException(msg); + _msg.append(msg); } } long end=System.currentTimeMillis(); @@ -971,7 +973,7 @@ public class BaseController { * @throws ExecutionException * @throws ServiceException */ - public BlockingQueue> checkStringCfgMulity(FunctionServiceDict serviceDict, FunctionRegionDict regionDict, BlockingQueue list) throws InterruptedException, ExecutionException, ServiceException{ + public BlockingQueue> checkStringCfgMulity(StringBuffer _msg,FunctionServiceDict serviceDict, FunctionRegionDict regionDict, BlockingQueue list) throws InterruptedException, ExecutionException, ServiceException{ logger.warn("start checkStringCfgMulity ,size "+list.size()); long start=System.currentTimeMillis(); BlockingQueue> queue=new ArrayBlockingQueue<>(list.size()); @@ -993,7 +995,8 @@ public class BaseController { for(Future future:futures) { String msg = future.get(); if(StringUtils.isNotBlank(msg)) { - throw new ServiceException(msg); + //throw new ServiceException(msg); + _msg.append(msg); } } long end=System.currentTimeMillis(); @@ -1010,7 +1013,7 @@ public class BaseController { * @throws ExecutionException * @throws ServiceException */ - public BlockingQueue checkComplexStringCfgMulity(FunctionServiceDict serviceDict, FunctionRegionDict regionDict,BlockingQueue list) throws InterruptedException, ExecutionException, ServiceException{ + public BlockingQueue checkComplexStringCfgMulity(StringBuffer _msg,FunctionServiceDict serviceDict, FunctionRegionDict regionDict,BlockingQueue list) throws InterruptedException, ExecutionException, ServiceException{ logger.warn("start checkComplexStringCfgMulity ,size "+list.size()); long start=System.currentTimeMillis(); BlockingQueue queue=new ArrayBlockingQueue<>(list.size()); @@ -1032,7 +1035,8 @@ public class BaseController { for(Future future:futures) { String msg = future.get(); if(StringUtils.isNotBlank(msg)) { - throw new ServiceException(msg); + //throw new ServiceException(msg); + _msg.append(msg); } } long end=System.currentTimeMillis(); @@ -1049,7 +1053,7 @@ public class BaseController { * @throws ExecutionException * @throws ServiceException */ - public BlockingQueue checkDnsResStrategyCfgMulity(FunctionServiceDict serviceDict, FunctionRegionDict regionDict,BlockingQueue list) throws InterruptedException, ExecutionException, ServiceException{ + public BlockingQueue checkDnsResStrategyCfgMulity(StringBuffer _msg,FunctionServiceDict serviceDict, FunctionRegionDict regionDict,BlockingQueue list) throws InterruptedException, ExecutionException, ServiceException{ logger.warn("start checkDnsResStrategyCfgMulity ,size "+list.size()); long start=System.currentTimeMillis(); BlockingQueue queue=new ArrayBlockingQueue<>(list.size()); @@ -1071,7 +1075,8 @@ public class BaseController { for(Future future:futures) { String msg = future.get(); if(StringUtils.isNotBlank(msg)) { - throw new ServiceException(msg); + _msg.append(msg); + //throw new ServiceException(msg); } } long end=System.currentTimeMillis(); @@ -1210,6 +1215,7 @@ public class BaseController { ImportBigExcel ei=null; try { FunctionServiceDict serviceDict = DictUtils.getFunctionServiceDict(serviceDictId); + StringBuffer errTip=new StringBuffer(); BlockingQueue ipPortCfgs =null; BlockingQueue> stringCfgs =null; BlockingQueue complexkeywordCfgs =null; @@ -1250,78 +1256,78 @@ public class BaseController { if (serviceDict!=null&&serviceDict.getAction().equals(64)) { BlockingQueue list = ei.getDataList(IpRateLimitTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); } else { BlockingQueue list = ei.getDataList(IpAllTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); } } else if (regionDict.getFunctionId().equals(7)&&serviceDict!=null&&serviceDict.getAction().intValue()==16) { BlockingQueue list = ei.getDataList(DnsIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); }else if(regionDict.getFunctionId().equals(401)) { - BlockingQueue list = ei.getDataList(DnsIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, null, list); + BlockingQueue list = ei.getDataList(DnsFakeIpTemplate.class ); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); }else if (regionDict.getFunctionId().equals(212)) { BlockingQueue list = ei.getDataList(IpPayloadTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); } else if (regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())) { // P2p IP BlockingQueue list = ei.getDataList(P2pIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); } else if (regionDict.getFunctionId().equals(600)) {// ASN IP //加载asn缓存 AsnCacheUtils.init(true); BlockingQueue list = ei.getDataList(AsnIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, asnNoMaps, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, asnNoMaps, list); } else if (regionDict.getFunctionId().equals(301)) {// DDOS IP BlockingQueue list = ei.getDataList(DdosIpTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); } else { BlockingQueue list = ei.getDataList(IpAllTemplate.class ); - ipPortCfgs=this.checkIpCfgMulity(serviceDict, regionDict, null, list); + ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null, list); } } else if (regionDict.getRegionType().equals(2)) {// 字符串类 if (regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())) { // P2p hash BlockingQueue list = ei.getDataList(P2pHashStringTemplate.class ); - stringCfgs=this.checkStringCfgMulity(serviceDict, regionDict, list); + stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list); }else if (regionDict.getFunctionId().equals(403)) { BlockingQueue list = ei.getDataList(AppDomainTemplate.class ); - stringCfgs=this.checkStringCfgMulity(serviceDict, regionDict, list); + stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list); }else if (regionDict.getFunctionId().equals(201)){// Domain Intercept if(serviceDict.getAction().equals(1)){// 监测 BlockingQueue list = ei.getDataList(DomainInterceptMonitTemplate.class); - stringCfgs=this.checkStringCfgMulity(serviceDict, regionDict, list); + stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list); }else if(serviceDict.getAction().equals(64)){// 限速 BlockingQueue list = ei.getDataList(DomainInterceptRateLimitTemplate.class); - stringCfgs=this.checkStringCfgMulity(serviceDict, regionDict, list); + stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list); }else{// 白名单 BlockingQueue list = ei.getDataList(DomainInterceptTemplate.class); - stringCfgs=this.checkStringCfgMulity(serviceDict, regionDict, list); + stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list); } }else { BlockingQueue list = ei.getDataList(StringAllTemplate.class ); - stringCfgs=this.checkStringCfgMulity(serviceDict, regionDict, list); + stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list); } } else if (regionDict.getRegionType().equals(3)) {// 增强字符串类 if (regionDict.getFunctionId().equals(7)&&serviceDict!=null&&serviceDict.getAction().intValue()==16) { BlockingQueue list = ei.getDataList(DnsComplexStringTemplate.class ); - complexkeywordCfgs = this.checkComplexStringCfgMulity(serviceDict, regionDict, list); + complexkeywordCfgs = this.checkComplexStringCfgMulity(errTip,serviceDict, regionDict, list); } else { BlockingQueue list = ei.getDataList(ComplexStringAllTemplate.class ); - complexkeywordCfgs = this.checkComplexStringCfgMulity(serviceDict, regionDict, list); + complexkeywordCfgs = this.checkComplexStringCfgMulity(errTip,serviceDict, regionDict, list); } }else if (regionDict.getRegionType().equals(6)) {// 回调类 if (regionDict.getFunctionId().equals(400)) { BlockingQueue list = ei.getDataList(DnsResStrategyTemplate.class ); - dnsResStrategies=this.checkDnsResStrategyCfgMulity(serviceDict, regionDict, list); + dnsResStrategies=this.checkDnsResStrategyCfgMulity(errTip,serviceDict, regionDict, list); } } //删除文件 @@ -1868,7 +1874,9 @@ public class BaseController { } } } - + if(errTip.toString().length()>0) { + addMessage(redirectAttributes,"error", errTip.toString()); + } } catch (Exception e) { if(ei!=null) { if(ei.getUploadFile().exists()) { @@ -1907,7 +1915,7 @@ public class BaseController { } else if (regionDict.getFunctionId().equals(7)&&serviceDict!=null&&serviceDict.getAction().intValue()==16) { ei.loadInitParams(DnsIpTemplate.class, msgProp, regionDict, serviceDict); }else if(regionDict.getFunctionId().equals(401)) { - ei.loadInitParams(DnsIpTemplate.class, msgProp, regionDict, serviceDict); + ei.loadInitParams(DnsFakeIpTemplate.class, msgProp, regionDict, serviceDict); }else if (regionDict.getFunctionId().equals(212)) { ei.loadInitParams(IpPayloadTemplate.class, msgProp, regionDict, serviceDict); } else if (regionDict.getFunctionId().equals(510) diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 6524cb3ae..4cd4a0465 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -34,6 +34,7 @@ import com.nis.domain.configuration.template.AsnIpTemplate; import com.nis.domain.configuration.template.ComplexStringAllTemplate; import com.nis.domain.configuration.template.DdosIpTemplate; import com.nis.domain.configuration.template.DnsComplexStringTemplate; +import com.nis.domain.configuration.template.DnsFakeIpTemplate; import com.nis.domain.configuration.template.DnsIpTemplate; import com.nis.domain.configuration.template.DnsResStrategyTemplate; import com.nis.domain.configuration.template.IpAllTemplate; @@ -315,8 +316,8 @@ public class IpController extends BaseController{ excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(7)||regionDict.getFunctionId().equals(401)){ //Dns IP，DNS FAKE IP - List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DnsIpTemplate.class, 2); + List classList=new ArrayList(); + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DnsFakeIpTemplate.class, 2); excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())){ //P2p IP