From 57a490b1cc91fda57440fff251b54ced7e1d5d0e Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Tue, 15 Jan 2019 17:48:35 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E4=BF=AE=E5=A4=8DIP=20Payload=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5Search=20In=E5=AD=97=E6=AE=B5=E7=9E=8E=E5=A1=AB?=
 =?UTF-8?q?=E4=B8=8D=E9=AA=8C=E8=AF=81=E7=9A=84bug,=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=B8=8B=E5=8F=91=E5=8A=A0=E5=85=A5userregio?=
 =?UTF-8?q?n=E7=9A=84=E5=A4=84=E7=90=86=20(2)=E7=95=8C=E9=9D=A2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=B6=E7=9A=84alert=E6=B3=A8=E9=87=8A=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/util/excel/thread/CheckIpFormatThread.java |  2 +-
 src/main/java/com/nis/web/service/BaseService.java | 14 ++++++++++++++
 src/main/webapp/WEB-INF/tags/sys/delRow.tag        |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

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 83def261f..cdb9637c4 100644
--- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
+++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
@@ -173,7 +173,7 @@ public class CheckIpFormatThread implements Callable<String>{
 				String userRegion1 = baseIpCfg.getUserRegion1();
 				if (StringUtils.isNotBlank(userRegion1)) {
 					Object val = DictUtils.getDictLabel("INTERCEPT_REPLACE_ZONE", userRegion1);
-					if (StringUtils.isBlank(val.toString())) {
+					if (StringUtils.isBlank(val.toString())||"默认".equals(val.toString())) {
 						errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("replace_zone"))
 								+ ";");
 					}
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 3967913b6..c5578c7eb 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -2491,6 +2491,20 @@ public abstract class BaseService {
 								}else if(regionDict.getFunctionId()==214) {
 									String userRegion="nat_type="+_cfg.getUserRegion1()+";spoofing_ip_pool="+_cfg.getUserRegion3();
 									maatCfg.setUserRegion(userRegion);
+								}else if(regionDict.getFunctionId()==212) {
+									String userRegion=Constants.REPLACE_ZONE_KEY+"="+_cfg.getUserRegion1();
+									String substitute="";
+									String userRegion2=StringUtil.isEmpty(_cfg.getUserRegion2()) ? "":_cfg.getUserRegion2();
+									substitute="/";
+									userRegion2 = BaseService.replaceContentEscape(userRegion2);
+									substitute=substitute+userRegion2;
+									
+									String userRegion3=StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3();
+									userRegion3 = BaseService.replaceContentEscape(userRegion3);
+									substitute=substitute+"/"+userRegion3;
+									
+									userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
+									maatCfg.setUserRegion(userRegion);
 								}
 								
 			                	configCompileList.add(maatCfg);
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 61cc4ca24..e7d8d79f2 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -382,7 +382,7 @@ function cancelPassOpt(url){
 	function validateIsDelete(checkboxes){
 		var flag = false;
 		$(checkboxes).filter(":checked").each(function(){
-			alert($(this).val());
+			//alert($(this).val());
 			if($(this).val()!=0 && $(this).val()!=3){//状态为3的配置为取消审核的配置，可删除
 				flag = true;
 				return;