From efb52a6bf92fe625262502147ae522a50d4958c1 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Wed, 6 Jun 2018 15:03:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B7=B2=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E8=87=B3=E5=85=AC=E5=85=B1JS=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=A4=9A=E4=BD=99JS=E4=BB=A3=E7=A0=81=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp | 9 --------- src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp | 9 --------- src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp | 10 ---------- 3 files changed, 28 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp index 10a96ceef..bf141e06e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -71,15 +71,6 @@ /* $("span[title='add']").on("click", function() { $(".ipPort0").removeClass("hidden"); }); */ - $(".district").each(function(){ - if($(this).siblings(".otherValue").val()!=''){ - if($(this).val()!=$(this).siblings(".otherValue").val()){ - $(this).find("option[value=others]").attr("selected","selected"); - $(this).siblings(".otherValue").prop("type","text"); - } - } - - }); }); diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index 27af45f17..85e13bcb8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -71,15 +71,6 @@ /* $("span[title='add']").on("click", function() { $(".ipPort0").removeClass("hidden"); }); */ - $(".district").each(function(){ - if($(this).siblings(".otherValue").val()!=''){ - if($(this).val()!=$(this).siblings(".otherValue").val()){ - $(this).find("option[value=others]").attr("selected","selected"); - $(this).siblings(".otherValue").prop("type","text"); - } - } - - }); }); diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 0ed4072bd..8e0b594a9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -99,16 +99,6 @@ /* $("span[title='add']").on("click", function() { $(".ipPort0").removeClass("hidden"); }); */ - - $(".district").each(function(){ - if($(this).siblings(".otherValue").val()!=''){ - if($(this).val()!=$(this).siblings(".otherValue").val()){ - $(this).find("option[value=others]").attr("selected","selected"); - $(this).siblings(".otherValue").prop("type","text"); - } - } - - }); }); From cc5acbc271f3fb782ea305f0b576ace6c8e1285f Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 6 Jun 2018 17:06:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?(1)action=E5=9B=BD=E9=99=85=E5=8C=96code?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=8C=E4=B8=AD=E8=8B=B1=E4=BF=84=E4=B8=89?= =?UTF-8?q?=E5=9B=BD=E5=9B=BD=E9=99=85=E5=8C=96=20(2)=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E6=95=B0=E5=AD=97=E5=86=99?= =?UTF-8?q?=E6=AD=BB=E7=9A=84=E4=BB=A3=E7=A0=81=E6=9B=BF=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 11 +++++- .../resources/messages/message_ru.properties | 11 +++++- .../messages/message_zh_CN.properties | 9 +++++ .../webapp/WEB-INF/views/cfg/iplist/list.jsp | 34 +++++++++---------- .../WEB-INF/views/cfg/whitelist/ipForm.jsp | 11 +++--- .../WEB-INF/views/cfg/whitelist/ipList.jsp | 19 +++++------ 6 files changed, 61 insertions(+), 34 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 63bff9a2f..e43f22553 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -566,4 +566,13 @@ ip_subnet=Subnet district=match district keywords=keywords ingress=ingress -degress=egress \ No newline at end of file +degress=egress +action_drop=drop +action_reject=reject +action_redirect=\redirect +action_loop=loop +action_forward=forward +action_ratelimit=rate limit +action_replace=replace +action_whitelist=white list +action_monit=monitor \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 1329fa08a..353a4cfdd 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -392,4 +392,13 @@ ip_subnet=Subnet district=match district keywords=keywords ingress=ingress -degress=egress \ No newline at end of file +degress=egress +action_drop=\u0431\u0440\u043E\u0441\u044C +action_reject=\u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u044C +action_redirect=\u043F\u0435\u0440\u0435\u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 +action_loop=\u043F\u0435\u0442\u043B\u044F +action_forward=\u0432\u043F\u0435\u0440\u0435\u0434 +action_ratelimit=\u0441\u0442\u0430\u0432\u043A\u0438 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0438\u0442\u044C +action_replace=\u0437\u0430\u043C\u0435\u043D\u0438\u0442\u044C +action_whitelist=\u0431\u0435\u043B\u044B\u0439 \u0441\u043F\u0438\u0441\u043E\u043A +action_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index ce98b65a4..6e7b665a8 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -593,3 +593,12 @@ has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220 has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838 has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7 multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u82F1\u6587\u9017\u53F7\u6216\u8005\u56DE\u8F66\u952E\u9694\u5F00\u3002 +action_drop=\u4E22\u5F03 +action_reject=\u963B\u65AD +action_redirect=\u91CD\u5B9A\u5411 +action_loop=\u56DE\u6D41 +action_forward=\u8F6C\u53D1 +action_ratelimit=\u9650\u901F +action_replace=\u66FF\u6362 +action_whitelist=\u767D\u540D\u5355 +action_monit=\u76D1\u6D4B \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp index 987560fa8..d7f72d4b8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp @@ -87,10 +87,9 @@
- - - - + + +
@@ -246,18 +245,19 @@ ${cfg.destIpAddress } ${cfg.destPort } - - + + - - + + + - - - + + + @@ -298,12 +298,12 @@ - - - - - - + + + + + + ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp index 0ac60ddfd..011f677eb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -138,9 +138,9 @@ $(function(){
@@ -163,8 +163,9 @@ $(function(){
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index c68f62626..1d5527094 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -88,10 +88,9 @@
- - - - + + +
@@ -251,12 +250,12 @@ - - - - - - + + + + + + ${cfg.creatorName } From 30c4dee595723b4615f0cc65d4842506dc58ab72 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 6 Jun 2018 18:02:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E8=B0=83=E6=95=B4=EF=BC=8C0=E5=88=B065535?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jquery-validation/1.11.0/jquery.validate.method.js | 4 ++-- .../jquery-validation/1.11.0/localization/messages_en.js | 4 ++-- .../jquery-validation/1.11.0/localization/messages_ru.js | 4 ++-- .../jquery-validation/1.11.0/localization/messages_zh.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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 9fa61ba35..d0938a602 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 @@ -296,14 +296,14 @@ jQuery.validator.addMethod("portCheck",function(value, element) { typeInt=$(element).parents(".row").parent(".row").find("select[name$='portPattern']").val(); } if(typeInt==1){//port 0~65535 - if(this.optional(element)||(/^(0|[1-9][0-9]*)$/.test(value))){ + if(this.optional(element)||(/^(0|[1-9][0-9]{0,4})$/.test(value)&& RegExp.$1 <=65535)){ return true; }else{ $.validator.messages.portCheck=$.validator.messages.portRange return false; } }else if(typeInt==2){// port -mask 0~65535/0~65535 - if(this.optional(element)||(/^(0|[1-9][0-9]*)\/(0|[1-9][0-9]{0,4})$/.test(value) && RegExp.$2 <=65535)){ + if(this.optional(element)||(/^(0|[1-9][0-9]{0,4})\/(0|[1-9][0-9]{0,4})$/.test(value) && RegExp.$1 <=65535 && RegExp.$2 <=65535)){ return true; }else{ $.validator.messages.portCheck=$.validator.messages.portMaskRange 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 521d2b891..ed4f8afb8 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 @@ -31,8 +31,8 @@ ipRange1:"start IP should smaller than end IP", portCheck:"Please enter a correct port", notStartZero:"Please enter a valid Integer", - portRange:"Please enter a valid Integer", - portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\".", + portRange:"Port must between 0 and 65535", + 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", 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 54ca39d52..2ed95ff5c 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 @@ -29,8 +29,8 @@ ipRange:"Wrong IP format or start IP and end IP in two subnet", ipRange1:"start IP should smaller than end IP", portCheck: " Пожалуйста, введите  правильный  порт.", - portRange:"Please enter a valid Integer", - portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\".", + portRange:"Port must between 0 and 65535", + 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", 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 b87fe308d..e8cd2707b 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 @@ -32,8 +32,8 @@ ipMaskRange:"掩码范围0到32", ipRange:"IP范围格式错误或者起始IP与结束IP不在同一网段", ipRange1:"起始IP值应小于结束IP值", - portRange:"端口必须为整数，非0数字不能以0开头", - portMaskRange:"端口必须为整数，掩码范围0-65535，非0数字不能以0开头。格式为\"端口/掩码\"", + portRange:"端口应小于65536，非0数字不能以0开头", + portMaskRange:"端口以及掩码范围0-65535，非0数字不能以0开头。格式为\"端口/掩码\"", chooseAreaOrIsp:"区域和运营商必选一个", areaControl:"丢弃和回流动作不能区域管控", ip_type: "ip类型",