国际化更改：

配置界面的Basic Configuration修改为Tags
tag修改为Custom Tag
Minimum Active time修改为Random TTL Range
Topic Website修改为Focused Website
修改app_payload和app_dns的service_name为大写
修改性质和标签为空时未写零BUG
修改dns响应策略界面最小/大活跃时间展示

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
+min_ttl=Random TTL Range
-max_ttl=Maximum Active time
+max_ttl=Random TTL Range
-ttl_unit=Unit / second
+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

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

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 'ͳ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>'; 
 ALTER TABLE request_num_statistics ADD COLUMN statistic_time datetime NULL COMMENT 'ͳ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>';
@@ -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;

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);

src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp

@@ -123,6 +123,22 @@ $(function(){
 										    <div for="cfgDesc"></div>
 								        </div>
 								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="min_ttl"/></label>
+								            <div class="col-md-2">
+								                <input class="form-control required number"  placeholder="<spring:message code="ttl_unit" />" type="text" name="minTtl" value="${_cfg.minTtl}" min="0">
+								            </div>
+								            <div class="col-md-1" style="text-align: center;vertical-align: center">
+								                -
+								            </div>
+								            <div class="col-md-2">
+								                <input class="form-control required number"  placeholder="<spring:message code="ttl_unit" />" type="text" name="maxTtl" value="${_cfg.maxTtl}" min="0">
+								            </div>
+										    <div for="minTtl"></div>
+										    <div for="maxTtl"></div>
+								        </div>
+								    </div>
 								    <div class="col-md-6 hidden">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><spring:message code="action"/></label>
@@ -149,26 +165,6 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="min_ttl"/></label>
-								            <div class="col-md-6">
-								                <input class="form-control required number"  placeholder="<spring:message code="ttl_unit" />" type="text" name="minTtl" value="${_cfg.minTtl}" min="0">
-								            </div>
-										    <div for="minTtl"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="max_ttl"/></label>
-								            <div class="col-md-6">
-		 						                <input class="form-control required number" placeholder="<spring:message code="ttl_unit" />" type="text" name="maxTtl" value="${_cfg.maxTtl}" min="0">
-								            </div>
-										    <div for="maxTtl"></div>
-								        </div>
-								    </div>
-								</div>
 								<div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">

src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp

@@ -279,7 +279,6 @@
 									<th><spring:message code="group"/></th>
 			 						<th><spring:message code="res_group_num"/></th>
 									<th><spring:message code="min_ttl"/></th>
-									<th><spring:message code="max_ttl"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -317,8 +316,7 @@
 										</a>
 									</td>
 									<td>${cfg.resGroup1Num }</td>
-									<td>${cfg.minTtl }</td>
+									<td>${cfg.minTtl }-${cfg.maxTtl }</td>
-									<td>${cfg.maxTtl }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">

src/main/webapp/static/global/scripts/common.js

@@ -530,16 +530,19 @@ $(function(){
 	   }
 	   
    });
-   $("#classifyId,attributeId,lableId").on("change",function(){
+   $("#classifyId,#attributeId,#lableId").on("change",function(){
-	   if($(this).val()==0){
+	   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的搜索下拉框选择切换