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

bgp和dns策略业务去掉黑名单选项

Browse Source
This commit is contained in:
zhangwei
2018-12-24 12:41:05 +06:00
parent 91eb68785a
commit 0b8c195b1b
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
View File

@@ -140,6 +140,7 @@
<input type="hidden" name="cfgId" value="${_cfg.cfgId}"> <input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}"> <input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}"> <input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" name="doBlackList" value="1">
<input type="hidden" id="serviceId" name="serviceId" <input type="hidden" id="serviceId" name="serviceId"
value="${_cfg.serviceId}"> value="${_cfg.serviceId}">
@@ -207,7 +208,7 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <%-- <div class="col-md-6 doBalckList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
@@ -226,7 +227,7 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div> --%>
</div> </div>
<!-- dolog end--> <!-- dolog end-->

6
src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
View File

@@ -371,7 +371,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th> <%-- <th column="do_blacklist" ><spring:message code="do_blacklist"/></th> --%>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -418,13 +418,13 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <%-- <td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }"> <c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td> --%>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if> <c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

1
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -154,6 +154,7 @@
<input type="hidden" name="cfgId" value="${_cfg.cfgId}"> <input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}"> <input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}"> <input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" name="doBlackList" value="1">
<input type="hidden" id="serviceId" name="serviceId" <input type="hidden" id="serviceId" name="serviceId"
value="${_cfg.serviceId}"> value="${_cfg.serviceId}">

6
src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
View File

@@ -370,7 +370,7 @@
<th column="policy_name" ><spring:message code="policy_name"/></th> <th column="policy_name" ><spring:message code="policy_name"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th> <%-- <th column="do_blacklist" ><spring:message code="do_blacklist"/></th> --%>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -422,13 +422,13 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <%-- <td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }"> <c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td> --%>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if> <c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>