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 @@
+
@@ -103,6 +104,7 @@
+
@@ -133,6 +135,7 @@
+
@@ -163,6 +166,7 @@
+
@@ -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
@@ -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
@@ -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
@@ -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
@@ -615,6 +619,9 @@
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+
+
+ AND r.compile_id=#{compileId,jdbcType=BIGINT}
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
@@ -737,6 +744,9 @@
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+
+
+ AND r.compile_id=#{compileId,jdbcType=BIGINT}
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
@@ -837,6 +847,9 @@
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+
+
+ AND r.compile_id=#{compileId,jdbcType=BIGINT}
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
@@ -934,6 +947,9 @@
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+
+
+ AND r.compile_id=#{compileId,jdbcType=BIGINT}
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
@@ -1124,6 +1140,9 @@
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+
+
+ AND r.compile_id=#{compileId,jdbcType=INTEGER}
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
@@ -1225,6 +1244,9 @@
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+
+
+ AND r.compile_id=#{compileId,jdbcType=BIGINT}
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 (
,
#{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}
)
@@ -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 (
,
- #{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}
)
@@ -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 (
,
- #{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}
)
@@ -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 (
,
- #{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}
)
@@ -1718,6 +1740,9 @@
protocol = #{protocol,jdbcType=INTEGER},
+
+ do_log = #{doLog,jdbcType=INTEGER},
+
where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -1816,6 +1841,9 @@
is_hexbin=#{isHexbin,jdbcType=INTEGER},
+
+ do_log=#{doLog,jdbcType=INTEGER},
+
where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -1911,6 +1939,9 @@
is_hexbin=#{isHexbin,jdbcType=INTEGER},
+
+ do_log=#{doLog,jdbcType=INTEGER},
+
where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -2006,6 +2037,9 @@
is_hexbin=#{isHexbin,jdbcType=INTEGER},
+
+ do_log=#{doLog,jdbcType=INTEGER},
+
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 @@