gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangxin
2018-09-11 16:52:51 +08:00
parent 300634cce8 79c45d097d
commit 66f1ff33f1
6 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/messages/message_en.properties
View File

@@ -531,7 +531,7 @@ file=File
select_file=Please Select Upload File select_file=Please Select Upload File
sample_file=Sample File sample_file=Sample File
sample_sign=Sample Sign sample_sign=Sample Sign
off=off off=OFF
on=on on=on
click_detail=Please click the "view details" button to send the detailed error message to the system Management clerk. Thank you! click_detail=Please click the "view details" button to send the detailed error message to the system Management clerk. Thank you!
return_lastpage=Return to the last page return_lastpage=Return to the last page
@@ -980,7 +980,7 @@ day_of_month_report=Daily Report
month_report=Monthly Report month_report=Monthly Report
label_report=Tag Report label_report=Tag Report
attr_type_report=Attribute Report attr_type_report=Attribute Report
lwhh_report=Official Letter Report lwhh_report=icial Letter Report
src_ip_report=Src IP Report src_ip_report=Src IP Report
dest_ip_report=Dest IP Report dest_ip_report=Dest IP Report
isp_report=Entrance Report isp_report=Entrance Report

8
src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
View File

@@ -211,7 +211,11 @@ $(document).ready(function(){
</td> </td>
<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" <a href="${log.ftpUrl}" data-original-title="${log.ftpUrl}" target="_blank"
class="tooltips" data-flag="false" data-html="true" data-placement="top"> class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(log.ftpUrl,0,20) } ${fn:substring(log.ftpUrl,0,20) }
@@ -222,7 +226,7 @@ $(document).ready(function(){
class="tooltips" data-flag="false" data-html="true" data-placement="top"> class="tooltips" data-flag="false" data-html="true" data-placement="top">
ftp://${fn:substring(log.ftpUrl,0,20) } ftp://${fn:substring(log.ftpUrl,0,20) }
</a> </a>
</c:if> </c:if> --%>
</td> </td>
<td> <td>

7
src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
View File

@@ -172,7 +172,7 @@
<th><spring:message code="found_time"/></th> <th><spring:message code="found_time"/></th>
<th><spring:message code="entrance"/></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_key"/></th>
<th><spring:message code="req_hdr_file"/></th> <th><spring:message code="req_hdr_file"/></th>
<th><spring:message code="req_body_key"/></th> <th><spring:message code="req_body_key"/></th>
@@ -226,12 +226,13 @@
</td> </td>
<td> <td>
<c:if test="${fn:startsWith(log.url, 'http')}"> ${log.url}
<%-- <c:if test="${fn:startsWith(log.url, 'http')}">
${log.url} ${log.url}
</c:if> </c:if>
<c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}"> <c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}">
http://${log.url} http://${log.url}
</c:if> </c:if> --%>
</td> </td>
<td>${log.reqHdrKey }</td> <td>${log.reqHdrKey }</td>
<td> <td>

7
src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
View File

@@ -151,7 +151,7 @@
<th><spring:message code="cfg_id"/></th> <th><spring:message code="cfg_id"/></th>
<th><spring:message code="found_time"/></th> <th><spring:message code="found_time"/></th>
<th><spring:message code="entrance"/></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="clj_ip"/></th>
<th><spring:message code="protocol"/></th> <th><spring:message code="protocol"/></th>
<th><spring:message code="server_ip"/></th> <th><spring:message code="server_ip"/></th>
@@ -186,12 +186,13 @@
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:if test="${fn:startsWith(log.url, 'http')}"> ${log.url}
<%-- <c:if test="${fn:startsWith(log.url, 'http')}">
${log.url} ${log.url}
</c:if> </c:if>
<c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}"> <c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}">
http://${log.url} http://${log.url}
</c:if> </c:if> --%>
</td> </td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td> <td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td>${log.transProto }</td> <td>${log.transProto }</td>

7
src/main/webapp/static/global/css/page.css
View File

@@ -82,4 +82,11 @@
padding:0; padding:0;
margin:-3px 0 0 0; margin:-3px 0 0 0;
text-align:center; text-align:center;
}
.keyword-disinline {
width: 1130px;
display: block;
word-break: break-all;
word-wrap: break-word;
white-space: normal;
} }

4
src/main/webapp/static/global/scripts/common.js
View File

@@ -1,5 +1,4 @@
$(function(){ $(function(){
//扩展jquery，增加全局函数 //扩展jquery，增加全局函数
$.ipcommon=function(){ $.ipcommon=function(){
return {}; return {};
@@ -465,6 +464,9 @@ $(function(){
}) })
}); });
window.onload=function(){ window.onload=function(){
$("span[id^=open]").click(function(){
$("div[class='content']").find("label:lt(2)").addClass("keyword-disinline");//page.css 关键词换行
})
// 配置id的搜索下拉框选择切换 // 配置id的搜索下拉框选择切换
if ($("#searchForm #seltype").val() == 'compileId') { if ($("#searchForm #seltype").val() == 'compileId') {
$("#searchForm #intype").addClass("number"); $("#searchForm #intype").addClass("number");