From 9aa9dd8af8a2b3a414e20cb89c30a0f96c8d645c Mon Sep 17 00:00:00 2001 From: duandongmei Date: Wed, 26 Sep 2018 15:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=20=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E7=9A=84Basic?= =?UTF-8?q?=20Configuration=E4=BF=AE=E6=94=B9=E4=B8=BATags=20tag=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BACustom=20Tag=20Minimum=20Active=20time?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BARandom=20TTL=20Range=20Topic=20Websi?= =?UTF-8?q?te=E4=BF=AE=E6=94=B9=E4=B8=BAFocused=20Website=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9app=5Fpayload=E5=92=8Capp=5Fdns=E7=9A=84service=5Fname?= =?UTF-8?q?=E4=B8=BA=E5=A4=A7=E5=86=99=20=E4=BF=AE=E6=94=B9=E6=80=A7?= =?UTF-8?q?=E8=B4=A8=E5=92=8C=E6=A0=87=E7=AD=BE=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E6=9C=AA=E5=86=99=E9=9B=B6BUG=20=E4=BF=AE=E6=94=B9dns=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E7=AD=96=E7=95=A5=E7=95=8C=E9=9D=A2=E6=9C=80=E5=B0=8F?= =?UTF-8?q?/=E5=A4=A7=E6=B4=BB=E8=B7=83=E6=97=B6=E9=97=B4=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 18 +++++----- .../messages/message_zh_CN.properties | 8 ++--- .../sql/20180917/update_statistics_tables.sql | 4 +-- .../sql/20180926/update_service_asn.sql | 3 ++ .../cfg/maintenance/dnsResStrategy/form.jsp | 36 +++++++++---------- .../cfg/maintenance/dnsResStrategy/list.jsp | 4 +-- .../webapp/static/global/scripts/common.js | 7 ++-- 7 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 src/main/resources/sql/20180926/update_service_asn.sql diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 8b3668462..3c42f5d5e 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -50,7 +50,7 @@ classification_manage=Classification area_manage=Area feature_scope_manage=Feature Scope special_tasks=Special Task -label_manage=Tag +label_manage=Custom Tag protect_list=Protect List effect_range=Effective Range agreement_ip_configuration=Protocol IP @@ -317,7 +317,7 @@ block_type=Action Request=Request whether_area_block=Effective Range classification=Classification -label=Tag +label=Custom Tag attribute=Attribute area=Area isp=ISP @@ -357,7 +357,7 @@ protocol=Protocol oneway=Single twoway=Double arbitrary=Arbitrarily -basic_config=Basic Configuration +basic_config=Tags block_config=Configuration Info expression_type=Expression Type null_expression=No expression @@ -768,9 +768,9 @@ ip_Reuse_pool_config=IP Reusing Pool dns_res_strategy=DNS Response Profiles policy_number=Policy No. policy_name=Response Profile -min_ttl=Minimum Active time -max_ttl=Maximum Active time -ttl_unit=Unit / second +min_ttl=Random TTL Range +max_ttl=Random TTL Range +ttl_unit=Unit/S res_group_num=Response Group Number policy_number_value_valid=The policy number can only be 0, or more than 100 policy_number_value_unique=The policy number has already existed @@ -978,7 +978,7 @@ report_list=Report hour_of_day_report=Hourly Report day_of_month_report=Daily Report month_report=Monthly Report -label_report=Tag Report +label_report=Custom Tag Report attr_type_report=Attribute Report lwhh_report=Official Letter Report src_ip_report=Src IP Report @@ -1093,7 +1093,7 @@ content_length=Content Length response_file=Response File APP_SUBSCRIBE_ID=Subscribe ID reply_file=Reply File -app_topic_domain_cfg=Topic Website +app_topic_domain_cfg=Focused Website #=====================about app Tcp================================= min_tcp=Minimum Session Size max_tcp=Maximum Session Size @@ -1162,7 +1162,7 @@ mm_logo_detection_reject=Logo Detection Reject mm_face_recognization_monit=Face Recognization Monitoring mm_face_recognization_reject=Face Recognization Reject -app_topic_domain_monit=Topic Website Momotoring +app_topic_domain_monit=Focused Website Momotoring ASN_POLICY_REJECT=ASN Policy Control ASN_POLICY_MONIT=ASN Policy Monitoring p2p_monit=P2P Monitoring diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 4e8561ca2..590013ee8 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -50,7 +50,7 @@ classification_manage=\u5206\u7C7B\u7BA1\u7406 area_manage=\u5730\u57DF\u7BA1\u7406 feature_scope_manage=\u7279\u5F81\u4F5C\u7528\u57DF\u7BA1\u7406 special_tasks=\u4E13\u9879\u4EFB\u52A1 -label_manage=\u6807\u7B7E\u7BA1\u7406 +label_manage=\u7528\u6237\u6807\u7B7E\u7BA1\u7406 protect_list=\u4FDD\u62A4\u540D\u5355 effect_range=\u751F\u6548\u8303\u56F4 agreement_ip_configuration=\u534F\u8BAEIP\u914D\u7F6E @@ -316,7 +316,7 @@ key_word=\u5173\u952E\u5B57 block_type=\u7BA1\u63A7\u7C7B\u578B whether_area_block=\u533A\u57DF\u7BA1\u63A7\u8303\u56F4 classification=\u5206\u7C7B -label=\u6807\u7B7E +label=\u7528\u6237\u6807\u7B7E attribute=\u6027\u8D28 area=\u533A\u57DF isp=\u8FD0\u8425\u5546 @@ -356,7 +356,7 @@ protocol=\u534F\u8BAE oneway=\u5355\u5411 twoway=\u53CC\u5411 arbitrary=\u4EFB\u610F -basic_config=\u57FA\u672C\u914D\u7F6E +basic_config=\u6807\u7B7E block_config=\u914D\u7F6E\u4FE1\u606F expression_type=\u8868\u8FBE\u5F0F\u7C7B\u578B null_expression=\u65E0\u8868\u8FBE\u5F0F @@ -976,7 +976,7 @@ report_list=\u62A5\u8868 hour_of_day_report=\u5C0F\u65F6\u62A5 day_of_month_report=\u5F53\u6708\u65E5\u62A5 month_report=\u6708\u62A5 -label_report=\u6807\u7B7E\u62A5\u8868 +label_report=\u7528\u6237\u6807\u7B7E\u62A5\u8868 attr_type_report=\u6027\u8D28\u62A5\u8868 lwhh_report=\u6765\u6587\u51FD\u53F7\u62A5\u8868 src_ip_report=\u5883\u5185\u6E90IP\u62A5\u8868 diff --git a/src/main/resources/sql/20180917/update_statistics_tables.sql b/src/main/resources/sql/20180917/update_statistics_tables.sql index 35e21cab0..d1eeeda1b 100644 --- a/src/main/resources/sql/20180917/update_statistics_tables.sql +++ b/src/main/resources/sql/20180917/update_statistics_tables.sql @@ -1,4 +1,4 @@ -ALTER EVENT event_exec_proc_config ON COMPLETION PRESERVE DISABLE; +ALTER EVENT exec_procs ON COMPLETION PRESERVE DISABLE; ALTER TABLE cfg_num_statistics ADD COLUMN statistic_time datetime NULL COMMENT '统计时间'; ALTER TABLE request_num_statistics ADD COLUMN statistic_time datetime NULL COMMENT '统计时间'; @@ -444,4 +444,4 @@ BEGIN END;; DELIMITER ; -ALTER EVENT event_exec_proc_config ON COMPLETION PRESERVE DISABLE; +ALTER EVENT exec_procs ON COMPLETION PRESERVE ENABLE; diff --git a/src/main/resources/sql/20180926/update_service_asn.sql b/src/main/resources/sql/20180926/update_service_asn.sql new file mode 100644 index 000000000..c646b5e30 --- /dev/null +++ b/src/main/resources/sql/20180926/update_service_asn.sql @@ -0,0 +1,3 @@ +#update national code +update function_service_dict set service_name='APP_PAYLOAD' where dict_id in (127,132); +update function_service_dict set service_name='APP_DNS' where dict_id in (129,133); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp index 2857f626c..6037bd584 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp @@ -123,6 +123,22 @@ $(function(){
+
+
+ +
+ " type="text" name="minTtl" value="${_cfg.minTtl}" min="0"> +
+
+ - +
+
+ " type="text" name="maxTtl" value="${_cfg.maxTtl}" min="0"> +
+
+
+
+
-
-
-
- -
- " type="text" name="minTtl" value="${_cfg.minTtl}" min="0"> -
-
-
-
-
-
- -
- " type="text" name="maxTtl" value="${_cfg.maxTtl}" min="0"> -
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index 1a089c56b..56b41ce35 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -279,7 +279,6 @@ - @@ -317,8 +316,7 @@ ${cfg.resGroup1Num } - ${cfg.minTtl } - ${cfg.maxTtl } + ${cfg.minTtl }-${cfg.maxTtl } diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index ecd725b99..5991206be 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -530,16 +530,19 @@ $(function(){ } }); - $("#classifyId,attributeId,lableId").on("change",function(){ - if($(this).val()==0){ + $("#classifyId,#attributeId,#lableId").on("change",function(){ + if($(this).val()==0 || $(this).val()==''){ $(this).val(0); } }); }); window.onload=function(){ $("span[id^=open]").click(function(){ + //鍏抽敭瀛 $("div[class='content content2']").find("label:lt(1)").addClass("keyword-disinline");//page.css 鍏抽敭璇嶆崲琛 + //澧炲己瀛楃涓 $("div[class='content content3']").find("label:lt(1)").addClass("keyword-disinline");//page.css 鍏抽敭璇嶆崲琛 + //鎽樿 $("div[class='content content5']").find("label:lt(1)").addClass("keyword-disinline");//page.css 鍏抽敭璇嶆崲琛 }) // 閰嶇疆id鐨勬悳绱笅鎷夋閫夋嫨鍒囨崲