From 114c643cd4a414b4f389281319f27978f07170ac Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 11 Sep 2018 15:26:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A4=84=E7=90=86=E9=85=8D=E7=BD=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=85=B3=E9=94=AE=E5=AD=97=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E9=97=AE=E9=A2=98=202.=E5=A4=84=E7=90=86=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97url=20=E5=89=8D=E7=BC=80http=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88http,https,ftp=E7=9B=B4=E6=8E=A5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD=E6=B7=BB=E5=8A=A0http=EF=BC=89?=
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     | 8 ++++++--
 src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp    | 7 ++++---
 src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp | 7 ++++---
 src/main/webapp/static/global/css/page.css            | 7 +++++++
 src/main/webapp/static/global/scripts/common.js       | 4 +++-
 5 files changed, 24 insertions(+), 9 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 139ab22b2..096aed874 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -211,7 +211,11 @@ $(document).ready(function(){
 									</td>
 									
 									<td>
-									<c:if test="${fn:startsWith(log.ftpUrl, 'ftp')}">
+										<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,42) }
+										</a>
+									<%-- <c:if test="${fn:startsWith(log.ftpUrl, 'ftp')}">
 										<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) }
@@ -222,7 +226,7 @@ $(document).ready(function(){
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											ftp://${fn:substring(log.ftpUrl,0,20) }
 										</a>
-									</c:if>	
+									</c:if> --%>	
 									</td>
 									
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index 75bc236f0..73b34491d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -172,7 +172,7 @@
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
 								
-								<th>URL</th>
+								 <th>  URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> 
 								<th><spring:message code="req_hdr_key"/></th>
 								<th><spring:message code="req_hdr_file"/></th>
 								<th><spring:message code="req_body_key"/></th>
@@ -226,12 +226,13 @@
 									</td>
 									
 									<td>
-										<c:if test="${fn:startsWith(log.url, 'http')}">
+										${log.url}
+										<%-- <c:if test="${fn:startsWith(log.url, 'http')}">
 													${log.url}
 												</c:if>
 												<c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}">
 													http://${log.url}
-												</c:if>
+												</c:if> --%>
 									</td>
 									<td>${log.reqHdrKey }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index 3d09f9605..6c2945aaf 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -151,7 +151,7 @@
 								<th><spring:message code="cfg_id"/></th>
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
-								<th>URL</th>
+								<th> URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>
 								<th><spring:message code="server_ip"/></th>
@@ -186,12 +186,13 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${fn:startsWith(log.url, 'http')}">
+									${log.url}
+										<%-- <c:if test="${fn:startsWith(log.url, 'http')}">
 											${log.url}
 										</c:if>
 										<c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}">
 											http://${log.url}
-										</c:if>
+										</c:if> --%>
 									</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto }</td>
diff --git a/src/main/webapp/static/global/css/page.css b/src/main/webapp/static/global/css/page.css
index 51f999fca..00a6fe12b 100644
--- a/src/main/webapp/static/global/css/page.css
+++ b/src/main/webapp/static/global/css/page.css
@@ -82,4 +82,11 @@
 	padding:0;
 	margin:-3px 0 0 0;
 	text-align:center;
+}
+.keyword-disinline {
+	width: 1130px;
+	display: block;
+	word-break: break-all;
+	word-wrap: break-word;
+	white-space: normal;
 }
\ No newline at end of file
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 3c0e70c5d..670352f50 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1,5 +1,4 @@
 $(function(){
-	
 	//扩展jquery，增加全局函数
 	$.ipcommon=function(){
 		return {};
@@ -465,6 +464,9 @@ $(function(){
    })
 });
 window.onload=function(){
+	$("span[id^=open]").click(function(){
+		$("div[class='content']").find("label:lt(2)").addClass("keyword-disinline");//page.css 关键词换行
+	})
 	// 配置id的搜索下拉框选择切换
 	if ($("#searchForm #seltype").val() == 'compileId') {
 		$("#searchForm #intype").addClass("number");