From 2e0f5158cbe6f543de4a9523f613a5046f77dfb3 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 22 Aug 2018 11:23:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=89=B9=E5=AE=9A?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=A0=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp        | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp        | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp          | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp        | 2 +-
 src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index b17891c44..9842afed5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -87,7 +87,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index 48364d54a..cd98317d3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -87,7 +87,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index 8dd19bd5c..55ac344b9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -87,7 +87,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index 7191b789f..53d32f7c8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -87,7 +87,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
index 524bfa474..59cdd1e6f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -90,7 +90,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 3e86c2b86..b2c42b9f4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -130,7 +130,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 86ca7c04a..5dcb68562 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -130,7 +130,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="basic_protocol"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index cacfb9762..757e2487f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -130,7 +130,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""

From bfe15b2979bc9cd4149e85257e85033462e7aab1 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 22 Aug 2018 11:25:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?app=20ssl=E6=90=9C=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=84=E4=BF=9D=E6=8C=81=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 797a63382..88b3752c7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -87,7 +87,7 @@
 								
 								<div class="pull-left">
 									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
 									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""

From 16a65176a470a120d20ec73d1190762b995e236b Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Wed, 22 Aug 2018 12:51:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?APP=E7=89=B9=E5=BE=81doLog=20cfgId=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/AppCfgDao.xml   | 64 ++++++++++++++-----
 .../WEB-INF/views/cfg/app/appByteCfgForm.jsp  | 22 ++++++-
 .../WEB-INF/views/cfg/app/appByteCfgList.jsp  | 16 ++++-
 .../views/cfg/app/appDomainCfgForm.jsp        | 22 ++++++-
 .../views/cfg/app/appDomainCfgList.jsp        | 15 ++++-
 .../views/cfg/app/appHeaderCfgList.jsp        |  9 ++-
 .../WEB-INF/views/cfg/app/appHttpCfgForm.jsp  | 22 ++++++-
 .../WEB-INF/views/cfg/app/appHttpCfgList.jsp  | 15 ++++-
 .../WEB-INF/views/cfg/app/appIpCfgForm.jsp    | 22 +++++++
 .../WEB-INF/views/cfg/app/appIpCfgList.jsp    | 17 ++++-
 .../WEB-INF/views/cfg/app/appSslCfgList.jsp   | 10 ++-
 11 files changed, 202 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 79976960e..46627a937 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -71,6 +71,7 @@
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   
   <resultMap id="AppHttpCfgMap" type="com.nis.domain.configuration.AppHttpCfg" >
@@ -103,6 +104,7 @@
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="AppDomainCfgMap" type="com.nis.domain.configuration.AppDomainCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -133,6 +135,7 @@
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="AppByteCfgMap" type="com.nis.domain.configuration.AppByteCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -163,6 +166,7 @@
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="AppInnerRuleCfgMap" type="com.nis.domain.configuration.AppInnerRuleCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -309,7 +313,7 @@
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
     r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
     r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT,
-    r.DIRECTION,r.PROTOCOL
+    r.DIRECTION,r.PROTOCOL,r.DO_LOG
   </sql>
   
   <sql id="AppHttpCfg_Column" >
@@ -317,7 +321,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.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.DISTRICT,r.CFG_KEYWORDS,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN
+    r.DISTRICT,r.CFG_KEYWORDS,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.DO_LOG
   </sql>
   
   <sql id="AppDomainCfg_Column" >
@@ -325,7 +329,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.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.DOMAIN,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN
+    r.DOMAIN,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.DO_LOG
   </sql>
 
   <sql id="AppByteCfg_Column" >
@@ -333,7 +337,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.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.BYTES,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN
+    r.BYTES,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.DO_LOG
   </sql>
   
   <sql id="AppInnerRuleCfg_Column" >
@@ -615,6 +619,9 @@
 	    	</if>
   			<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+    		</if>
+  			<if test="compileId != null">
+    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
     		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -737,6 +744,9 @@
 	    	</if>
   			<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+    		</if>
+  			<if test="compileId != null">
+    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
     		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -837,6 +847,9 @@
 	    	</if>
   			<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+    		</if>
+  			<if test="compileId != null">
+    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
     		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -934,6 +947,9 @@
 	    	</if>
   			<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+    		</if>
+  			<if test="compileId != null">
+    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
     		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -1124,6 +1140,9 @@
 	    	</if>
   			<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+    		</if>
+  			<if test="compileId != null">
+    			AND r.compile_id=#{compileId,jdbcType=INTEGER}
     		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -1225,6 +1244,9 @@
 	    	</if>
   			<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+    		</if>
+  			<if test="compileId != null">
+    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
     		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -1336,12 +1358,12 @@
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
     IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
-    DIRECTION,PROTOCOL
+    DIRECTION,PROTOCOL,DO_LOG
     )values (
      <include refid="AppCommonCfg_Value_List" />,
      #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
     #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
-    #{protocol,jdbcType=INTEGER}
+    #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
     )
   </insert>
   <insert id="insertAppHttpCfg" parameterType="com.nis.domain.configuration.AppHttpCfg" >
@@ -1353,11 +1375,11 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    DISTRICT,CFG_KEYWORDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
+    DISTRICT,CFG_KEYWORDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG
     )values (
      <include refid="AppCommonCfg_Value_List" />,
-    #{district,jdbcType=VARCHAR},#{cfgKeywords,jdbcType=VARCHAR},
-    #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}
+    #{district,jdbcType=VARCHAR},#{cfgKeywords,jdbcType=VARCHAR},#{exprType,jdbcType=INTEGER},
+    #{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
     )
   </insert>
   <insert id="insertAppDomainCfg" parameterType="com.nis.domain.configuration.AppDomainCfg" >
@@ -1369,11 +1391,11 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    DOMAIN,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
+    DOMAIN,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG
     )values (
      <include refid="AppCommonCfg_Value_List" />,
-   	#{domain,jdbcType=VARCHAR},
-    #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}
+   	#{domain,jdbcType=VARCHAR},#{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},
+   	#{isHexbin,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
     )
   </insert>
   <insert id="insertAppByteCfg" parameterType="com.nis.domain.configuration.AppByteCfg" >
@@ -1385,11 +1407,11 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    BYTES,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
+    BYTES,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG
     )values (
      <include refid="AppCommonCfg_Value_List" />,
-   	#{bytes,jdbcType=VARCHAR},
-    #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}
+   	#{bytes,jdbcType=VARCHAR},#{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},
+   	#{isHexbin,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
     )
   </insert>
   <insert id="insertAppInnerRuleCfg" parameterType="com.nis.domain.configuration.AppInnerRuleCfg" >
@@ -1718,6 +1740,9 @@
       <if test="protocol != null" >
         protocol = #{protocol,jdbcType=INTEGER},
       </if>
+      <if test="doLog != null" >
+        do_log = #{doLog,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -1816,6 +1841,9 @@
       <if test="isHexbin != null">
     	is_hexbin=#{isHexbin,jdbcType=INTEGER},
       </if>
+      <if test="doLog != null">
+    	do_log=#{doLog,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -1911,6 +1939,9 @@
       <if test="isHexbin != null">
     	is_hexbin=#{isHexbin,jdbcType=INTEGER},
       </if>
+      <if test="doLog != null">
+    	do_log=#{doLog,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -2006,6 +2037,9 @@
       <if test="isHexbin != null">
     	is_hexbin=#{isHexbin,jdbcType=INTEGER},
       </if>
+      <if test="doLog != null">
+    	do_log=#{doLog,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index c5edb169d..ba4b15b64 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
@@ -145,6 +142,25 @@ $(function(){
 											<div for="bytes"></div>
 										</div>
 									</div>
+									<div class="col-md-6">
+									<div class="form-group">
+										<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+										<c:choose>
+											<c:when test="${dict.itemCode eq _cfg.doLog}">
+												<label class="radio-inline">
+													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</label>
+											</c:when>
+											<c:otherwise>
+												<label class="radio-inline">
+													<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</label>
+											</c:otherwise>
+										</c:choose>
+										</c:forEach>
+									</div>
+								</div>
 								</div>
 								<c:forEach items="${regionList}" var="region">
                    				<c:if test="${_cfg.functionId eq region.functionId}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index 9842afed5..70cc370ff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -257,8 +257,14 @@
 										</div>
 									</div>
 								</div>
-								
-							
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="cfg_id"/>：</label>
+											<input name="compileId" type="text" maxlength="20" class="form-control" value="${cfg.compileId }"/>
+										</div>
+									</div>
+								</div>
 							</div> 
 							
 							<!-- /筛选搜索内容栏    结束-->
@@ -275,6 +281,7 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
+									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -313,6 +320,11 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+		             					</c:forEach>    
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
+											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 350133533..406c7734f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
@@ -145,7 +142,26 @@ $(function(){
 											<div for="domain"></div>
 										</div>
 									</div>
+									<div class="col-md-6">
+									<div class="form-group">
+										<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+										<c:choose>
+											<c:when test="${dict.itemCode eq _cfg.doLog}">
+												<label class="radio-inline">
+													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</label>
+											</c:when>
+											<c:otherwise>
+												<label class="radio-inline">
+													<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</label>
+											</c:otherwise>
+										</c:choose>
+										</c:forEach>
 									</div>
+								</div>
+							</div>
 							<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index cd98317d3..ce33da596 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -257,7 +257,14 @@
 										</div>
 									</div>
 								</div>
-								
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="cfg_id"/>：</label>
+											<input name="compileId" type="text" maxlength="20" class="form-control" value="${cfg.compileId }"/>
+										</div>
+									</div>
+								</div>
 							
 							</div> 
 							
@@ -275,6 +282,7 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
+									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -313,6 +321,11 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+		             					</c:forEach>    
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
+											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index 55ac344b9..972642ba5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -257,7 +257,14 @@
 										</div>
 									</div>
 								</div>
-								
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="cfg_id"/>：</label>
+											<input name="compileId" type="text" maxlength="20" class="form-control" value="${cfg.compileId }"/>
+										</div>
+									</div>
+								</div>
 							
 							</div> 
 							
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index 177210e85..c48dcd02c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
@@ -173,6 +170,25 @@ $(function(){
 											</div>
 										</div>
 									</c:if>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:choose>
+												<c:when test="${dict.itemCode eq _cfg.doLog}">
+													<label class="radio-inline">
+														<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+													</label>
+												</c:when>
+												<c:otherwise>
+													<label class="radio-inline">
+														<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+													</label>
+												</c:otherwise>
+											</c:choose>
+											</c:forEach>
+										</div>
+									</div>
 								</div>
 								<div class="row">
 									<div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index 53d32f7c8..3afd0e6a5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -257,7 +257,14 @@
 										</div>
 									</div>
 								</div>
-								
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="cfg_id"/>：</label>
+											<input name="compileId" type="text" maxlength="20" class="form-control" value="${cfg.compileId }"/>
+										</div>
+									</div>
+								</div>
 							
 							</div> 
 							
@@ -276,6 +283,7 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
+									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -320,6 +328,11 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+		             					</c:forEach>    
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
+											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
index 468f23232..a62a68a92 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -181,6 +181,28 @@ $(function(){
 						    		</div>
 								</div>
 							</div>
+							<!-- doLog -->
+							<div class="row">
+								<div class="col-md-6">
+									<div class="form-group">
+										<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+										<c:choose>
+											<c:when test="${dict.itemCode eq _cfg.doLog}">
+												<label class="radio-inline">
+													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</label>
+											</c:when>
+											<c:otherwise>
+												<label class="radio-inline">
+													<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</label>
+											</c:otherwise>
+										</c:choose>
+										</c:forEach>
+									</div>
+								</div>
+							</div>
 							<div class="row hidden">
 								    <div class="col-md-6">
 								        <div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
index 59cdd1e6f..87d28e8f3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -261,8 +261,15 @@
 										</div>
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="cfg_id"/>：</label>
+											<input name="compileId" type="text" maxlength="20" class="form-control" value="${cfg.compileId }"/>
+										</div>
+									</div>
+								</div>
 								
-							
 							</div> 
 							
 							<!-- /筛选搜索内容栏    结束-->
@@ -281,6 +288,7 @@
 									<th><spring:message code="server_ip"/></th>
 									<th><spring:message code="server_port"/></th>
 									<th><spring:message code="protocol"/></th>
+									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<%-- <th><spring:message code="letter"/></th>
@@ -320,6 +328,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 88b3752c7..416afde84 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -257,8 +257,14 @@
 										</div>
 									</div>
 								</div>
-								
-							
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="cfg_id"/>：</label>
+											<input name="compileId" type="text" maxlength="20" class="form-control" value="${cfg.compileId }"/>
+										</div>
+									</div>
+								</div>
 							</div> 
 							
 							<!-- /筛选搜索内容栏    结束-->