From bd1e9b5fb9464c6825fe30cd50af572cbc838748 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 19 Oct 2018 15:28:17 +0800 Subject: [PATCH] =?UTF-8?q?(1)IP=20payload=E6=A8=A1=E6=9D=BF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20(2)IP=E5=AF=BC=E5=85=A5=E6=96=B9=E6=B3=95=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=95=B0path,functionId=20(3)IP=20payload?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/IpPayloadTemplate.java | 4 +-- .../nis/web/controller/BaseController.java | 35 +++++++++++++++++-- .../configuration/ntc/IpController.java | 24 +++++++------ .../resources/messages/message_en.properties | 2 +- .../WEB-INF/include/excel/importModal.jsp | 2 +- .../views/cfg/intercept/interceptList.jsp | 10 +++++- .../WEB-INF/views/cfg/ipaddr/ipList.jsp | 1 + 7 files changed, 60 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/template/IpPayloadTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpPayloadTemplate.java index a9342e762..08f028394 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpPayloadTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpPayloadTemplate.java @@ -23,14 +23,14 @@ public class IpPayloadTemplate extends IpAllTemplate { public String getUserRegion2() { return userRegion2; } - public void setUserRegion2(String userRegion1) { + public void setUserRegion2(String userRegion2) { this.userRegion2 = userRegion2; } @ExcelField(title="replace_content",align=2,sort=4) public String getUserRegion3() { return userRegion3; } - public void setUserRegion3(String userRegion1) { + public void setUserRegion3(String userRegion3) { this.userRegion3 = userRegion3; } } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index daa8bb747..cc91baf74 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -50,6 +50,7 @@ import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.StringCfgTemplate; import com.nis.domain.configuration.template.IpAllTemplate; import com.nis.domain.configuration.template.IpCfgTemplate; +import com.nis.domain.configuration.template.IpPayloadTemplate; import com.nis.domain.configuration.template.IpRateLimitTemplate; import com.nis.domain.log.BaseLogEntity; import com.nis.domain.log.SearchReport; @@ -832,14 +833,37 @@ public class BaseController { try { Double ratelimt= Double.parseDouble(userRegion1); if(ratelimt>0.009||ratelimt<0.001) { - errInfo.append(prop.getProperty("ratelimit")+"."+String.format(prop.getProperty("must_between"),0.001,0.009)); + errInfo.append(prop.getProperty("ratelimit")+"."+String.format(prop.getProperty("must_between"),0.001,0.009)+";"); } } catch (Exception e) { // TODO: handle exception - errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty("ratelimit"))); + errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty("ratelimit"))+";"); + } + } + //payload ip + if(regionDict.getFunctionId().equals(212)) { + //replace_zone + String userRegion1=baseIpCfg.getUserRegion1(); + if(StringUtils.isNotBlank(userRegion1)) { + Object val = DictUtils.getDictLabel("INTERCEPT_REPLACE_ZONE", userRegion1); + if(StringUtils.isBlank(val.toString())) { + errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("replace_zone"))+";"); + } + }else { + errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("replace_zone"))+";"); + } + + //replaced_content + String userRegion2=baseIpCfg.getUserRegion2(); + if(StringUtils.isBlank(userRegion2)) { + errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("replaced_content"))+";"); + } + //replace_content + String userRegion3=baseIpCfg.getUserRegion3(); + if(StringUtils.isBlank(userRegion2)) { + errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("replace_content"))+";"); } } - if (regionDict.getRegionType().equals(1)) { // 校验必填的IP，端口 for (String code : configIpPortShow.split(",")) { @@ -2430,6 +2454,11 @@ public class BaseController { ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list); } } + }else if(regionDict.getFunctionId().equals(212)) { + if (regionDict.getRegionType().equals(1)) { + List list = ei.getDataList(IpPayloadTemplate.class); + ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list); + } } else if (regionDict.getRegionType().equals(1)) { List list = ei.getDataList(IpAllTemplate.class); ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list); 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 521e38303..b6fdd57a3 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 @@ -288,16 +288,20 @@ public class IpController extends BaseController{ } //ip配置导入 - @RequestMapping(value = "import", method=RequestMethod.POST) - public String importIp(RedirectAttributes redirectAttributes, - @RequestParam("files") MultipartFile[] files - ,Integer serviceDictId - ,Integer requestId - ,String regionDictIds) { - this._import(redirectAttributes, files,serviceDictId,regionDictIds,requestId); - - return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+5; - } + @RequestMapping(value = "import", method=RequestMethod.POST) + public String importIp(RedirectAttributes redirectAttributes, + @RequestParam("files") MultipartFile[] files + ,Integer serviceDictId + ,Integer requestId + ,String regionDictIds,String importPath,Integer functionId) { + this._import(redirectAttributes, files,serviceDictId,regionDictIds,requestId); + if(StringUtils.isNotBlank(importPath)) { + return "redirect:" + adminPath +importPath+"?functionId="+functionId; + }else { + return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+functionId; + } + + } //ip配置导出 @RequestMapping(value = "exportIpAddr") public void exportIp(Model model,HttpServletRequest request,HttpServletResponse response, diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 966ed1d0e..baf7b777b 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -780,7 +780,7 @@ intra=Inbound #=============about Maintenance========= #=============some validation=========== line=line %s -can_not_null=%sCan't be empty +can_not_null=%s can't be empty is_incorrect=%s value is incorrect are_the_same=%s and %s can't be equal is_in_wrong_format=%s formatting error diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp index c1250720e..7aaf22b2c 100644 --- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp +++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp @@ -6,7 +6,7 @@ $(function(){ }); - + + + + <%@include file="/WEB-INF/include/excel/importModal.jsp" %> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index 49dab435d..9cf31c821 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -471,6 +471,7 @@ + <%@include file="/WEB-INF/include/excel/importModal.jsp" %>