From f06c4a02167b0db0c283c5fee719915cd39e1c38 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Thu, 2 Aug 2018 20:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=8E=E5=AD=97=E6=AE=B5=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=87=BA=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/log/manipulation/dkBehaviorList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/appList.jsp           | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp          | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp           | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp         | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp          | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp        | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp       | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp      | 6 +++---
 src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp       | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp           | 6 +++---
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index c768d2c92..abfbadd8f 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -169,7 +169,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='app_label'/></th>
 									<th><spring:message code='c2s_pkt_num'/></th>
@@ -205,8 +205,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index 9e1416ac0..4ce3dfe1f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									<th><spring:message code='clj_ip'/></th>
 									<th><spring:message code='protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
@@ -201,8 +201,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 2389303f9..54d5fe1e4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -162,7 +162,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='attack_type'/></th>
 									<th><spring:message code='attack_start_time'/></th>
@@ -201,8 +201,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index e60dfa6bb..813167127 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='ftp_url'/></th>
 									<th><spring:message code='ftp_content'/></th>
@@ -205,8 +205,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index 037666b31..538c89f71 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -163,7 +163,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code='action'/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='ex_protocol'/></th>
 									<th><spring:message code='isakmp_mode'/></th>
@@ -196,8 +196,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index 7c8d79dee..53a516cb4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -161,7 +161,7 @@
 								<th><spring:message code="cfg_id"/></th>
 								<th><spring:message code="action"/></th>
 								<th><spring:message code="found_time"/></th>
-								<th><spring:message code="entrance_id"/></th>
+								<th><spring:message code="entrance"/></th>
 								
 								<th><spring:message code="mail_proto"/></th>
 								<th><spring:message code="mail_from"/></th>
@@ -198,7 +198,7 @@
 									<td>${_log.foundTime }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
-											<c:if test="${dict.itemCode eq _log.action}">
+											<c:if test="${dict.itemCode eq _log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
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 e03d83b0b..27fb8c68c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
@@ -211,8 +211,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
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 bb3efdf52..ca1f15053 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
@@ -211,8 +211,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
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 36ccbda4f..adfb4e4bc 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='duation'/></th>
 									<th><spring:message code='voip_protocol'/></th>
@@ -217,8 +217,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
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 40c23529e..9b04dd25a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='duation'/></th>
 									<th><spring:message code='voip_protocol'/></th>
@@ -217,8 +217,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index 4814e99b5..6e61fce4b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='version'/></th>
 									<th><spring:message code='encrypt_mode'/></th>
@@ -207,7 +207,7 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
 											<c:if test="${dict.itemCode eq log.action}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index cdd3a269d..79c65c9f4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code='action'/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 <%-- 									<th><spring:message code='version'/></th> --%>
 									<th><spring:message code='host_key'/></th>
@@ -209,8 +209,8 @@ $(document).ready(function(){
 									</td>
 									<td>${log.foundTime}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>