From b9119e0f5f47ade00eb451eb78660698fa0fc041 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Tue, 30 Oct 2018 14:52:52 +0800
Subject: [PATCH] =?UTF-8?q?IP=E5=A4=8D=E7=94=A8=E7=AD=96=E7=95=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/sql/20181030/create_table_group_area_info.sql    | 0
 .../views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp     | 3 +++
 .../views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp     | 3 +++
 .../jquery-validation/1.11.0/localization/messages_ru.js       | 3 ++-
 4 files changed, 8 insertions(+), 1 deletion(-)
 rename sqlupdate/group_area_info.sql => src/main/resources/sql/20181030/create_table_group_area_info.sql (100%)

diff --git a/sqlupdate/group_area_info.sql b/src/main/resources/sql/20181030/create_table_group_area_info.sql
similarity index 100%
rename from sqlupdate/group_area_info.sql
rename to src/main/resources/sql/20181030/create_table_group_area_info.sql
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
index 015828481..18afee4b8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
@@ -11,6 +11,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.destIpAddress}"){
+			$("#intype").val("${cfg.destIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -88,6 +90,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="destIpAddress"><spring:message code="server_ip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
index 51caf9951..a99fa76fe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
@@ -11,6 +11,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.srcIpAddress}"){
+			$("#intype").val("${cfg.srcIpAddress}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -88,6 +90,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
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 f00c76e82..d3ac9c9ad 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
@@ -76,6 +76,7 @@
 		protocolPort:"TCP protocol or UDP protocol must be chosen when port is greater than 0",
 		protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0",
 		netAddress:"C类IP地址网络位必须相同",
-		ipUnique:"IP already exists."
+		ipUnique:"IP already exists.",
+		asnNoUnique:"ASN already exists."
 	});
 }(jQuery));