From 38fda1a98dfd41dd81e9ef64a327c81fea8e2f91 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Wed, 1 Aug 2018 13:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/log/ntc/l2tpLogList.jsp     |  8 ++++++--
 .../WEB-INF/views/log/ntc/mmPicIpList.jsp     |  8 ++++++--
 .../WEB-INF/views/log/ntc/mmPicUrlList.jsp    |  8 ++++++--
 .../views/log/ntc/mmSampleAudioList.jsp       |  8 ++++++--
 .../WEB-INF/views/log/ntc/mmSamplePicList.jsp |  8 ++++++--
 .../views/log/ntc/mmSampleVideoList.jsp       |  8 ++++++--
 .../WEB-INF/views/log/ntc/pptpLogList.jsp     |  4 +++-
 .../WEB-INF/views/log/ntc/sslLogList.jsp      | 20 ++++++++++++++-----
 8 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 0d4ddcc95..4a0068efb 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -199,7 +199,9 @@
 												<c:if test="${log.encryptMode eq 1}">IPSEC</c:if>
 												<c:if test="${log.encryptMode eq 2}">无</c:if>
 											</td>
-											<td>${log.chapName}</td>
+											<td title="${fns:escapeHtml(log.chapName)}">
+												${fns:stringFormat(log.chapName,30)}
+											</td>
 											
 											<td>${log.capIp}</td>
 											<td>${log.transProto }</td>
@@ -223,7 +225,9 @@
 													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.addrList}</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>
 										</tr>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index d5058de5f..d35ba21df 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -213,7 +213,9 @@ $(document).ready(function(){
 											http://${fn:substring(log.logUri,0,20) }
 										</a>
 									</td>
-									<td>${log.refer}</td>
+									<td title="${fns:escapeHtml(log.refer)}">
+										${fns:stringFormat(log.refer,30)}
+									</td>
 									<td>${log.level}</td>
 									<td>
 										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
@@ -244,7 +246,9 @@ $(document).ready(function(){
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<td>${log.addrList}</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>
 								</tr>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 149f5d028..b4152f37e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -213,7 +213,9 @@ $(document).ready(function(){
 											http://${fn:substring(log.logUri,0,20) }
 										</a>
 									</td>
-									<td>${log.refer}</td>
+									<td title="${fns:escapeHtml(log.refer)}">
+										${fns:stringFormat(log.refer,30)}
+									</td>
 									<td>${log.level}</td>
 									<td>
 										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
@@ -244,7 +246,9 @@ $(document).ready(function(){
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<td>${log.addrList}</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>
 								</tr>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 636b64a1c..eca3de8e9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -281,7 +281,9 @@
 													http://${fn:substring(log.logUri,0,20) }
 												</a>
 											</td>
-											<td>${log.refer}</td>
+											<td title="${fns:escapeHtml(log.refer)}">
+												${fns:stringFormat(log.refer,30)}
+											</td>
 											<td>${log.level}</td>
 											<td><c:if test="${log.fdType eq 0 }">
 													<spring:message code="black_block_list" />
@@ -314,7 +316,9 @@
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<td>${log.addrList}</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>
 										</tr>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 104992cd6..0ebb758a8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -213,7 +213,9 @@ $(document).ready(function(){
 													http://${fn:substring(log.logUri,0,20) }
 												</a>
 											</td>
-											<td>${log.refer}</td>
+											<td title="${fns:escapeHtml(log.refer)}">
+												${fns:stringFormat(log.refer,30)}
+											</td>
 											<td>${log.level}</td>
 											<td><c:if test="${log.fdType eq 0 }">
 													<spring:message code="black_block_list" />
@@ -246,7 +248,9 @@ $(document).ready(function(){
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<td>${log.addrList}</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>
 										</tr>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 4ea9143e4..fb567fa6d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -213,7 +213,9 @@ $(document).ready(function(){
 													http://${fn:substring(log.logUri,0,20) }
 												</a>
 											</td>
-											<td>${log.refer}</td>
+											<td title="${fns:escapeHtml(log.refer)}">
+												${fns:stringFormat(log.refer,30)}
+											</td>
 											<td>${log.level}</td>
 											<td><c:if test="${log.fdType eq 0 }">
 													<spring:message code="black_block_list" />
@@ -246,7 +248,9 @@ $(document).ready(function(){
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<td>${log.addrList}</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>
 										</tr>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index 07967fe4a..e5b309913 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -221,7 +221,9 @@
 													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.addrList}</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>
 										</tr>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index 9a0d61558..605530b66 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -200,10 +200,18 @@
 											<td>${log.foundTime }</td>
 											<td>${log.entranceId }</td>
 											
-											<td>${log.version}</td>
-											<td>${log.sni}</td>
-											<td>${log.san}</td>
-											<td>${log.ca}</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.ca)}">
+												${fns:stringFormat(log.ca,30)}
+											</td>
 											
 											<td>${log.capIp}</td>
 											<td>${log.transProto }</td>
@@ -227,7 +235,9 @@
 													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.addrList}</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>
 										</tr>