完善日志界面.

2018-08-03 21:24:08 +08:00
parent 0df28b22e9
commit 4efcad8ca0
12 changed files with 69 additions and 116 deletions
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -224,14 +224,12 @@ $(document).ready(function(){
 										<%-- <c:if test="${fn:startsWith(log.url, 'http')}">${log.url }</c:if>
 										<c:if test="${!fn:startsWith(log.url, 'http')}">http://${log.url }</c:if> --%>
 										<c:if test="${fn:startsWith(log.url, 'http')}">
-											<c:set var="url" value="${log.url }"/>
+											${log.url }
 										</c:if>
 										<c:if test="${!fn:startsWith(log.url, 'http')}">
-											<c:set var="url" value="http://${log.url }"/>
+											${log.url }
 										</c:if>
-										<span title="${fns:escapeHtml(url)}">
-											${fns:stringFormat(url,30)}
-										</span>
+										
 									</td>
 									<td>
 										<c:if test="${fn:startsWith(log.logUri, 'http')}">
@@ -240,13 +238,14 @@ $(document).ready(function(){
 										<c:if test="${!fn:startsWith(log.logUri, 'http')}">
 											<c:set var="logUri" value="http://${log.logUri }"/>
 										</c:if>
-										<a target="_blank" href='${fns:escapeHtml(logUri)}' title="${fns:escapeHtml(logUri)}">
-											${fns:stringFormat(logUri,30)}
+										<a href="${logUri}" target="_blank" data-original-title="${logUri}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fn:substring(logUri,0,20) }
 										</a>
 										<%-- <c:if test="${fn:startsWith(log.logUri, \"http\")}">${log.logUri }</c:if>
 										<c:if test="${!fn:startsWith(log.logUri, \"http\")}">http://${log.logUri }</c:if>'>http://${log.logUri }</a> --%>
 									</td>
-									<td title="${fns:escapeHtml(log.refer)}">${fns:stringFormat(log.refer,30)}</td>
+									<td>${log.refer }</td>
 									<td>${log.level }</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
 									<td>
@@ -278,7 +277,7 @@ $(document).ready(function(){
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<%-- <td title="${fns:escapeHtml(log.addrList)}">${fns:stringFormat(log.addrList,30)}</td> --%>
+									<%-- <td>${log.addrList }</td> --%>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
 								</tr>
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -288,9 +288,7 @@
 													http://${fn:substring(log.logUri,0,20) }
 												</a>
 											</td>
-											<td title="${fns:escapeHtml(log.refer)}">
-												${fns:stringFormat(log.refer,30)}
-											</td>
+											<td>${log.refer }</td>
 											<td>${log.level}</td>
 											<td><c:if test="${log.fdType eq 0 }">
 													<spring:message code="black_block_list" />
@@ -323,11 +321,9 @@
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<%-- <td title="${fns:escapeHtml(log.addrList)}">
-												${fns:stringFormat(log.addrList,30)}
-											</td> --%>
-											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
-											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
+											<%-- <td>${log.addrList }</td> --%>
+											<td>${log.serverLocate }</td>
+											<td>${log.clientLocate }</td>
 										</tr>
 									</c:forEach>
 								</tbody>
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -227,9 +227,7 @@ $(document).ready(function(){
 													http://${fn:substring(log.logUri,0,20) }
 												</a>
 											</td>
-											<td title="${fns:escapeHtml(log.refer)}">
-												${fns:stringFormat(log.refer,30)}
-											</td>
+											<td>${log.refer }</td>
 											<td>${log.level }</td>
 											<td>
 												<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list" /></c:if> 
@@ -260,11 +258,9 @@ $(document).ready(function(){
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<%-- <td title="${fns:escapeHtml(log.addrList)}">
-												${fns:stringFormat(log.addrList,30)}
-											</td> --%>
-											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
-											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
+											<%-- <td>${log.addrList }</td> --%>
+											<td>${log.serverLocate }</td>
+											<td>${log.clientLocate }</td>
 										</tr>
 									</c:forEach>
 							</tbody>
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -227,9 +227,7 @@ $(document).ready(function(){
 													http://${fn:substring(log.logUri,0,20) }
 												</a>
 											</td>
-											<td title="${fns:escapeHtml(log.refer)}">
-												${fns:stringFormat(log.refer,30)}
-											</td>
+											<td>${log.refer }</td>
 											<td>${log.level}</td>
 											<td><c:if test="${log.fdType eq 0 }">
 													<spring:message code="black_block_list" />
@@ -262,11 +260,9 @@ $(document).ready(function(){
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<%-- <td title="${fns:escapeHtml(log.addrList)}">
-												${fns:stringFormat(log.addrList,30)}
-											</td> --%>
-											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
-											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
+											<%-- <td>${log.addrList }</td> --%>
+											<td>${log.serverLocate }</td>
+											<td>${log.clientLocate }</td>
 										</tr>
 									</c:forEach>
 							</tbody>
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -180,10 +180,10 @@ $(document).ready(function(){
 									<th><spring:message code='called_account'/></th>
 									<th><spring:message code='calling_number'/></th>
 									<th><spring:message code='called_number'/></th>
-									<th><spring:message code='from_to_store_ip'/></th>
+									<%-- <th><spring:message code='from_to_store_ip'/></th>
 									<th><spring:message code='from_to_store_url'/></th>
 									<th><spring:message code='to_from_store_ip'/></th>
-									<th><spring:message code='to_from_store_url'/></th>
+									<th><spring:message code='to_from_store_url'/></th> --%>
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='log_uri'/></th>
 									<th><spring:message code='harm_level'/></th>
@@ -196,8 +196,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='deviceid'/></th>
-									<th><spring:message code='direct'/></th>
+									<%-- <th><spring:message code='deviceid'/></th>
+									<th><spring:message code='direct'/></th> --%>
 									<th><spring:message code='stream_type'/></th>
 									<%-- <th><spring:message code='nest_addr_list'/></th> --%>
 									<th><spring:message code='server_locate'/></th>
@@ -228,14 +228,14 @@ $(document).ready(function(){
 									
 									<td>${log.duation}</td>
 									<td>${log.voipProtocol}</td>
-									<td title="${fns:escapeHtml(log.callingAccount)}">${fn:substring(log.callingAccount,0,30) }</td>
-									<td title="${fns:escapeHtml(log.calledAccount)}">${fn:substring(log.calledAccount,0,30) }</td>
-									<td title="${fns:escapeHtml(log.callingNumber)}">${fn:substring(log.callingNumber,0,30) }</td>
-									<td title="${fns:escapeHtml(log.calledNumber)}">${fn:substring(log.calledNumber,0,30) }</td>
+									<td>${log.callingAccount }</td>
+									<td>${log.calledAccount }</td>
+									<td>${log.callingNumber }</td>
+									<td>${log.calledNumber }</td>
 									<%-- <td>${log.fromToStoreIp}</td>
-									<td title="${fns:escapeHtml(log.fromToStoreUrl)}">${fn:substring(log.fromToStoreUrl,0,30) }</td>
+									<td>${log.fromToStoreUrl }</td>
 									<td>${log.toFromStoreIp}</td>
-									<td title="${fns:escapeHtml(log.toFromStoreUrl)}">${fn:substring(log.toFromStoreUrl,0,30) }</td> --%>
+									<td>${log.toFromStoreUrl }</td> --%>
 									<td>${log.pid}</td>
 									<td>
 										<c:if test="${fn:startsWith(log.logUri, 'http')}">
@@ -244,8 +244,9 @@ $(document).ready(function(){
 										<c:if test="${!fn:startsWith(log.logUri, 'http')}">
 											<c:set var="logUri" value="http://${log.logUri }"/>
 										</c:if>
-										<a target="_blank" href='${fns:escapeHtml(logUri)}' title="${fns:escapeHtml(logUri)}">
-											${fns:stringFormat(logUri,30)}
+										<a href="${logUri}" target="_blank" data-original-title="${logUri}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fn:substring(logUri,0,20) }
 										</a>
 									</td>
 									<td>${log.level}</td>
@@ -278,7 +279,7 @@ $(document).ready(function(){
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<%-- <td title="${fns:escapeHtml(log.addrList)}">${fns:stringFormat(log.addrList,30)}</td> --%>
+									<%-- <td>${log.addrList}</td> --%>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
 								</tr>
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -226,11 +226,8 @@ $(document).ready(function(){
 									
 									<td>${log.duation}</td>
 									<td>${log.voipProtocol}</td>
-									<td title="${fns:escapeHtml(log.callingAccount)}">
-										${fns:stringFormat(log.callingAccount,30)}
-									</td>
-									<td title="${fns:escapeHtml(log.calledAccount)}">
-										${fns:stringFormat(log.calledAccount,30)}
+									<td>${log.callingAccount }</td>
+									<td>${log.calledAccount }
 									</td>
 									<td>${log.callingNumber}</td>
 									<td>${log.calledNumber}</td>
@@ -275,8 +272,8 @@ $(document).ready(function(){
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-<%-- 									<td title="${fns:escapeHtml(log.addrList)}"> --%>
-<%-- 										${fns:stringFormat(log.addrList,30)} --%>
+<%-- 									<td> --%>
+<%-- 										${log.addrList } --%>
 <!-- 									</td> -->
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -226,12 +226,8 @@ $(document).ready(function(){
 									
 									<td>${log.duation}</td>
 									<td>${log.voipProtocol}</td>
-									<td title="${fns:escapeHtml(log.callingAccount)}">
-										${fns:stringFormat(log.callingAccount,30)}
-									</td>
-									<td title="${fns:escapeHtml(log.calledAccount)}">
-										${fns:stringFormat(log.calledAccount,30)}
-									</td>
+									<td>${log.callingAccount }</td>
+									<td>${log.calledAccount }</td>
 									<td>${log.callingNumber}</td>
 									<td>${log.calledNumber}</td>
 <%-- 									<td>${log.fromToStoreIp}</td> --%>
@@ -275,9 +271,7 @@ $(document).ready(function(){
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<%-- <td title="${fns:escapeHtml(log.addrList)}">
-										${fns:stringFormat(log.addrList,30)}
-									</td> --%>
+									<%-- <td>${log.addrList }</td> --%>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
 								</tr>
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -251,11 +251,9 @@ $(document).ready(function(){
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-<%-- 									<td title="${fns:escapeHtml(log.addrList)}"> --%>
-<%-- 										${fns:stringFormat(log.addrList,30)} --%>
-<!-- 									</td> -->
-									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
-									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
+									<%-- <td>${log.addrList }</td> --%>
+									<td>${log.serverLocate }</td>
+									<td>${log.clientLocate }</td>
 								</tr>
 							</c:forEach>
 							</tbody>
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -235,11 +235,9 @@
 													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<%-- <td title="${fns:escapeHtml(log.addrList)}">
-												${fns:stringFormat(log.addrList,30)}
-											</td> --%>
-											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
-											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
+											<%-- <td>${log.addrList }</td> --%>
+											<td>${log.serverLocate }</td>
+											<td>${log.clientLocate }</td>
 										</tr>
 									</c:forEach>
 								</tbody>
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -216,21 +216,11 @@ $(document).ready(function(){
 										</c:forEach>
 									</td>
 									
-									<%-- <td title="${fns:escapeHtml(log.version)}">
-										${fns:stringFormat(log.version,30)}
-									</td> --%>
-									<td title="${fns:escapeHtml(log.hostKey)}">
-										${fns:stringFormat(log.hostKey,30)}
-									</td>
-									<%-- <td title="${fns:escapeHtml(log.hostCookie)}">
-										${fns:stringFormat(log.hostCookie,30)}
-									</td>
-									<td title="${fns:escapeHtml(log.encryptMode)}">
-										${fns:stringFormat(log.encryptMode,30)}
-									</td>
-									<td title="${fns:escapeHtml(log.mac)}">
-										${fns:stringFormat(log.mac,30)}
-									</td> --%>
+									<%-- <td>${log.version }</td> --%>
+									<td>${log.hostKey }</td>
+									<%-- <td>${log.hostCookie }</td>
+									<td>${log.encryptMode }</td>
+									<td>${log.mac }</td> --%>
 									<%-- <td>
 										<c:if test="${log.tunnelType==1}">SSH</c:if>
 										<c:if test="${log.tunnelType==2}">SSHD</c:if>
@@ -259,11 +249,9 @@ $(document).ready(function(){
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<%-- <td title="${fns:escapeHtml(log.addrList)}">
-										${fns:stringFormat(log.addrList,30)}
-									</td> --%>
-									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
-									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
+									<%-- <td>${log.addrList }</td> --%>
+									<td>${log.serverLocate }</td>
+									<td>${log.clientLocate }</td>
 								</tr>
 							</c:forEach>
 							</tbody>
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -214,18 +214,10 @@
 												</c:forEach>
 											</td>
 											
-											<td title="${fns:escapeHtml(log.version)}">
-												${fns:stringFormat(log.version,30)}
-											</td>
-											<td title="${fns:escapeHtml(log.sni)}">
-												${fns:stringFormat(log.sni,30)}
-											</td>
-											<td title="${fns:escapeHtml(log.san)}">
-												${fns:stringFormat(log.san,30)}
-											</td>
-											<td title="${fns:escapeHtml(log.cn)}">
-												${fns:stringFormat(log.cn,30)}
-											</td>
+											<td>${log.version }</td>
+											<td>${log.sni }</td>
+											<td>${log.san }</td>
+											<td>${log.cn }</td>
 											
 											<td>${log.capIp}</td>
 											<td>${log.transProto }</td>
@@ -249,11 +241,9 @@
 													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<%-- <td title="${fns:escapeHtml(log.addrList)}">
-												${fns:stringFormat(log.addrList,30)}
-											</td> --%>
-											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
-											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
+											<%-- <td>${log.addrList }</td> --%>
+											<td>${log.serverLocate }</td>
+											<td>${log.clientLocate }</td>
 										</tr>
 									</c:forEach>
 								</tbody>
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -180,7 +180,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td title="${fns:escapeHtml(_log.url)}">${fns:stringFormat(_log.url,30)}</td>
+									<td>${_log.url }</td>
 									<td>${_log.capIp }</td>
 									<td>${_log.transProto }</td>
 									<td>${_log.dIp }</td>
@@ -202,9 +202,9 @@
 											<c:if test="${streamType.itemCode eq _log.streamDir}">${streamType.itemValue}</c:if>
 					                	</c:forEach>
 									</td>
-									<%-- <td title="${fns:escapeHtml(_log.addrList)}">${fns:stringFormat(_log.addrList,30)}</td> --%>
-									<td title="${_log.serverLocate}">${fns:abbr(_log.serverLocate,20)}</td>
-									<td title="${_log.clientLocate}">${fns:abbr(_log.clientLocate,20)}</td>
+									<%-- <td>${_log.addrList }</td> --%>
+									<td>${_log.serverLocate }</td>
+									<td>${_log.clientLocate }</td>
 								</tr>
 							</c:forEach>
 						</tbody>