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

1.增加列表缺少字段导出相应修改 2.增加分组域配置批量删除功能 3.修复分组域配置导入不下发bug

Browse Source
This commit is contained in:
zhangwenqing
2019-06-19 16:15:21 +08:00
parent 5f7eb1ec43
commit bb13d8bbec
26 changed files with 882 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/webapp/WEB-INF/views/basics/domainCommGroupList.jsp
View File

@@ -113,8 +113,14 @@
top.$('.jbox-body .jbox-icon').css('top','55px');
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
/* top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; */
}
}
@@ -265,9 +271,10 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.cfg_desc" column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.group_id" column="groupId"><spring:message code="group_name"/></th>
<th class="sort-column cfg_keywords"><spring:message code="key_word"/></th>
<th column="expression_type" ><spring:message code="expression_type"/></th>
<th column="match_method" ><spring:message code="match_method"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column create_time"><spring:message code="config_time"/></th>
@@ -288,6 +295,13 @@
</c:forEach>
</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq cfg.exprType}">
<spring:message code="${exprTypeC.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq cfg.matchMethod}">

75
src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp
View File

@@ -110,8 +110,14 @@
top.$('.jbox-body .jbox-icon').css('top','55px');
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
/* top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; */
}
}
@@ -296,13 +302,22 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.cfg_desc" column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.group_id" column="groupId" ><spring:message code="group_name"/></th>
<th column="ip_type" ><spring:message code="ip_type"/></th>
<th column="src_ip_pattern" ><spring:message code="src_ip_pattern"/></th>
<th column="client_ip" ><spring:message code="client_ip"/></th>
<th column="dest_ip_pattern" ><spring:message code="dest_ip_pattern"/></th>
<th column="server_ip" ><spring:message code="server_ip"/></th>
<th column="protocol" ><spring:message code="protocol"/></th>
<th column="src_port_pattern" ><spring:message code="src_port_pattern"/></th>
<th column="client_port" ><spring:message code="client_port"/></th>
<th column="dest_port_pattern" ><spring:message code="dest_port_pattern"/></th>
<th column="server_port" ><spring:message code="server_port"/></th>
<th column="direction" ><spring:message code="direction"/></th>
<th column="protocol" ><spring:message code="protocol"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
@@ -323,24 +338,58 @@
</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</td>
<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol==protocolC.itemCode }">
<spring:message code="${protocolC.itemValue }"/>
<c:if test="${cfg.ipType == ipTypeC.itemCode}">
<spring:message code="${ipTypeC.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.srcIpPattern == ipPatternC.itemCode}">
<spring:message code="${ipPatternC.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.destIpPattern == ipPatternC.itemCode}">
<spring:message code="${ipPatternC.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
<td>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.srcPortPattern == portPatternC.itemCode}">
<spring:message code="${portPatternC.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td>${cfg.srcPort }</td>
<td>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.destPortPattern == portPatternC.itemCode}">
<spring:message code="${portPatternC.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td>${cfg.destPort }</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction==directionC.itemCode}">
<spring:message code="${directionC.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol==protocolC.itemCode }">
<spring:message code="${protocolC.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>

20
src/main/webapp/WEB-INF/views/basics/scriberidCommGroupList.jsp
View File

@@ -113,8 +113,14 @@
top.$('.jbox-body .jbox-icon').css('top','55px');
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
/* top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; */
}
}
@@ -265,9 +271,10 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.cfg_desc" column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.group_id" column="groupId"><spring:message code="group_name"/></th>
<th class="sort-column cfg_keywords"><spring:message code="key_word"/></th>
<th column="expression_type" ><spring:message code="expression_type"/></th>
<th column="match_method" ><spring:message code="match_method"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column create_time"><spring:message code="config_time"/></th>
@@ -288,6 +295,13 @@
</c:forEach>
</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq cfg.exprType}">
<spring:message code="${exprTypeC.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq cfg.matchMethod}">

20
src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp
View File

@@ -108,8 +108,14 @@
top.$('.jbox-body .jbox-icon').css('top','55px');
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
/* top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; */
}
}
@@ -260,9 +266,10 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.cfg_desc" column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.group_id" column="groupId"><spring:message code="group_name"/></th>
<th class="sort-column cfg_keywords"><spring:message code="key_word"/></th>
<th column="expression_type" ><spring:message code="expression_type"/></th>
<th column="match_method" ><spring:message code="match_method"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column create_time"><spring:message code="config_time"/></th>
@@ -283,6 +290,13 @@
</c:forEach>
</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq cfg.exprType}">
<spring:message code="${exprTypeC.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq cfg.matchMethod}">