Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
wangxin
2018-09-11 16:52:51 +08:00
6 changed files with 26 additions and 11 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>