diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 496e6fe02..1f0324f83 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -58,6 +58,8 @@ public class IpController extends CommonController{ model.addAttribute("requiresPermissionPrefix","iplist"); if(specialFunctionId!=null && "ipsec".equals(specialFunctionId)) { return "/cfg/ipsec/ipForm"; + }else if(specialFunctionId!=null && "ipaddr".equals(specialFunctionId)) { + return "/cfg/ipaddr/ipForm"; } return "/cfg/common/ipForm"; } diff --git a/src/main/resources/sql/update_ip_addr.sql b/src/main/resources/sql/update_ip_addr.sql new file mode 100644 index 000000000..89a8f2ce9 --- /dev/null +++ b/src/main/resources/sql/update_ip_addr.sql @@ -0,0 +1,2 @@ +INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES (5,'ipaddr','ip地址',0,1,1,66) +INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES (1,'ICMP','ICMP',0,1,1,63) \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index f9b04ac79..799bdcbd2 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -31,9 +31,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+ + + +
+
+
+
+ +
+ + + + + + + <%@include file="/WEB-INF/include/form/ipInfo.jsp" %> + <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp index f836fe2bb..2bf21ec88 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%> -<spring:message code="domain_control_white"></spring:message> +<spring:message code="domain_whitelist"></spring:message>