diff --git a/src/main/java/com/nis/domain/configuration/IpCfgTemplate.java b/src/main/java/com/nis/domain/configuration/IpCfgTemplate.java index 38b8cbbb7..b3731fa9d 100644 --- a/src/main/java/com/nis/domain/configuration/IpCfgTemplate.java +++ b/src/main/java/com/nis/domain/configuration/IpCfgTemplate.java @@ -8,12 +8,6 @@ */ package com.nis.domain.configuration; -import java.util.Date; - -import org.apache.commons.lang3.StringEscapeUtils; - -import com.google.gson.annotations.Expose; -import com.google.gson.annotations.SerializedName; import com.nis.util.excel.ExcelField; /** diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 0ea4d30ad..83aeeb2d2 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -69,6 +69,7 @@ import com.nis.web.service.configuration.ControlPolicyService; import com.nis.web.service.configuration.DdosCfgService; import com.nis.web.service.configuration.DnsIpCfgService; import com.nis.web.service.configuration.DnsResStrategyService; +import com.nis.web.service.configuration.DomainService; import com.nis.web.service.configuration.FileTransferCfgService; import com.nis.web.service.configuration.HttpRedirectCfgService; import com.nis.web.service.configuration.IpCfgService; @@ -76,7 +77,6 @@ import com.nis.web.service.configuration.IpMultiplexPoolCfgService; import com.nis.web.service.configuration.MailCfgService; import com.nis.web.service.configuration.NumCfgService; import com.nis.web.service.configuration.RequestInfoService; -import com.nis.web.service.configuration.DomainService; import com.nis.web.service.configuration.WebsiteCfgService; import com.nis.web.service.configuration.XmppCfgService; import com.nis.web.service.specific.SpecificServiceCfgService; @@ -544,6 +544,7 @@ public class BaseController { List ipPatternList = DictUtils.getDictList("IP_PATTERN"); List portPatternList = DictUtils.getDictList("PORT_PATTERN"); List directionList = DictUtils.getDictList("DIRECTION"); + List protocolList = DictUtils.getDictList("PROTOCOL"); StringBuffer msg=new StringBuffer(); int line=1; for(IpCfgTemplate value:list){ @@ -659,6 +660,17 @@ public class BaseController { Integer protocol= value.getProtocol(); if(protocol==null){ errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("protocol"))+";"); + }else{ + boolean has=false; + for(SysDataDictionaryItem protocolItem:protocolList){ + if(Integer.parseInt(protocolItem.getItemCode())==protocol.intValue()){ + has=true; + break; + } + } + if(!has){ + errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("protocol"))+";"); + } } //protocol check end // requestId check start diff --git a/src/main/java/com/nis/web/controller/configuration/CommonController.java b/src/main/java/com/nis/web/controller/configuration/CommonController.java index e61304bfc..0e5190a47 100644 --- a/src/main/java/com/nis/web/controller/configuration/CommonController.java +++ b/src/main/java/com/nis/web/controller/configuration/CommonController.java @@ -11,7 +11,6 @@ package com.nis.web.controller.configuration; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Properties; @@ -20,16 +19,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.datanucleus.store.types.wrappers.backed.Set; import org.springframework.beans.BeanUtils; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; -import com.nis.domain.SysUser; import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.HttpUrlCfg; @@ -251,7 +246,7 @@ public class CommonController extends BaseController { } //ip配置导出 public void _exportIp(Model model,HttpServletRequest request,HttpServletResponse response, - @ModelAttribute("cfg")IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){ + IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){ try { //获取国际化配置 Properties msgProp = getMsgProp(); diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 3312711a4..4aedde496 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -4,12 +4,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Properties; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import org.jets3t.service.ServiceException; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,7 +16,6 @@ import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.callback.InlineIp; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.IpCfgTemplate; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.maat.MaatCfg; import com.nis.domain.maat.MaatCfg.DigestCfg;