From 5d99522e57c2136c6205bbeb7b16e965d160f6fe Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 23 Jul 2018 17:05:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E2=80=9C=E8=89=B2=E6=83=85=E2=80=9D=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9avIp=E5=92=8CavUrl=E6=97=A5=E5=BF=97list?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84functionId=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_zh_CN.properties  | 16 ++++++++--------
 .../webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp  |  3 +--
 .../webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp |  3 +--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index afcd92dec..44b006689 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -564,8 +564,8 @@ av_sample_audio_control=\u97F3\u9891\u6837\u4F8B
 av_sample_vedio_control=\u89C6\u9891\u6837\u4F8B
 av_sample_picture_control=\u56FE\u7247\u6837\u4F8B
 av_sample_voip_control=VoIP\u6837\u4F8B
-av_sample_audio_porn_control=\u97F3\u9891\u8272\u60C5\u6837\u4F8B
-av_sample_vedio_porn_control=\u89C6\u9891\u8272\u60C5\u6837\u4F8B
+av_sample_audio_porn_control=\u97F3\u9891\u573A\u666F\u6837\u4F8B
+av_sample_vedio_porn_control=\u89C6\u9891\u573A\u666F\u6837\u4F8B
 av_sample_control=\u97F3\u89C6\u9891\u6837\u4F8B
 configure_statistics_info=\u914D\u7F6E\u7EDF\u8BA1\u4FE1\u606F
 harm_level=\u5371\u5BB3\u7A0B\u5EA6
@@ -822,8 +822,8 @@ av_sample_audio=\u97F3\u9891\u6837\u4F8B
 av_sample_vedio=\u89C6\u9891\u6837\u4F8B
 av_sample_picture=\u56FE\u7247\u6837\u4F8B
 av_sample_voip=VoIP\u6837\u4F8B
-av_sample_audio_porn=\u97F3\u9891\u8272\u60C5\u573A\u666F\u6837\u4F8B
-av_sample_vedio_porn=\u89C6\u9891\u8272\u60C5\u573A\u666F\u6837\u4F8B
+av_sample_audio_porn=\u97F3\u9891\u573A\u666F\u6837\u4F8B
+av_sample_vedio_porn=\u89C6\u9891\u573A\u666F\u6837\u4F8B
 WHITE_LIST_IP=IP\u767D\u540D\u5355
 av_voip_ip=VoIP IP\u914D\u7F6E
 NTC_HTTP_URL=URL\u914D\u7F6E
@@ -901,10 +901,10 @@ pic_sample_reject=\u56FE\u7247\u6837\u4F8B\u7BA1\u63A7
 pic_sample_monit=\u56FE\u7247\u6837\u4F8B\u76D1\u6D4B
 voip_sample_reject=VoIP\u6837\u4F8B\u7BA1\u63A7
 voip_sample_monit=VoIP\u6837\u4F8B\u76D1\u6D4B
-audio_pornography_sample_reject=\u97F3\u9891\u8272\u60C5\u6837\u4F8B\u7BA1\u63A7
-audio_pornography_sample_monit=\u97F3\u9891\u8272\u60C5\u6837\u4F8B\u76D1\u6D4B
-video_pornography_sample_reject=\u89C6\u9891\u8272\u60C5\u6837\u4F8B\u7BA1\u63A7
-video_pornography_sample_monit=\u89C6\u9891\u8272\u60C5\u6837\u4F8B\u76D1\u6D4B
+audio_pornography_sample_reject=\u97F3\u9891\u6837\u4F8B\u7BA1\u63A7
+audio_pornography_sample_monit=\u97F3\u9891\u6837\u4F8B\u76D1\u6D4B
+video_pornography_sample_reject=\u89C6\u9891\u6837\u4F8B\u7BA1\u63A7
+video_pornography_sample_monit=\u89C6\u9891\u6837\u4F8B\u76D1\u6D4B
 ip_white_monit=IP\u5730\u5740\u767D\u540D\u5355\u76D1\u6D4B
 ip_white_reject=IP\u5730\u5740\u767D\u540D\u5355\u7BA1\u63A7
 ip_white_whitelist=IP\u5730\u5740\u767D\u540D\u5355
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 2a7ace6ed..3447cbe69 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -38,8 +38,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		<c:if test="${log.functionId eq 28 }"><spring:message code="av_sample_audio_control"/></c:if>
-		<c:if test="${log.functionId eq 29 }"><spring:message code="av_sample_vedio_control"/></c:if>
+		<spring:message code="av_content_ip_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index c225a10e7..095a63cef 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -38,8 +38,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		<c:if test="${log.functionId eq 28 }"><spring:message code="av_sample_audio_control"/></c:if>
-		<c:if test="${log.functionId eq 29 }"><spring:message code="av_sample_vedio_control"/></c:if>
+		<spring:message code="av_content_url_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>