(1)IP payload模板修改

(2)IP导入方法加入参数path,functionId
(3)IP payload导入提交

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;
 	}
 }

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<IpPayloadTemplate> list = ei.getDataList(IpPayloadTemplate.class);
+						ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
+					}
 				} else if (regionDict.getRegionType().equals(1)) {
 					List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class);
 					ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);

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)
+		@RequestMapping(value = "import", method=RequestMethod.POST)
-	public String importIp(RedirectAttributes redirectAttributes,
+		public String importIp(RedirectAttributes redirectAttributes,
-			@RequestParam("files") MultipartFile[] files
+				@RequestParam("files") MultipartFile[] files
-			,Integer serviceDictId
+				,Integer serviceDictId
-			,Integer requestId
+				,Integer requestId
-			,String regionDictIds) {
+				,String regionDictIds,String importPath,Integer functionId) {
-			this._import(redirectAttributes, files,serviceDictId,regionDictIds,requestId);
+				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;
+			}
 			
-		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+5;
+		}
-	}
 	//ip配置导出
 		@RequestMapping(value = "exportIpAddr")
 		public void exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,

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 

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -6,7 +6,7 @@ $(function(){
 });
 </script>
 <div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
-	<form id="importForm1" action="${ctx}/ntc/iplist/import" method="post" enctype="multipart/form-data" class="form-horizontal"
+	<form id="importForm1" action="${ctx}/ntc/iplist/import?functionId=${functionId}&importPath=${importPath}" method="post" enctype="multipart/form-data" class="form-horizontal"
 		onsubmit="loading('<spring:message code='loading'/>');">
 		
 		<div class="modal-dialog" role="document" style="width:700px;">

src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp

@@ -99,6 +99,11 @@
 				onClick="javascript:window.location='${ctx}/proxy/intercept/intercept${interceptType}Form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
+		<c:if test="${cfg.functionId eq 212}">
+		<button type="button" class="btn btn-primary import" >
+				<i class="fa fa-plus"></i>
+			<spring:message code="import"></spring:message></button>
+		</c:if>
 		</customTag:hasAnyPermissions>
 	</div>
 
@@ -531,6 +536,9 @@
 				</div>
 			</div>
 </div>
-
+<c:set var="importPath" value="/proxy/intercept/${fn:toLowerCase(interceptType)}/list"/>
+<c:set var="functionId" value="${cfg.functionId}"/>
+<!-- 模板导入，start -->
+	 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>
 </body>
 </html>

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -471,6 +471,7 @@
 				</div>
 			</div>
 </div>
+	<c:set var="functionId" value="${cfg.functionId}"/>
 	<!-- 模板导入，start -->
 	 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>
 </body>