From b6276cdc8c746546f17b3fc5e3e37bcc907d5dcb Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 15 Oct 2018 15:26:43 +0800 Subject: [PATCH] =?UTF-8?q?(1)ipsec=E5=8D=8F=E8=AE=AE=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?(2)ipv6=E6=8E=A9=E7=A0=81=E8=8C=83=E5=9B=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20(3)=E5=85=A8=E9=83=A8=E5=8D=8F=E8=AE=AE=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 4 ++ .../configuration/ntc/IpController.java | 7 --- .../nis/web/dao/configuration/IpCfgDao.xml | 3 +- .../service/configuration/IpCfgService.java | 57 +++++++++++++------ .../resources/messages/message_en.properties | 3 +- .../resources/messages/message_ru.properties | 3 +- .../messages/message_zh_CN.properties | 3 +- src/main/resources/nis.properties | 11 ++-- .../webapp/WEB-INF/views/cfg/ipCfgForm.jsp | 14 +++++ .../WEB-INF/views/cfg/ipaddr/ipForm.jsp | 25 +++++++- .../1.11.0/jquery.validate.method.js | 15 ++--- .../1.11.0/localization/messages_en.js | 4 +- .../1.11.0/localization/messages_ru.js | 4 +- .../1.11.0/localization/messages_zh.js | 4 +- 14 files changed, 107 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 1a1d4b268..c3398ce44 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -7,6 +7,10 @@ import java.util.Map; import com.google.gson.GsonBuilder; public final class Constants { + /** + * IPSEC协议 + */ + public static Integer IPSEC_PROTOCOL=Configurations.getIntProperty("ipsec_protocol", 8); public static final String GROUP_REUSE_SOURCES=Configurations.getStringProperty("groupReuseSources","groupReuseSources"); public static Integer APP_SPEC_SERVICE_CODE_MIN_VAL=Configurations.getIntProperty("app_spec_service_code_min_val", 300001); public static Integer APP_SPEC_SERVICE_CODE_MAX_VAL=Configurations.getIntProperty("app_spec_service_code_max_val", 268435455); 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 f7809f529..a527bc3f8 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 @@ -24,24 +24,17 @@ import com.nis.domain.FunctionRegionDict; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.SysDataDictionaryItem; -import com.nis.domain.basics.PolicyGroupInfo; -import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; -import com.nis.domain.configuration.template.IpAddrTemplate; import com.nis.domain.configuration.template.IpAllTemplate; -import com.nis.domain.configuration.template.IpsecTemplate; -import com.nis.domain.configuration.template.TunnelIpTemplate; import com.nis.domain.specific.ConfigGroupInfo; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; import com.nis.util.StringUtil; -import com.nis.util.excel.ExcelField; import com.nis.util.excel.ExportExcel; import com.nis.web.controller.BaseController; -import com.nis.web.controller.configuration.CommonController; import com.nis.web.security.UserUtils; /** diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 1afd83ab4..6e4d05aa8 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -205,7 +205,8 @@ ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable - ,a.area_effective_ids,a.function_id,a.cfg_region_code + ,a.area_effective_ids,a.function_id,a.cfg_region_code,a.user_region1,a.user_region2, + a.user_region3,a.user_region4,a.user_region5 + + + + + + +
+ +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index 60fa48ed1..e18f689c8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -32,7 +32,12 @@ }else{ hideAction(1,asnRegionCode); } - + $("[name$='protocol']").each(function(){ + showHideIPSECProtocol($(this)); + }); + $("[name$='protocol']").on("change",function(){ + showHideIPSECProtocol($(this)); + }); if(isAsn==0){ $("[class~='glyphicon-plus'][class~='ipPortList']").click(); $("[class~='boxSolid'][class~='asn']").find(".glyphicon-remove").click(); @@ -108,6 +113,7 @@ changeIPVal(tabInfo); } processAction(isAsn,tabInfo); + $("[name$='protocol']").change(); /* if(tabInfo){ tabInfo.find("[name$='cfgType']").val(cfgType); tabInfo.find("[name$='cfgRegionCode']").val(cfgRegionCode); @@ -372,6 +378,23 @@ var processAction=function(configType,obj){ } } +var showHideIPSECProtocol=function(obj){ + var name=$(obj).attr("name"); + var userRegion1=$("select[name='"+name.replace("protocol","userRegion1")+"']"); + if($(obj).val()==8){ + if(userRegion1){ + userRegion1.removeAttr("disabled"); + userRegion1.parents(".ipsecProtocol").removeClass("hidden"); + userRegion1.selectpicker("refresh"); + } + }else{ + if(userRegion1){ + userRegion1.attr("disabled","disabled"); + userRegion1.parents(".ipsecProtocol").addClass("hidden"); + userRegion1.selectpicker("refresh"); + } + } +} 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 fb95cefa0..8b41e8b02 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 @@ -237,8 +237,8 @@ jQuery.validator.addMethod("protocolPort",function(value, element) { var protocolElement=$("[name='"+name.replace("destPort","protocol")+"']"); protocolVal=protocolElement.val(); } - if((protocolVal==0&&srcPortVal>0)||(protocolVal==0&&destPortVal>0)){ - $.validator.messages.protocolPort=$.validator.messages.protocolPort; + if(protocolVal==0){ + return true; }else if((protocolVal!=tcp&&protocolVal!=udp&&srcPortVal>0)||(protocolVal!=tcp&&protocolVal!=udp&&destPortVal>0)){ $.validator.messages.protocolPort=$.validator.messages.protocolPort1; return false; @@ -250,7 +250,7 @@ jQuery.validator.addMethod("protocolPort",function(value, element) { //ip地址校验 jQuery.validator.addMethod("ipCheck",function(value, element) { var ipv4_ip_subnet_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\/(3[0-2]|1[6-9]|2[0-9])$/; - var ipv6_ip_subnet_regexp=/^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\/(128)$/; + var ipv6_ip_subnet_regexp=/^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\/([2-9]|[1-9][0-9]|1[0-2][0-8])$/; var ipv4_ip_range_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)-(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/; var ipv6_ip_range_regexp= /^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))\-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])(\.(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])){3}))$/; var ipv4_ip_regexp=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/; @@ -370,7 +370,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { $.validator.messages.ipCheck=$.validator.messages.ipPart; return false; //}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ - }else if(!/^(128)$/.test(ipMaskArr[1])){ + }else if(!/^([2-9]|[1-9][0-9]|1[0-2][0-8])$/.test(ipMaskArr[1])){ $.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart; return false; } else{ @@ -410,7 +410,6 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { }else if(typeInt==46){ var name=$(element).attr("name"); if(name.indexOf("srcIpAddress")>-1){ - console.log("client ip must ipv4"); if(ipPattern==1){//ip/掩码格式 if(this.optional(element)||(/^(\d+)\.(\d+)\.(\d+)\.(\d+)\/(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256 && RegExp.$5<=32))){ if(ipv4_ip_subnet_regexp.test(value)){ @@ -468,7 +467,6 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { } } }else if(name.indexOf("destIpAddress")>-1){ - console.log("server ip must ipv6"); if(ipPattern==1){//ip/掩码格式 if(this.optional(element)||ipv6_ip_subnet_regexp.test(value)){ return true; @@ -485,7 +483,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { $.validator.messages.ipCheck=$.validator.messages.ipPart; return false; //}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ - }else if(!/^(128)$/.test(ipMaskArr[1])){ + }else if(!/^([2-9]|[1-9][0-9]|1[0-2][0-8])$/.test(ipMaskArr[1])){ $.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart; return false; } else{ @@ -526,7 +524,6 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { }else if(typeInt==64){ var name=$(element).attr("name"); if(name.indexOf("srcIpAddress")>-1){ - console.log("client ip must ipv6"); if(ipPattern==1){//ip/掩码格式 if(this.optional(element)||ipv6_ip_subnet_regexp.test(value)){ return true; @@ -543,7 +540,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) { $.validator.messages.ipCheck=$.validator.messages.ipPart; return false; //}else if(!/^(0|2|4|8|16|32|64|128)$/.test(ipMaskArr[1])){ - }else if(!/^(128)$/.test(ipMaskArr[1])){ + }else if(!/^([2-9]|[1-9][0-9]|1[0-2][0-8])$/.test(ipMaskArr[1])){ $.validator.messages.ipCheck=$.validator.messages.ipv6MaskPart; return false; } else{ 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 47a04a579..1d2d73cbe 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 @@ -27,7 +27,7 @@ ipMask:"Please enter a correct IP/mask", ipPart:"Invalid IP part", //ipv6MaskPart:"Mask must be exponent of 2,not greater than 128", - ipv6MaskPart:"Mask must be 128", + ipv6MaskPart:"Mask must between 2 and 128", //ipMaskRange:"IP mask must between 0 and 32", ipMaskRange:"IP mask must between 16 and 32", srcIpNotEqDestIp:"Client IP ", @@ -74,6 +74,6 @@ log_1_hour:"Log For The Last Hour", input:"Please Enter ", 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" + protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit" }); }(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 76fc2ca1b..6e19e84c4 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 @@ -27,7 +27,7 @@ ipMask:"Введите правильный IP/маску", ipPart:"Недопустимая часть IP", //ipv6MaskPart:"Mаска-показатель степени 2, небольше 128", - ipv6MaskPart:"掩码必须为128", + ipv6MaskPart:"掩码介于2到128", //ipMaskRange:"Маска IP между 0 и 32", ipMaskRange:"Маска IP должна между 16 и 32", srcIpNotEqDestIp:"IP Источник", @@ -74,6 +74,6 @@ log_1_hour:"Log For The Last Hour", input:"Please Enter ", 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" + protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit" }); }(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 9690dd0ea..8503cfb73 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 @@ -27,7 +27,7 @@ ipMask:"请填写正确的IP地址/掩码", ipPart:"IP部分格式错误", //ipv6MaskPart:"掩码为不大于128的2的指数幂", - ipv6MaskPart:"掩码必须为128", + ipv6MaskPart:"掩码介于2到128", //ipMaskRange:"IP掩码介于0到32", ipMaskRange:"IP掩码介于16到32", srcIpNotEqDestIp:"源IP ", @@ -74,6 +74,6 @@ log_1_hour:"1小时日志量", input:"请输入 ", protocolPort:"端口大于0时必须选择TCP协议或者UDP协议", - protocolPort1:"只有tcp,udp协议端口号可以不为0" + protocolPort1:"只有tcp,udp协议端口号可以不为0,全部协议无限制" }); }(jQuery));