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-06-29 16:36:36 +08:00
parent 06ad88cde7 6220b1bdc9
commit bf3d6900d5
8 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
View File

@@ -263,6 +263,7 @@
<th><spring:message code="digest"/></th>
<th><spring:message code="raw_len"/></th>
<th><spring:message code="cfds_level"/></th>
<th><spring:message code="file_url"/></th>
<th><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th>
@@ -295,6 +296,12 @@
</td>
<td>${indexCfg.rawLen }</td>
<td>${indexCfg.cfdsLevel }</td>
<td>
<a href="${indexCfg.fileUrl }" target="_blank" data-original-title="${indexCfg.fileUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(indexCfg.fileUrl,0,20) }
</a>
</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.action }">

45
src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
View File

@@ -27,7 +27,7 @@
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='ip_type'/>:</label>
<label>
@@ -37,7 +37,7 @@
</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='ip_pattern'/>:</label>
<label>
@@ -47,7 +47,7 @@
</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='client_ip'/>:</label>
<label>
@@ -57,7 +57,7 @@
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='port_pattern'/>:</label>
<label>
@@ -67,24 +67,24 @@
</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='direction'/>:</label>
<label>
@@ -94,7 +94,7 @@
</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='protocol'/>:</label>
<label>
@@ -114,12 +114,12 @@
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='district' />:</label><label>${cfg.district }</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='keywords' />:</label>
<label>
@@ -127,7 +127,7 @@
</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='expression_type' />:</label>
<label>
@@ -141,7 +141,7 @@
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
@@ -151,7 +151,7 @@
</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
@@ -161,7 +161,7 @@
</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label></label><label></label>
</div>
@@ -176,12 +176,12 @@
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label>
</div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='cfds_level' />:</label>
<label>
@@ -191,7 +191,7 @@
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='digest' />:</label>
<a href="javascript:;" data-original-title="${cfg.digest}"
@@ -200,6 +200,15 @@
</a>
</div>
</div>
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='file_url' />:</label>
<a href="${cfg.fileUrl }" target="_blank" data-original-title="${cfg.fileUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.fileUrl,0,100) }
</a>
</div>
</div>
</div>
</div>
</c:if>