1.DNS管控策略新增时，任何响应策略下无欺骗IP时，都不允许保存；

2.YSP样例配置界面增加提示信息；
3.文件摘要日志列表注释日志文件链接一列

9 files changed, 20 insertions, 12 deletions

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 91d95c7..0cd93a9 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1363,4 +1363,5 @@ radius_log=Radius Identify
 message_type=Code

 nas_ip=NAS IP Address

 framed_ip=Framed IP Address

-log_user_name=User Name
\ No newline at end of file
+log_user_name=User Name

+av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P.
\ 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 e72b00e..8ebe51f 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1367,4 +1367,5 @@ radius_log=Radius Identify
 message_type=Code

 nas_ip=NAS IP Address

 framed_ip=Framed IP Address

-log_user_name=User Name
\ No newline at end of file
+log_user_name=User Name

+av_tips=\u041A\u043E\u0433\u0434\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0438\u043D\u0434\u0435\u043A\u0441\u0430 \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0432 \u043A\u043E\u043D\u0446\u0435 \u0444\u0430\u0439\u043B\u0430 \u0438\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435\u043C \u0431\u043E\u043B\u0435\u0435 1080p., \u0441\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F.
\ 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 d01629e..217b025 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1363,4 +1363,5 @@ radius_log=Radius \u534F\u8BAE
 message_type=Code

 nas_ip=NAS IP Address

 framed_ip=Framed IP Address

-log_user_name=User Name
\ No newline at end of file
+log_user_name=User Name

+av_tips=\u5BF9\u4E8E\u97F3\u89C6\u9891\u7F16\u7801\u7684\u7D22\u5F15\u4FE1\u606F\u5728\u97F3\u89C6\u9891\u6587\u4EF6\u5C3E\u90E8\u7684\u60C5\u51B5\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301\uFF0C\u5BF9\u4E8E\u5206\u8FA8\u7387\u5927\u4E8E4\u5146\u7684\u89C6\u9891\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index ab31b49..985b141 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -313,6 +313,7 @@ function sampleFileValidate(fileType,fileName){
 		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	
+	
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">
@@ -446,7 +447,11 @@ function sampleFileValidate(fileType,fileName){
 							            class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
 							            <div for="srcFileInfo"></div>
 							            <div id="fileErrorNote"></div>
+							            
 							        </div>
+							        <div style="margin-bottom:5px">
+							            <span style="color: red;font-size: 16px;letter-spacing: 0px;"> <spring:message code="av_tips"></spring:message></span>
+							            </div>
 							    </div>
 							    <%-- <div class="col-md-6">
 							        <div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
index 7b75b9d..437a590 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -219,7 +219,7 @@ $(document).ready(function(){
 								

 								<th class="sort-column pid" isVisible="false"><spring:message code='pid'/></th>

 								<th class="sort-column url"><spring:message code='access_url'/></th>

-								<th class="sort-column log_uri"><spring:message code='log_uri'/></th>

+								<%-- <th class="sort-column log_uri"><spring:message code='log_uri'/></th> --%>

 								<th class="sort-column referer"><spring:message code='referer'/></th>

 								<th class="sort-column level"  isVisible="false"><spring:message code='harm_level'/></th>

 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

@@ -289,7 +289,7 @@ $(document).ready(function(){
 											${log.url}

 										</c:if>

 									</td>

-									<td>

+									<%-- <td>

 										<c:if test="${fn:startsWith(log.logUri, 'http')}">

 											<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"

 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">

@@ -303,7 +303,7 @@ $(document).ready(function(){
 											http://${fn:substring(log.logUri,0,20) }

 										</a>

 										</c:if>	

-									</td>

+									</td> --%>

 									<td>

 										${log.referer}

 									</td>

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 af2f41f..e24c3c1 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
@@ -1016,18 +1016,18 @@ jQuery.validator.addMethod("ipMaskSole",function(value,element) {
 // DNS阻断无策略校验
 jQuery.validator.addMethod("noStrategyCheck",function(value,element) {
 	var flag = true;
-	if(value == 0){
+	//if(value == 0){
 		var ctx = $(element).attr("ctx");
 		var url = ctx+"/cfg/dnsIp/dnsNoStrategyCheck";
 		$.ajax({
 			type:'post',
 			async:false,
 			url: url,
-			data:{"dnsStrategyId":0},
+			data:{"dnsStrategyId":value},
 			success:function(data){
 				flag = data;
 			}
 		});
-	}
+	//}
 	return flag;
 });
\ No newline at end of file
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 4133474..12599bb 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
@@ -81,6 +81,6 @@
 		areaUnique:"Area already exists.",
 		config_sync_tip:"The system is being maintained and temporarily inaccessible.",
 		ipMaskSole:"IP already exists.",
-		noStrategyCheck:"No effective spoofing IP configuration under default group."
+		noStrategyCheck:"No effective spoofing IP configuration."
 	});
 }(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 970d3b6..b53ba21 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
@@ -81,6 +81,6 @@
 		areaUnique:"Регион уже существует.",
 		config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна.",
 		ipMaskSole:"IP уже существует.",
-		noStrategyCheck:"No effective spoofing IP configuration under default group."
+		noStrategyCheck:"No effective spoofing IP configuration."
 	});
 }(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 5297909..d2061b7 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
@@ -81,6 +81,6 @@
 		areaUnique:"该区域已存在",
 		config_sync_tip:"系统正在维护中，暂时不可访问！",
 		ipMaskSole:"IP已存在",
-		noStrategyCheck:"缺省组下无有效的欺骗IP配置"
+		noStrategyCheck:"策略组下无有效的欺骗IP配置"
 	});
 }(jQuery));