From 0b8c195b1bc227ad1b9aa06f1550ce9c2c175255 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Mon, 24 Dec 2018 12:41:05 +0600
Subject: [PATCH] =?UTF-8?q?bgp=E5=92=8Cdns=E7=AD=96=E7=95=A5=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8E=BB=E6=8E=89=E9=BB=91=E5=90=8D=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp   | 5 +++--
 src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp   | 6 +++---
 src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp | 1 +
 src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 2b491218c..b7548e56d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -140,6 +140,7 @@
 							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
+							<input type="hidden" name="doBlackList" value="1">
 							<input type="hidden" id="serviceId" name="serviceId"
 								value="${_cfg.serviceId}">
 
@@ -207,7 +208,7 @@
 											</c:forEach>
 										</div>
 									</div>
-									<div class="col-md-6 doBalckList">
+									<%-- <div class="col-md-6 doBalckList">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
 											<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
@@ -226,7 +227,7 @@
 													
 											</c:forEach>
 										</div>
-									</div>
+									</div> --%>
 								</div>
 								<!-- dolog end-->
 								
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 5a359ae09..02a770fec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -371,7 +371,7 @@
 									<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="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="whether_area_block" ><spring:message code="whether_area_block"/></th>
 									<th column="letter" ><spring:message code="letter"/></th>
@@ -418,13 +418,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</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>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index 9f2538bb9..fff8b3634 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -154,6 +154,7 @@
 							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
+							<input type="hidden" name="doBlackList" value="1">
 							<input type="hidden" id="serviceId" name="serviceId"
 								value="${_cfg.serviceId}">
 
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index b52d159ed..3bf6899de 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -370,7 +370,7 @@
 								    <th column="policy_name"  ><spring:message code="policy_name"/></th>
 									<th column="is_audit"  ><spring:message code="is_audit"/></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="whether_area_block"  ><spring:message code="whether_area_block"/></th>
 									<th column="letter"  ><spring:message code="letter"/></th>
@@ -422,13 +422,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</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>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>