From 466f7d4cb4077a9d3887505d180e11358dee5092 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 18 Jul 2018 20:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=A0=B7=E4=BE=8B=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties | 15 +++++++++------
 .../resources/messages/message_zh_CN.properties   |  3 +++
 .../webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp   |  7 ++++++-
 .../webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp  |  7 ++++++-
 .../webapp/WEB-INF/views/log/ntc/mmVoipList.jsp   |  7 ++++++-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 394e6410e..9012210c0 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -747,6 +747,9 @@ log_uri=Log URI
 fd_type=Block Type
 access_url=Progam Access URL
 refer=Refer
+black_block_list=Active Block Black List
+static_cfg_block=Static Cfg Block
+first_hit=First Hit
 #===========log end  =============
 #=============about proxy=========
 intercept_policy=Intercept Policy
@@ -992,16 +995,16 @@ dashboard=Dashboard
 traffic_chart=Traffic Chart
 os_type=OS Type
 browser_type=Browser Type
-traffic_protocol_chart=Protocol Chart
-traffic_ipactive_chart=IP Active Chart
+traffic_protocol_chart=Protocol
+traffic_ipactive_chart=IP Active TOP10
 traffic_app_chart=App Chart
-traffic_ua_list=Traffic UA List
-traffic_ua_chart=Traffic UA Chart
+traffic_ua_list=Traffic UA List TOP10
+traffic_ua_chart=Traffic UA
 ranking=Ranking
 os=OS
 browser=Browser
 trend=Trend
-traffic_website_list=Website List
-traffic_website_type_chart=Website Type Chart
+traffic_website_list=Website List TOP10
+traffic_website_type_chart=Website Type
 website=Website
 #===============dashboard end===================================
\ 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 76c31a539..8b48cb07f 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -749,6 +749,9 @@ log_uri=\u5C01\u5835\u73B0\u573A\u7247\u6BB5\u8DEF\u5F84
 fd_type=\u5C01\u5835\u7C7B\u578B
 access_url=\u8282\u76EE\u8BBF\u95EE\u5730\u5740
 refer=\u5165\u53E3\u9875\u9762
+black_block_list=\u52A8\u6001\u9ED1\u540D\u5355\u5C01\u5835
+static_cfg_block=\u9759\u6001\u914D\u7F6E\u5C01\u5835
+first_hit=\u9996\u6B21\u5206\u6790\u547D\u4E2D
 #===========log end  =============
 #=============about proxy=========
 intercept_policy=\u62E6\u622A\u7B56\u7565
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 17946d03d..f19aad07d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -214,7 +214,12 @@ $(document).ready(function(){
 									<td>${log.logUri}</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
-									<td>${log.fdType}</td>
+									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
 									<td>${log.protocol}</td>
 									
 									<td>${log.foundTime}</td>
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 9b8dab315..149f7be4e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -214,7 +214,12 @@ $(document).ready(function(){
 									<td>${log.logUri}</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
-									<td>${log.fdType}</td>
+									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
 									<td>${log.protocol}</td>
 									
 									<td>${log.foundTime}</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
index 76f3e5376..835ead82c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
@@ -252,7 +252,12 @@ $(document).ready(function(){
 									<td>${log.pid}</td>
 									<td>${log.logUri}</td>
 									<td>${log.level}</td>
-									<td>${log.fdType}</td>
+									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
 									
 								</tr>
 							</c:forEach>