From 5801922c786fdf158ed361ae4d9ccee3674bab42 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 15 Aug 2018 11:32:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89desc=E7=9A=84=E5=BF=85?= =?UTF-8?q?=E9=80=89*=E5=8F=B7=EF=BC=8C=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B3=A8=E9=87=8A=E6=8E=89=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/specific/specificServiceCfgForm.jsp | 8 ++++---- .../WEB-INF/views/specific/specificServiceCfgList.jsp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index ebc05f44a..3e1a62386 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -94,7 +94,7 @@ }); $(".protocol_code").html('*:'); $(".protocol_name").html('*:'); - $(".protocol_desc").html('*:'); + $(".protocol_desc").html(':'); }else{ $(".cfgType").each(function(){ if($(this).attr("cfgType")!=$("[name='cfgType']").val()){ @@ -109,15 +109,15 @@ if($("[name='cfgType']").val()==1){ $(".protocol_code").html('*:'); $(".protocol_name").html('*:'); - $(".protocol_desc").html('*:'); + $(".protocol_desc").html(':'); }else if($("[name='cfgType']").val()==2){ $(".protocol_code").html('*:'); $(".protocol_name").html('*:'); - $(".protocol_desc").html('*:'); + $(".protocol_desc").html(':'); }else{ $(".protocol_code").html('*:'); $(".protocol_name").html('*:'); - $(".protocol_desc").html('*:'); + $(".protocol_desc").html(':'); } } $(".tabs-left li").on("click",function(){ diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp index ca7a1f5c4..304fc1bef 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp @@ -272,7 +272,7 @@ <%-- ${specificServiceCfg.showSequence} --%> - ${specificServiceCfg.specServiceCode} + <%----%>${specificServiceCfg.specServiceCode}<%----%> ${specificServiceCfg.specServiceName} ${fns:abbr(specificServiceCfg.specServiceDesc,15)} <%-- ${specificServiceCfg.groupId } --%> From e2a649339adaa2aff2fb011c36b97e07cb9f0ee8 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 15 Aug 2018 11:45:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2tab=E5=88=87=E6=8D=A2=E6=97=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89desc=E7=9A=84=E5=BF=85=E9=80=89*=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/specific/specificServiceCfgForm.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index 3e1a62386..2ba5b7ab6 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -136,15 +136,15 @@ if(cfgType==1){ $(".protocol_code").html('*:'); $(".protocol_name").html('*:'); - $(".protocol_desc").html('*:'); + $(".protocol_desc").html(':'); }else if(cfgType==2){ $(".protocol_code").html('*:'); $(".protocol_name").html('*:'); - $(".protocol_desc").html('*:'); + $(".protocol_desc").html(':'); }else{ $(".protocol_code").html('*:'); $(".protocol_name").html('*:'); - $(".protocol_desc").html('*:'); + $(".protocol_desc").html(':'); } }); }); From c9278253e293a532a03bf4e3bd772179eabb45c0 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 15 Aug 2018 14:54:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Jquery-validation=20=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87=E4=BB=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=8E=E8=8B=B1=E6=96=87=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8E=BB=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E5=9B=BD=E9=99=85=E5=8C=96=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.11.0/localization/messages_zh.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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 c68b5da79..1722722cf 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,18 +27,17 @@ ipMask:"请填写正确的IP地址/掩码", ipPart:"IP部分格式错误", ipv6MaskPart:"掩码为不大于128的2的指数幂", - portCheck:"请填写正确的端口", - notStartZero:"请填写正确的数值", - ipMaskRange:"掩码范围0到32", - srcIpNotEqDestIp:"源IP和目的IP不能相同", - ipRange:"IP范围格式错误或者起始IP与结束IP不在同一网段", - ipRange1:"起始IP值应小于结束IP值", - portRange:"端口应小于65536，非0数字不能以0开头", - srcIpIsNotValue:"源IP不能为 ", - destIpIsNotValue:"目的IP不能为", + ipMaskRange:"IP掩码介于0到32", srcIpNotEqDestIp:"源IP ", destIpNotEqDestIp:" 与目的IP ", IpNotEqDestIp:" 不能相同", + srcIpIsNotValue:"源IP不能为 ", + destIpIsNotValue:"目的IP不能为", + ipRange:"IP范围格式错误或者起始IP与结束IP不在同一网段", + ipRange1:"起始IP值应小于结束IP值", + portCheck:"请填写正确的端口", + notStartZero:"请填写正确的数值", + portRange:"端口应小于65536，非0数字不能以0开头", portMaskRange:"端口以及掩码范围0-65535，非0数字不能以0开头。格式为\"端口/掩码\"", chooseAreaOrIsp:"区域和运营商必选一个", areaControl:"丢弃和回流动作不能区域管控", @@ -55,7 +54,6 @@ ipv4v6:"请输入合法的IP地址如IPv4(0.0.0.0)或IPv6(::)", all: "全部", ip_subnet: "Subnet", - ip_subnet: "Subnet", ip_range: "ip Range", timeout:"超时", areaIpPrefix:"禁止使用的值: ", From e93d0f26d415b314c409eb8ece950c9e61f9f38b Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 15 Aug 2018 15:00:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?ip=5Fsubnet=E4=B8=AD=E6=96=87=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E7=BF=BB=E8=AF=91=E4=B8=BA=E5=AD=90=E7=BD=91?= =?UTF-8?q?=E6=8E=A9=E7=A0=81=EF=BC=8Cip=5Frange=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E7=BF=BB=E8=AF=91=E4=B8=BAIP=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jquery-validation/1.11.0/localization/messages_zh.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1722722cf..a30350f05 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 @@ -53,8 +53,8 @@ over4: "6over4", ipv4v6:"请输入合法的IP地址如IPv4(0.0.0.0)或IPv6(::)", all: "全部", - ip_subnet: "Subnet", - ip_range: "ip Range", + ip_subnet: "子网掩码", + ip_range: "IP范围", timeout:"超时", areaIpPrefix:"禁止使用的值: ", domainCheck:"请输入有效的域名", From 6df371372ba8681d3db41ce379f24b0e005b7e03 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 15 Aug 2018 15:27:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?IP=EF=BC=8CISP=E7=AD=89=E8=AF=8D=E5=A4=A7?= =?UTF-8?q?=E5=86=99;=E9=A6=96=E5=AD=97=E6=AF=8D=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.11.0/localization/messages_en.js | 24 +++++++++---------- .../1.11.0/localization/messages_zh.js | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) 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 31b3c6ede..2034936b6 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 @@ -41,21 +41,21 @@ portMaskRange:"Port and mask must between 0 and 65535.The correct pattern is \"port/mask\".", chooseAreaOrIsp:"The region and the oprater must choose one", areaControl:"Action drop and loop do not need area control", - ip_type: "ip type", - ip_pattern: "ip Pattern", - area: "area", - isp: "isp", - close_info: "close", - client_ip: "client ip", - ipv4: "ipv4", - ipv6: "ipv6", + ip_type: "IP type", + ip_pattern: "IP Pattern", + area: "Area", + isp: "ISP", + close_info: "Close", + client_ip: "Client IP", + ipv4: "IPv4", + ipv6: "IPv6", over6: "4over6", over4: "6over4", ipv4v6:"Please enter a correct IPv4(0.0.0.0) or IPv6(::)", - all: "all", - ip_subnet: "Subnet", - ip_range: "ip Range", - timeout:"timeout", + all: "All", + ip_subnet: "IP/Subnet mask", + ip_range: "IP Range", + timeout:"Timeout", areaIpPrefix:"Forbiden value: ", domainCheck:"Please enter a valid domain.", checkParent:"Configuration Type must match it's parent.", 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 a30350f05..175cb8bf0 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 @@ -47,13 +47,13 @@ isp: "运营商", close_info: "关闭", client_ip: "源IP", - ipv4: "ipv4", - ipv6: "ipv6", + ipv4: "IPv4", + ipv6: "IPv6", over6: "4over6", over4: "6over4", ipv4v6:"请输入合法的IP地址如IPv4(0.0.0.0)或IPv6(::)", all: "全部", - ip_subnet: "子网掩码", + ip_subnet: "IP/子网掩码", ip_range: "IP范围", timeout:"超时", areaIpPrefix:"禁止使用的值: ",