From b8b17f6f806bb7f9e17c99b69b07ecc1ef09dd0d Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Fri, 10 Aug 2018 09:55:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E4=B8=BA=E9=85=8D=E7=BD=AE=E4=B8=AD=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8E=E8=8F=9C=E5=8D=95=E7=9B=B8=E5=90=8C2.=E4=B8=B2?=
 =?UTF-8?q?=E8=81=94=E8=AE=BE=E5=A4=87=E5=8F=B7=E6=94=B9=E4=B8=BA=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E4=B8=AD=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/manipulation/dkBehaviorList.jsp |  6 ++++-
 .../webapp/WEB-INF/views/log/ntc/appList.jsp  |  8 +++++--
 .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 15 +++++++++----
 .../webapp/WEB-INF/views/log/ntc/ftpList.jsp  |  8 +++++--
 .../WEB-INF/views/log/ntc/ipsecList.jsp       |  8 +++++--
 .../views/log/ntc/mmVoipAccountList.jsp       |  2 +-
 .../WEB-INF/views/log/ntc/mmVoipIpList.jsp    |  2 +-
 .../WEB-INF/views/log/ntc/openVpnList.jsp     | 22 ++++++++++---------
 .../webapp/WEB-INF/views/log/ntc/sshList.jsp  |  8 +++++--
 9 files changed, 54 insertions(+), 25 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 83ef3dfc6..b3591c99f 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -222,7 +222,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
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 1813f706b..9303b4c0b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		APP
+		<spring:message code="social_app_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -209,7 +209,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
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 0dffec93e..eee1c633f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		DDOS
+		<spring:message code="dk_behavior"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -212,8 +212,11 @@ $(document).ready(function(){
 									<td>${log.attackMaxBps}</td>
 									<td>${log.attackTotalPkt}</td>
 									<td>${log.attackTotalByte}</td>
-									<td>${log.isBlcok}</td>
-									
+									<td>
+										<c:forEach items="${fns:getDictList('SYS_YES_NO')}" var="dic">
+											<c:if test="${dic.itemCode eq log.isBlcok}"><spring:message code="${dic.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto}</td>
 									<td>
@@ -225,7 +228,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
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 f96a14642..d179cb2f5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		FTP
+		<spring:message code="ftp_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -225,7 +225,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
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 4da53510c..599d0944e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -28,7 +28,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		IPSEC
+		<spring:message code="IPSEC"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -215,7 +215,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
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 73ce37e60..db01839ab 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		VoIP ACCOUNT
+		<spring:message code="av_voip_account_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
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 e3f99e5d2..6b1e12f69 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		VoIP IP
+	<spring:message code="av_voip_ip_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
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 d4dde7dd6..9eb279792 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		OpenVPN
+	<spring:message code="openvpn_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -205,16 +205,14 @@ $(document).ready(function(){
 										</c:forEach>
 									</td>
 									
-									<td title="${fns:escapeHtml(log.version)}">
-										${fns:stringFormat(log.version,30)}
-									</td>
-									<td title="${fns:escapeHtml(log.encryptMode)}">
-										${fns:stringFormat(log.encryptMode,30)}
-									</td>
+									<td>${log.version}</td>
+									<td>${log.encryptMode}</td>
 									<td>
-										<c:if test="${log.hmac==0}"><spring:message code="no"/></c:if>
-										<c:if test="${log.hmac==1}"><spring:message code="yes"/></c:if>
+										<c:forEach items="${fns:getDictList('SYS_YES_NO')}" var="dic">
+											<c:if test="${dic.itemCode eq log.hmac}"><spring:message code="${dic.itemValue}"/></c:if>
+					                	</c:forEach>
 									</td>
+									
 									<td>
 										<c:if test="${log.tunnelType==1}">TCP</c:if>
 										<c:if test="${log.tunnelType==2}">UDP</c:if>
@@ -231,7 +229,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.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 96e5a8f77..975042a92 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -29,7 +29,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		SSH
+		<spring:message code="SSH"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -229,7 +229,11 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
+											<c:if test="${device.itemCode eq log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
+					                	</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>