From d3f18c1fe8a0d7bc3cf24900af1761870e056be4 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Sat, 22 Dec 2018 12:55:24 +0600
Subject: [PATCH] =?UTF-8?q?ntc=E9=83=A8=E5=88=86=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=BB=91=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A1=B9=E5=8A=9F=E8=83=BD=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/configuration/BaseCfg.java |  8 +++++++
 .../java/com/nis/domain/maat/MaatCfg.java     |  5 ++++-
 .../web/dao/configuration/AsnPolicyCfgDao.xml | 12 ++++++++---
 .../web/dao/configuration/AvContentCfgDao.xml | 12 ++++++++---
 .../nis/web/dao/configuration/BgpCfgDao.xml   | 12 ++++++++---
 .../web/dao/configuration/CommonPolicyDao.xml | 13 +++++++++---
 .../ConfigSynchronizationDao.xml              |  8 ++++---
 .../dao/configuration/FileTransferCfgDao.xml  | 15 +++++++++----
 .../nis/web/dao/configuration/IpCfgDao.xml    | 16 +++++++++-----
 .../nis/web/dao/configuration/MailCfgDao.xml  | 12 ++++++++---
 .../web/dao/configuration/WebsiteCfgDao.xml   | 13 +++++++++---
 .../sql/20181222/add_doblacklist_column.sql   |  1 +
 .../views/cfg/av/contUrl/contUrlForm.jsp      | 20 ++++++++++++++++++
 .../views/cfg/av/contUrl/contUrlList.jsp      |  8 +++++++
 .../WEB-INF/views/cfg/av/voip/voipForm.jsp    | 20 ++++++++++++++++++
 .../WEB-INF/views/cfg/av/voip/voipList.jsp    |  8 +++++++
 .../views/cfg/fileTransfer/ftpForm.jsp        | 20 ++++++++++++++++++
 .../views/cfg/fileTransfer/ftpList.jsp        |  8 +++++++
 .../views/cfg/fileTransfer/p2pForm.jsp        | 20 ++++++++++++++++++
 .../views/cfg/fileTransfer/p2pList.jsp        |  8 +++++++
 .../WEB-INF/views/cfg/ipaddr/ipForm.jsp       | 20 ++++++++++++++++++
 .../WEB-INF/views/cfg/ipaddr/ipList.jsp       |  8 +++++++
 .../WEB-INF/views/cfg/mail/mailForm.jsp       | 20 ++++++++++++++++++
 .../WEB-INF/views/cfg/mail/mailList.jsp       |  8 +++++++
 .../WEB-INF/views/cfg/other/bgpForm.jsp       | 20 ++++++++++++++++++
 .../WEB-INF/views/cfg/other/bgpList.jsp       |  8 +++++++
 .../WEB-INF/views/cfg/website/dnsForm.jsp     | 21 +++++++++++++++++++
 .../WEB-INF/views/cfg/website/dnsList.jsp     |  8 +++++++
 .../WEB-INF/views/cfg/website/httpForm.jsp    | 20 ++++++++++++++++++
 .../WEB-INF/views/cfg/website/httpList.jsp    |  8 +++++++
 .../WEB-INF/views/cfg/website/sslForm.jsp     | 20 ++++++++++++++++++
 .../WEB-INF/views/cfg/website/sslList.jsp     |  8 +++++++
 .../views/cfg/whitelist/domainForm.jsp        | 20 ++++++++++++++++++
 .../views/cfg/whitelist/domainList.jsp        |  8 +++++++
 34 files changed, 405 insertions(+), 31 deletions(-)
 create mode 100644 src/main/resources/sql/20181222/add_doblacklist_column.sql

diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java
index 6e0acd247..dfbe2285c 100644
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java
@@ -261,6 +261,8 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 */
 	@ExcelField(title="do_log",dictType="DO_LOG",sort=30)
 	protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
+	@ExcelField(title="do_blacklist",dictType="DO_BLACKLIST",sort=31)
+	protected Integer doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
 	
 	protected Integer groupId;//仅用于copy属性使用
 	protected Integer regionId;//仅用于copy属性使用
@@ -964,5 +966,11 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setCancelRequestId(Integer cancelRequestId) {
 		this.cancelRequestId = cancelRequestId;
 	}
+	public Integer getDoBlackList() {
+		return doBlackList;
+	}
+	public void setDoBlackList(Integer doBlackList) {
+		this.doBlackList = doBlackList;
+	}
 	
 }
diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java
index f0a091425..bcbf489e0 100644
--- a/src/main/java/com/nis/domain/maat/MaatCfg.java
+++ b/src/main/java/com/nis/domain/maat/MaatCfg.java
@@ -561,6 +561,9 @@ public class MaatCfg implements Serializable {
 		this.areaEffectiveIds = areaEffectiveIds;
 	}
 	public Integer getDoBlackList() {
+		if(doBlackList==null){
+			doBlackList = 1;
+		}
 		return doBlackList;
 	}
 	public void setDoBlackList(Integer doBlackList) {
@@ -678,7 +681,7 @@ public class MaatCfg implements Serializable {
 	}
 	public void initDefaultValue() {
 		this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT;
-		this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
+//		this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
 		this.configPercent=Constants.MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT;
 		this.configOption=Constants.MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT;
 		this.startTime=new Date();
diff --git a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml
index 1ca23e1cd..d551d6440 100644
--- a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml
@@ -28,6 +28,7 @@
 	    <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
 	    <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
 	    <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
+	    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
 	  </resultMap>
  
   	<sql id="ConfigIndex_Column" >
@@ -35,7 +36,7 @@
 	    r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
 	    r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
 	    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.user_region1,
-	    r.user_region2,r.user_region3,r.user_region4,r.user_region5,r.do_log
+	    r.user_region2,r.user_region3,r.user_region4,r.user_region5,r.do_log,r.do_blacklist
 	  </sql>
    
     <select id="findPage" resultMap="CfgIndexInfoMap">
@@ -172,7 +173,8 @@
     user_region3,
     user_region4,
     user_region5,
-    do_log
+    do_log,
+    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -199,7 +201,8 @@
     	#{userRegion3,jdbcType=VARCHAR},
     	#{userRegion4,jdbcType=VARCHAR},
     	#{userRegion5,jdbcType=VARCHAR},
-    	#{doLog,jdbcType=INTEGER}
+    	#{doLog,jdbcType=INTEGER},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
     <update id="updateCfgIndexInfo" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
@@ -254,6 +257,9 @@
       </if>
       <if test="functionId != null" >
         function_id =  #{functionId,jdbcType=INTEGER},
+      </if>
+      <if test="doBlackList != null">
+      	do_blacklist = #{doBlackList,jdbcType=INTEGER},
       </if>
         user_region1 = #{userRegion1,jdbcType=VARCHAR},
         user_region2 = #{userRegion2,jdbcType=VARCHAR},
diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
index 0e0ae771d..e90559178 100644
--- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
@@ -24,6 +24,7 @@
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="AvVoipIpCfgMap" type="com.nis.domain.configuration.AvVoipIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -234,7 +235,7 @@
     r.CFG_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
     r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
-    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.do_log
+    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.do_log,r.do_blacklist
   </sql>
   <sql id="AvVoipIp_Column" >
     r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
@@ -743,7 +744,8 @@
     LABLE,
     AREA_EFFECTIVE_IDS,
     function_id,
-    do_log
+    do_log,
+    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -764,7 +766,8 @@
     	#{lable,jdbcType=VARCHAR},    
    	 	#{areaEffectiveIds,jdbcType=VARCHAR},
     	#{functionId,jdbcType=INTEGER},
-    	#{doLog,jdbcType=INTEGER}
+    	#{doLog,jdbcType=INTEGER},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert AV_VOIP_IP_CFG表信息 -->
@@ -1133,6 +1136,9 @@
       <if test="doLog != null" >
         do_log =  #{doLog,jdbcType=INTEGER},
       </if>
+      <if test="doBlackList != null">
+      	do_blacklist = #{doBlackList,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     <where>
diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
index ea4150a37..8e915f9af 100644
--- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
@@ -24,6 +24,7 @@
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -158,7 +159,7 @@
     a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
-    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log
+    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -360,7 +361,8 @@
     LABLE,
     AREA_EFFECTIVE_IDS,
     function_id,
-    do_log
+    do_log,
+    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -381,7 +383,8 @@
     	#{lable,jdbcType=VARCHAR},    
    	 	#{areaEffectiveIds,jdbcType=VARCHAR},
     	#{functionId,jdbcType=INTEGER},
-    	#{doLog,jdbcType=INTEGER}
+    	#{doLog,jdbcType=INTEGER},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert ip_port_cfg表信息 -->
@@ -629,6 +632,9 @@
       </if>
        <if test="doLog != null" >
         do_log =  #{doLog,jdbcType=INTEGER},
+      </if>
+       <if test="doBlackList != null" >
+        do_blacklist =  #{doBlackList,jdbcType=INTEGER},
       </if>
       </trim>
     </set>
diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
index 326f79570..411a2ca6d 100644
--- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
@@ -32,6 +32,7 @@
     <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
     <result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" />
     <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -131,7 +132,8 @@
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
-    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id
+    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id,
+    a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -372,7 +374,8 @@
     user_region4,
     user_region5,
     do_log,
-    source_compile_id
+    source_compile_id,
+    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -400,7 +403,8 @@
     	#{userRegion4,jdbcType=VARCHAR},
     	#{userRegion5,jdbcType=VARCHAR},
     	#{doLog,jdbcType=INTEGER},
-    	#{sourceCompileId,jdbcType=INTEGER}
+    	#{sourceCompileId,jdbcType=INTEGER},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
   
@@ -677,6 +681,9 @@
       </if>
       <if test="functionId != null" >
         function_id =  #{functionId,jdbcType=INTEGER},
+      </if>
+      <if test="doBlackList != null">
+      	do_blacklist = #{doBlackList,jdbcType=INTEGER},
       </if>
         user_region1 = #{userRegion1,jdbcType=VARCHAR},
         user_region2 = #{userRegion2,jdbcType=VARCHAR},
diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
index b68e07106..d18cf1531 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
@@ -36,6 +36,7 @@
     <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
     <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="AppFeatureIndexMap" type="com.nis.domain.configuration.AppFeatureIndex" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -374,6 +375,7 @@
     <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
     <result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" />
     <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -502,6 +504,7 @@
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="AvFileSampleMap" type="com.nis.domain.configuration.AvFileSampleCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -734,14 +737,14 @@
     a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
 	a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
 	a.area_effective_ids,a.function_id,a.do_log,a.dns_strategy_id,a.user_region1,a.user_region2,
-	a.user_region3,a.user_region4,a.user_region5
+	a.user_region3,a.user_region4,a.user_region5,a.do_blacklist
   </sql>
   <sql id="DdosIpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
 	a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
 	a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.pps_threadshold,
-    a.antiddos_protocol,a.bps_threadshold
+    a.antiddos_protocol,a.bps_threadshold,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
     a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
@@ -780,7 +783,6 @@
   a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
 	a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
 	a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2,
-	a.user_region3,a.user_region4,a.user_region5,a.raw_len,a.digest,a.cfds_level,a.file_url
   </sql>
   <sql id="PxyObjTrustedCaCertColumns">
 		 a.cfg_id,a.cfg_desc
diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
index 5a81dd91a..ee96246fa 100644
--- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
@@ -29,6 +29,7 @@
     <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
     <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
     <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -167,7 +168,8 @@
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,
-    a.user_region1,a.user_region2,a.user_region3,a.user_region4,a.user_region5
+    a.user_region1,a.user_region2,a.user_region3,a.user_region4,a.user_region5,
+    a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -375,7 +377,8 @@
 	    user_region2,
 	    user_region3,
 	    user_region4,
-	    user_region5
+	    user_region5,
+	    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -401,7 +404,8 @@
     	#{userRegion2,jdbcType=VARCHAR},
     	#{userRegion3,jdbcType=VARCHAR},
     	#{userRegion4,jdbcType=VARCHAR},
-    	#{userRegion5,jdbcType=VARCHAR}
+    	#{userRegion5,jdbcType=VARCHAR},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert ip_port_cfg表信息 -->
@@ -536,7 +540,10 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="doLog != null" >
-      	do_log = #{doLog,jdbcType=INTEGER}
+      	do_log = #{doLog,jdbcType=INTEGER},
+      </if>
+      <if test="doBlackList != null">
+      	do_blacklist = #{doBlackList,jdbcType=INTEGER}
       </if>
       </trim>
     </set>
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index fbcda475f..b8ea447a3 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -74,6 +74,7 @@
     <result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" />
     <result column="dns_strategy_name" property="dnsStrategyName" jdbcType="VARCHAR" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
     <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
     <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
     <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
@@ -197,7 +198,7 @@
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
-    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log
+    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -809,7 +810,8 @@
     user_region3,
     user_region4,
     user_region5,
-    do_log
+    do_log,
+    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -836,7 +838,8 @@
     	#{userRegion3,jdbcType=VARCHAR},
     	#{userRegion4,jdbcType=VARCHAR},
     	#{userRegion5,jdbcType=VARCHAR},
-    	#{doLog,jdbcType=INTEGER}
+    	#{doLog,jdbcType=INTEGER},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
   <insert id="saveCfgIndexForBatch" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
@@ -866,7 +869,8 @@
     user_region3,
     user_region4,
     user_region5,
-    do_log
+    do_log,
+    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -893,7 +897,8 @@
     	#{userRegion3,jdbcType=VARCHAR},
     	#{userRegion4,jdbcType=VARCHAR},
     	#{userRegion5,jdbcType=VARCHAR},
-    	#{doLog,jdbcType=INTEGER}
+    	#{doLog,jdbcType=INTEGER},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert ip_port_cfg表信息 -->
@@ -984,6 +989,7 @@
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
         action = #{action,jdbcType=INTEGER},
         do_log = #{doLog,jdbcType=INTEGER},
+        do_blacklist = #{doBlackList,jdbcType=INTEGER},
         is_valid = #{isValid,jdbcType=INTEGER},
         is_audit = #{isAudit,jdbcType=INTEGER},
       <if test="creatorId != null" >
diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
index 16eb823eb..aa6bae109 100644
--- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
@@ -23,6 +23,7 @@
     <result column="lable" property="lable" jdbcType="VARCHAR" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -120,7 +121,7 @@
     a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
-    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log
+    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -312,7 +313,8 @@
     LABLE,
     AREA_EFFECTIVE_IDS,
     function_id,
-    do_log
+    do_log,
+    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -333,7 +335,8 @@
     	#{lable,jdbcType=VARCHAR},    
    	 	#{areaEffectiveIds,jdbcType=VARCHAR},
     	#{functionId,jdbcType=INTEGER},
-    	#{doLog,jdbcType=INTEGER}
+    	#{doLog,jdbcType=INTEGER},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert ip_port_cfg表信息 -->
@@ -460,6 +463,9 @@
       <if test="doLog != null" >
         do_log =  #{doLog,jdbcType=INTEGER},
       </if>
+      <if test="doBlackList != null">
+      	do_blacklist = #{doBlackList,jdbcType=INTEGER}
+      </if>
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}
diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
index c8c5d2e21..271e34d4e 100644
--- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
@@ -33,6 +33,7 @@
     <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
     <result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" />
     <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
+    <result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -132,7 +133,8 @@
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
-    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id
+    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id,
+    a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -476,7 +478,8 @@
     user_region4,
     user_region5,
     do_log,
-    source_compile_id
+    source_compile_id,
+    do_blacklist
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -504,7 +507,8 @@
     	#{userRegion4,jdbcType=VARCHAR},
     	#{userRegion5,jdbcType=VARCHAR},
     	#{doLog,jdbcType=INTEGER},
-    	#{sourceCompileId,jdbcType=INTEGER}
+    	#{sourceCompileId,jdbcType=INTEGER},
+    	#{doBlackList,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert ip_port_cfg表信息 -->
@@ -923,6 +927,9 @@
       </if>
       <if test="functionId != null" >
         function_id =  #{functionId,jdbcType=INTEGER},
+      </if>
+      <if test="doBlackList != null">
+      	do_blacklist = #{doBlackList,jdbcType=INTEGER},
       </if>
         user_region1 = #{userRegion1,jdbcType=VARCHAR},
         user_region2 = #{userRegion2,jdbcType=VARCHAR},
diff --git a/src/main/resources/sql/20181222/add_doblacklist_column.sql b/src/main/resources/sql/20181222/add_doblacklist_column.sql
new file mode 100644
index 000000000..d4fe6bd71
--- /dev/null
+++ b/src/main/resources/sql/20181222/add_doblacklist_column.sql
@@ -0,0 +1 @@
+ALTER TABLE `cfg_index_info` ADD COLUMN `do_blacklist`  int(11) NOT NULL DEFAULT 1 AFTER `source_compile_id`;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index 44b7e558e..12f1897ab 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -237,6 +237,26 @@
 											</c:forEach>
 										</div>
 									</div>
+									<div class="col-md-6">
+										<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">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																<label class="radio-inline">
+															<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
 								</div>
 								<!-- dolog end-->
 								
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index b207b2535..1e828be7c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -385,6 +385,7 @@
 									<th class="sort-column r.action" column="block_type" ><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="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>
@@ -433,6 +434,13 @@
 											</c:if>
 										</c:forEach>
 									</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 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/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index 2aa5d678d..a31873033 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -237,6 +237,26 @@
 											</c:forEach>
 										</div>
 									</div>
+									<div class="col-md-6">
+											<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">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																	<label class="radio-inline">
+																<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+														
+												</c:forEach>
+											</div>
+										</div>
 								</div>
 								<!-- dolog end-->
 								
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index bc3d40922..d1dfb8600 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -377,6 +377,7 @@
 									<th class="sort-column r.action" column="block_type" ><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="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>
@@ -423,6 +424,13 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
+									</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 audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index f5cf0f263..a928651ac 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -239,6 +239,26 @@
 											</c:forEach>
 										</div>
 									</div>
+									<div class="col-md-6">
+										<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">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																<label class="radio-inline">
+															<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
 								</div>
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="strCfgIndex" value="0"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index 8163a4824..e24fc57a9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -357,6 +357,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="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>
@@ -403,6 +404,13 @@
 											</c:if>
 										</c:forEach>
 									</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 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/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
index 7edadf09a..a24a8400c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
@@ -212,6 +212,26 @@
 											</c:forEach>
 										</div>
 									</div>
+									<div class="col-md-6">
+										<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">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																<label class="radio-inline">
+															<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
 								</div>
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="hashCfgIndex" value="0"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index 83235c1cf..d85e22714 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -371,6 +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="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>
@@ -416,6 +417,13 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
+									</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 audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index 1a2c8533c..9599766bc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -535,6 +535,26 @@ var showHideIPSECProtocol=function(obj){
 																	</c:forEach>
 																</div>
 															</div>
+															<div class="col-md-6">
+																<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">
+																				<c:choose>
+																					<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																						<label class="radio-inline">
+																					<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																						</label>
+																					</c:when>
+																					<c:otherwise>
+																						<label class="radio-inline">
+																							<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																						</label>
+																					</c:otherwise>
+																				</c:choose>
+																			
+																	</c:forEach>
+																</div>
+															</div>
 														</div>
 														<div class="row ratelimitAction hidden">
 													   		 <div class="col-md-6 hidden">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index 57e71be88..9de81fa45 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -370,6 +370,7 @@
 									<th column="userregion2" ><spring:message code="ratelimit"/></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="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>
@@ -425,6 +426,13 @@
 											</c:if>
 										</c:forEach>
 									</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 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/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
index b9dd496ef..d01e9b341 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -243,6 +243,26 @@
 											</c:forEach>
 										</div>
 									</div>
+									<div class="col-md-6">
+										<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">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																<label class="radio-inline">
+															<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
 								</div>
 								<!-- dolog end-->
 								<c:set var="ipCfgIndex" value="0"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index c5483e519..447b457b7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -372,6 +372,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="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>
@@ -419,6 +420,13 @@
 											</c:if>
 										</c:forEach>
 									</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 audit="${indexCfg.isAudit}" functionId="35" 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/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 703d6b6f3..bfa3828dc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -207,6 +207,26 @@
 											</c:forEach>
 										</div>
 									</div>
+									<div class="col-md-6">
+										<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">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																<label class="radio-inline">
+															<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</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 062bc321d..5a359ae09 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -371,6 +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="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>
@@ -417,6 +418,13 @@
 											</c:if>
 										</c:forEach>
 									</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 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 2119a0a41..42efd130b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -219,6 +219,27 @@
 											</c:forEach>
 										</div>
 									</div>
+									<div class="col-md-6">
+										<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">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																<label class="radio-inline">
+															<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
+								<div class="row">
 									<div class="col-md-6 policy">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message
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 19e1df12f..b52d159ed 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -370,6 +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="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>
@@ -420,6 +421,13 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
+									</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 audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
index c0112674f..355e0dc19 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -281,6 +281,26 @@
 																</c:forEach>
 															</div>
 														</div>
+														<div class="col-md-6">
+															<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">
+																			<c:choose>
+																				<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																					<label class="radio-inline">
+																				<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																					</label>
+																				</c:when>
+																				<c:otherwise>
+																					<label class="radio-inline">
+																						<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																					</label>
+																				</c:otherwise>
+																			</c:choose>
+																		
+																</c:forEach>
+															</div>
+														</div>
 													</div>
 													<c:forEach items="${regionList}" var="region" varStatus="status">
 														<c:if test="${region.regionType eq 1 }">
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index f3bb6f2fc..532032942 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -527,6 +527,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="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>
@@ -572,6 +573,13 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
+									</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 audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
index a39eb30ec..ea8fb3de1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -225,6 +225,26 @@
 											</c:forEach>
 										</div>
 									</div>
+									<div class="col-md-6">
+										<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">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																<label class="radio-inline">
+															<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
 								</div>
 								<!-- dolog end-->
 								<c:set var="ipCfgIndex" value="0"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index dd50bd32d..43bf6ca58 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -368,6 +368,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="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>
@@ -414,6 +415,13 @@
 											</c:if>
 										</c:forEach>
 									</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 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/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
index 4746eea48..0e3f105de 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
@@ -210,6 +210,26 @@
 												</c:forEach>
 											</div>
 										</div>
+										<div class="col-md-6">
+											<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">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doBlackList}">
+																	<label class="radio-inline">
+																<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+														
+												</c:forEach>
+											</div>
+										</div>
                    					 </div>
 								<h4 class="form-section">
 											<spring:message code="http_url_title" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index da7b8b1aa..1378338ff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -349,6 +349,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="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>
@@ -395,6 +396,13 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
+									</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 audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									<td>