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"," "+$("#seltype").find("option:selected").text());
}
@@ -88,6 +90,7 @@
+
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"," "+$("#seltype").find("option:selected").text());
}
@@ -88,6 +90,7 @@
+
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));