From b3264bc2ddc43f890caba86c069fd214d3f63cee Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Mon, 17 Dec 2018 10:47:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2-=E5=B0=81?=
 =?UTF-8?q?=E5=A0=B5=E7=B1=BB=E5=9E=8B=E5=AD=97=E5=85=B8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp   | 10 +++++++---
 src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp  | 10 +++++++---
 .../webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp  | 10 +++++++---
 src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp  | 10 +++++++---
 src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp | 10 +++++++---
 .../WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp    | 10 +++++++---
 .../webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp | 10 +++++++---
 .../webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp  | 10 +++++++---
 .../webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp  | 10 +++++++---
 .../webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp   | 10 +++++++---
 .../WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp      | 10 +++++++---
 .../webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp  | 10 +++++++---
 .../webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp | 10 +++++++---
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp | 10 +++++++---
 14 files changed, 98 insertions(+), 42 deletions(-)

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 aaf653aed..b45b50b92 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -270,9 +270,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td>
 										<c:set var="avProtocol" value="${log.protocol}"></c:set>
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 3a4024ae0..580422444 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -266,9 +266,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td>
 										<c:set var="avProtocol" value="${log.protocol}"></c:set>
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 3db638065..bd595b385 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -320,9 +320,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td><c:set var="avProtocol" value="${log.protocol}"></c:set>
 										<c:forEach items="${fns:getDictList('AV_PROTOCOL')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index fab95bb6b..8064cab45 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -267,9 +267,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td>
 										<c:set var="avProtocol" value="${log.protocol}"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 9ba1c97c8..bff10d1bb 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -265,9 +265,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td>
 										<c:set var="avProtocol" value="${log.protocol}"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index e05ee6185..3d6241e1e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -267,9 +267,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td>
 										<c:set var="avProtocol" value="${log.protocol}"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 7486acdfa..f5fb9941d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -380,9 +380,13 @@
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td><c:set var="avProtocol" value="${log.protocol}"></c:set>
 										<c:forEach items="${fns:getDictList('AV_PROTOCOL')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
index 7efe1f91e..9cceeae17 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -309,9 +309,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td><c:set var="avProtocol" value="${log.protocol}"></c:set>
 										<c:forEach items="${fns:getDictList('AV_PROTOCOL')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
index a97149c67..9e3fd5adc 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -308,9 +308,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td><c:set var="avProtocol" value="${log.protocol}"></c:set>
 										<c:forEach items="${fns:getDictList('AV_PROTOCOL')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 9028d3e16..9b3f7859c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -319,9 +319,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td><c:set var="avProtocol" value="${log.protocol}"></c:set>
 										<c:forEach items="${fns:getDictList('AV_PROTOCOL')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
index b1ca8421c..33c3b9d0c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -310,9 +310,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td><c:set var="avProtocol" value="${log.protocol}"></c:set>
 										<c:forEach items="${fns:getDictList('AV_PROTOCOL')}" var="dic">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index 92fec55ff..cbe7dc4ab 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -324,9 +324,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index b8354feb3..4a906fbfc 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -272,9 +272,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 4aea70802..74fe6e0be 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -333,9 +333,13 @@ $(document).ready(function(){
 									<td>${log.level}</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>
+										<c:set var="fdTypes">${log.fdType }</c:set>
+										<c:forEach items="${fns:getDictList('FD_TYPE')}" var="dic">
+											<c:if test="${dic.itemCode eq log.fdType}">
+												<c:set var="fdTypes">${dic.itemValue}</c:set>
+											</c:if>
+										</c:forEach>
+										<spring:message code="${fdTypes}"/>
 									</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 										<td>