From e19b168af915f7d07d114fa389d5c3d5e26192d9 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Mon, 10 Dec 2018 19:02:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9C=B0=E5=9D=80=E6=B1=A0IP?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/ipMultiplexPool/snatform2.jsp |  4 ++--
 .../1.11.0/jquery.validate.method.js          | 20 +++++++++++++++++++
 .../1.11.0/localization/messages_en.js        |  3 ++-
 .../1.11.0/localization/messages_ru.js        |  3 ++-
 .../1.11.0/localization/messages_zh.js        |  3 ++-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
index 74a0f7ea4..10e37a4bb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
@@ -246,7 +246,7 @@ var resetIndex = function(){
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
 									            <div class="col-md-6">
-									            	<input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress">
+									            	<input class="form-control required ipCheck ipMaskSole" type="text" name="ipCfgs[0].srcIpAddress" >
 										        </div>
 												<div for="ipCfgs[0].srcIpAddress"></div>
 											</div>
@@ -393,7 +393,7 @@ var resetIndex = function(){
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
 									            <div class="col-md-6">
-									            	<input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress" value="${ipCfg.srcIpAddress }">
+									            	<input class="form-control required ipCheck ipMaskSole" type="text" name="ipCfgs[0].srcIpAddress" value="${ipCfg.srcIpAddress }" >
 										        </div>
 												<div for="ipCfgs[0].srcIpAddress"></div>
 											</div>
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
index e46ce9b8e..34fd6d5a3 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
@@ -974,4 +974,24 @@ jQuery.validator.addMethod("areaUnique",function(value,element) {
 		flag = false;
 	}
 	return flag;
+});
+
+// 地址池IP+MASK不可重复校验
+jQuery.validator.addMethod("ipMaskSole",function(value,element) {
+	var flag = true;
+	var ipArray = [];
+	if(value.indexOf("/") == -1){
+		value = value+"/32";
+	}
+	$(".ipMaskSole").not(element).each(function(){
+		var val = $(this).val();
+		if(val.indexOf("/") == -1){
+			val = val+"/32";
+		}
+		ipArray.push(val);
+	});
+	if($.inArray(value,ipArray) != -1){
+		flag = false;
+	}
+	return flag;
 });
\ No newline at end of file
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
index 9f863e35b..ec1e2aa62 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -79,6 +79,7 @@
 		addrPoolUnique:"Address Pool already exists.",
 		asnNoUnique:"ASN already exists.",
 		areaUnique:"Area already exists.",
-		config_sync_tip:"The system is being maintained and temporarily inaccessible."
+		config_sync_tip:"The system is being maintained and temporarily inaccessible.",
+		ipMaskSole:"IP already exists."
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
index 66abd1b02..d1b327eac 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
@@ -79,6 +79,7 @@
 		addrPoolUnique:"Address Pool уже существует.",
 		asnNoUnique:"ASN уже существует.",
 		areaUnique:"Регион уже существует.",
-		config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна."
+		config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна.",
+		ipMaskSole:"IP уже существует."
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
index b074395cc..ab62f520d 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -79,6 +79,7 @@
 		addrPoolUnique:"地址池已存在",
 		asnNoUnique:"ASN号已存在",
 		areaUnique:"该区域已存在",
-		config_sync_tip:"系统正在维护中，暂时不可访问！"
+		config_sync_tip:"系统正在维护中，暂时不可访问！",
+		ipMaskSole:"IP已存在"
 	});
 }(jQuery));