From 4614cc004cb35a7470390951ceed653cd56448b1 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Mon, 30 Jul 2018 16:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97loguri=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=B6=85=E9=93=BE=E6=8E=A5=E5=BC=80=E5=A4=B4?=
 =?UTF-8?q?=E5=8A=A0http://?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp | 15 +++++++++++----
 .../webapp/WEB-INF/views/log/ntc/mailList.jsp     |  7 ++++++-
 .../webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp   |  8 +++++++-
 .../webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp  |  7 ++++++-
 .../WEB-INF/views/log/ntc/mmVoipAccountList.jsp   |  9 +++++++--
 .../webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp |  9 +++++++--
 .../webapp/WEB-INF/views/log/ntc/mmVoipList.jsp   |  9 +++++++--
 7 files changed, 51 insertions(+), 13 deletions(-)

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 c522761e8..6f54771f2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -174,6 +174,8 @@ $(document).ready(function(){
 									<th><spring:message code='recv_time'/></th>
 									<th><spring:message code='protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
+									<th><spring:message code='ftp_url'/></th>
+									<th><spring:message code='ftp_content'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
@@ -185,8 +187,7 @@ $(document).ready(function(){
 									<th><spring:message code='clj_ip'/></th>
 									<th><spring:message code='nest_addr_list'/></th>
 									<th><spring:message code='user_region'/></th>
-									<th><spring:message code='ftp_url'/></th>
-									<th><spring:message code='ftp_content'/></th>
+									
 								</tr>
 							</thead>
 							<tbody>
@@ -211,6 +212,13 @@ $(document).ready(function(){
 											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
+									<td>
+										<a href="${log.ftpUrl}" data-original-title="${log.ftpUrl}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fn:substring(log.ftpUrl,0,20) }
+										</a>	
+									</td>
+									<td>${log.ftpContent}</td>
 									<td>${log.dIp}</td>
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
@@ -226,8 +234,7 @@ $(document).ready(function(){
 									<td>${log.capIp}</td>
 									<td>${log.addrList}</td>
 									<td>${log.userRegion}</td>
-									<td>${log.ftpUrl}</td>
-									<td>${log.ftpContent}</td>
+									
 								</tr>
 							</c:forEach>
 							</tbody>
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 3fbb3f4e0..843be135e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -197,7 +197,12 @@
 									<td>${_log.mailFrom }</td>
 									<td>${_log.mailTo }</td>
 									<td>${_log.subject }</td>
-									<td>${_log.emlFile }</td>
+									<td>
+										<a href="${_log.emlFile}" data-original-title="${_log.emlFile}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(_log.emlFile,0,20) }
+										</a>	
+									</td>
 									<td>${_log.sIp }</td>
 									<td>${_log.sPort }</td>
 									<td>${_log.dIp }</td>
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 26f0dbe1c..ca8052875 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,13 @@ $(document).ready(function(){
 									
 									<td>${log.pid}</td>
 									<td>${log.url}</td>
-									<td>${log.logUri}</td>
+									<td>
+										<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>	
+									</td>
+									
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
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 86ea93a0f..2b8a265c2 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.pid}</td>
 									<td>${log.url}</td>
-									<td>${log.logUri}</td>
+									<td>
+										<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>	
+									</td>
 									<td>${log.refer}</td>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
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 cb6461340..85113e87b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -38,7 +38,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		VOIP ACCOUNT
+		VoIP ACCOUNT
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -233,7 +233,12 @@ $(document).ready(function(){
 									<td>${log.toFromStoreIp}</td>
 									<td>${log.toFromStoreUrl}</td>
 									<td>${log.pid}</td>
-									<td>${log.logUri}</td>
+									<td>
+										<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>	
+									</td>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
 									<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 d9e464ff7..9d58ed551 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -38,7 +38,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		VOIP IP
+		VoIP IP
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -233,7 +233,12 @@ $(document).ready(function(){
 									<td>${log.toFromStoreIp}</td>
 									<td>${log.toFromStoreUrl}</td>
 									<td>${log.pid}</td>
-									<td>${log.logUri}</td>
+									<td>
+										<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>	
+									</td>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
 									<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 061e94cbd..485929a62 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
@@ -38,7 +38,7 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		VOIP
+		VoIP
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
@@ -233,7 +233,12 @@ $(document).ready(function(){
 									<td>${log.toFromStoreIp}</td>
 									<td>${log.toFromStoreUrl}</td>
 									<td>${log.pid}</td>
-									<td>${log.logUri}</td>
+									<td>
+										<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											http://${fn:substring(log.logUri,0,20) }
+										</a>	
+									</td>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
 									<td>