From 2b4404b40c69a9e36b8e783039d226ef2c73bdb0 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 24 Jul 2018 18:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=AB=AF=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/log/manipulation/dkBehaviorList.jsp       | 4 ++++
 src/main/webapp/WEB-INF/views/log/ntc/appList.jsp           | 4 ++++
 src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp          | 4 ++++
 src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp           | 4 ++++
 src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp         | 4 ++++
 src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp        | 4 ++++
 src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp       | 4 ++++
 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/mmVoipList.jsp        | 6 +++++-
 src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp       | 4 ++++
 src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp           | 4 ++++
 12 files changed, 51 insertions(+), 3 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 ec1117794..1e688f951 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -178,6 +178,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -217,6 +219,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 2b42a5239..89ddf5d1f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -178,6 +178,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -211,6 +213,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 a34e1523c..581b6b9bd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -178,6 +178,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -220,6 +222,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 087207c1d..c522761e8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -178,6 +178,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -213,6 +215,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 6e54696c2..e3daf4d48 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -172,6 +172,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -207,6 +209,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 36e5207d5..26f0dbe1c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -187,6 +187,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -235,6 +237,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 8a948cb13..86ea93a0f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -187,6 +187,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -235,6 +237,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 1130625cf..cb6461340 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -194,6 +194,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -221,7 +223,7 @@ $(document).ready(function(){
 									<td>${log.transProto}</td>
 									
 									<td>${log.duation}</td>
-									<td>${log.protocol}</td>
+									<td>${log.voipProtocol}</td>
 									<td>${log.callingAccount}</td>
 									<td>${log.calledAccount}</td>
 									<td>${log.callingNumber}</td>
@@ -249,6 +251,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 f9c0543ed..d9e464ff7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -194,6 +194,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -221,7 +223,7 @@ $(document).ready(function(){
 									<td>${log.transProto}</td>
 									
 									<td>${log.duation}</td>
-									<td>${log.protocol}</td>
+									<td>${log.voipProtocol}</td>
 									<td>${log.callingAccount}</td>
 									<td>${log.calledAccount}</td>
 									<td>${log.callingNumber}</td>
@@ -249,6 +251,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 126a32937..061e94cbd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
@@ -194,6 +194,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -221,7 +223,7 @@ $(document).ready(function(){
 									<td>${log.transProto}</td>
 									
 									<td>${log.duation}</td>
-									<td>${log.protocol}</td>
+									<td>${log.voipProtocol}</td>
 									<td>${log.callingAccount}</td>
 									<td>${log.calledAccount}</td>
 									<td>${log.callingNumber}</td>
@@ -249,6 +251,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 fd802ab0d..81f9b70e0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -178,6 +178,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -215,6 +217,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
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 6c194c4b9..1fe6b36dd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -178,6 +178,8 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='stream_type'/></th>
 									<th><spring:message code='clj_ip'/></th>
@@ -217,6 +219,8 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
+									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
+									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 									<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">