diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml index 58edbb36d..d12cff04a 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml @@ -64,6 +64,7 @@ + a.CFG_ID, a.SRC_URL,a.SAMPLE_URL, a.SRC_MD5,a.SAMPLE_MD5,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT, @@ -77,7 +78,7 @@ a.CFG_ID, a.description,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.cfg_type,a.cfg_region_code,a.LEVEL + a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.cfg_type,a.cfg_region_code,a.LEVEL,a.do_log @@ -1285,7 +1287,8 @@ dest_port, dest_ip_address, cfg_type, - cfg_region_code + cfg_region_code, + do_log )values ( #{cfgDesc,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, @@ -1317,7 +1320,9 @@ #{destPort,jdbcType=VARCHAR}, #{destIpAddress,jdbcType=VARCHAR}, #{cfgType,jdbcType=VARCHAR}, - #{cfgRegionCode,jdbcType=INTEGER} + #{cfgRegionCode,jdbcType=INTEGER}, + #{doLog,jdbcType=INTEGER} + ) @@ -1411,6 +1416,9 @@ cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER}, + + + do_log = #{doLog,jdbcType=INTEGER}, @@ -1585,7 +1593,8 @@ match_method, is_hexbin, cfg_type, - cfg_region_code + cfg_region_code, + do_log )values ( #{cfgDesc,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, @@ -1611,7 +1620,8 @@ #{matchMethod,jdbcType=INTEGER}, #{isHexbin,jdbcType=INTEGER}, #{cfgType,jdbcType=VARCHAR}, - #{cfgRegionCode,jdbcType=INTEGER} + #{cfgRegionCode,jdbcType=INTEGER}, + #{doLog,jdbcType=INTEGER} ) @@ -1688,6 +1698,9 @@ cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER}, + + + do_log = #{doLog,jdbcType=INTEGER}, diff --git a/src/main/resources/sql/update_cfg_index_info-20180820.sql b/src/main/resources/sql/update_cfg_index_info-20180820.sql index 0c481bab7..57a9a3fa2 100644 --- a/src/main/resources/sql/update_cfg_index_info-20180820.sql +++ b/src/main/resources/sql/update_cfg_index_info-20180820.sql @@ -1,2 +1,7 @@ alter table cfg_index_info add do_log int(11) COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2' -alter table app_policy_cfg add do_log int(11) COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2' \ No newline at end of file +alter table app_policy_cfg add do_log int(11) COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2' +alter table av_cont_ip_cfg add do_log int(11) COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2' +alter table av_cont_url_cfg add do_log int(11) COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2' +alter table av_pic_ip_cfg add do_log int(11) COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2' +alter table av_pic_url_cfg add do_log int(11) COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2' +alter table av_sign_sample_cfg add do_log int(11) COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2' \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp index 322735472..7782e1275 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp @@ -106,6 +106,27 @@ $(function(){ +
+
+
+ + + + + + + + + + + +
+
+
<%@include file="/WEB-INF/include/form/ipInfo.jsp" %> <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 35cd55091..c676308ef 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -8,6 +8,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); + }else if("${cfg.compileId}"){ + $("#intype").val("${cfg.compileId}"); }else if("${cfg.srcIpAddress}"){ $("#intype").val("${cfg.srcIpAddress}"); }else if("${cfg.srcPort}"){ @@ -33,6 +35,7 @@ $(".Wdate").attr("value",''); $("#description").attr("value",''); $("#searchForm")[0].reset(); + $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); }); }); var edit=function(url){ @@ -102,6 +105,7 @@ + @@ -275,6 +279,7 @@ <%-- --%> + @@ -286,6 +291,7 @@ + @@ -307,6 +313,7 @@ + ${cfg.compileId } ${cfg.cfgDesc } @@ -344,6 +351,13 @@ + + + + + + + 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 95945d6c1..6af43eeb0 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 @@ -129,6 +129,27 @@ $(function(){ +
+
+
+ + + + + + + + + + + +
+
+
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 f9e2a7c9a..42fc38606 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 @@ -10,6 +10,8 @@ $("#intype").val("${cfg.cfgDesc}"); }else if("${cfg.cfgKeywords}"){ $("#intype").val("${cfg.cfgKeywords}"); + }else if("${cfg.compileId}"){ + $("#intype").val("${cfg.compileId}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -31,6 +33,7 @@ $(".Wdate").attr("value",''); $("#description").attr("value",''); $("#searchForm")[0].reset(); + $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); }); }); var edit=function(url){ @@ -100,6 +103,7 @@ + @@ -271,12 +275,14 @@ + + @@ -297,6 +303,7 @@ + ${cfg.compileId } ${cfg.cfgDesc } + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp index dc9b2122a..61fee0d1e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp @@ -107,6 +107,27 @@ $(function(){ +
+
+
+ + + + + + + + + + + +
+
+
<%@include file="/WEB-INF/include/form/ipInfo.jsp" %> <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index ad10e8185..b239f57a4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -8,6 +8,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); + }else if("${cfg.compileId}"){ + $("#intype").val("${cfg.compileId}"); }else if("${cfg.srcIpAddress}"){ $("#intype").val("${cfg.srcIpAddress}"); }else if("${cfg.srcPort}"){ @@ -33,6 +35,7 @@ $(".Wdate").attr("value",''); $("#description").attr("value",''); $("#searchForm")[0].reset(); + $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); }); }); var edit=function(url){ @@ -102,6 +105,7 @@ + @@ -275,6 +279,7 @@ <%-- --%> + @@ -286,6 +291,7 @@ + @@ -307,6 +313,7 @@ + ${cfg.compileId } ${cfg.cfgDesc } @@ -344,6 +351,13 @@
+ + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp index f135211a5..e3543b643 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp @@ -120,6 +120,27 @@ $(function(){ +
+
+
+ + + + + + + + + + + +
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 9b43274e0..5e3ba99e1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -8,6 +8,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); + }else if("${cfg.compileId}"){ + $("#intype").val("${cfg.compileId}"); }else if("${cfg.cfgKeywords}"){ $("#intype").val("${cfg.cfgKeywords}"); }else{ @@ -31,6 +33,8 @@ $(".Wdate").attr("value",''); $("#description").attr("value",''); $("#searchForm")[0].reset(); + $("#searchForm")[0].reset(); + $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); }); }); var edit=function(url){ @@ -100,6 +104,7 @@ + @@ -272,12 +277,14 @@ <%-- --%> + + @@ -298,6 +305,7 @@ + ${cfg.compileId } ${cfg.cfgDesc }
+ + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp index c260fbf7a..1a156fede 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp @@ -152,6 +152,27 @@ $(function(){ +
+
+
+ + + + + + + + + + + +
+
+
<%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index 813c5809d..8524491f2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -8,6 +8,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); + }else if("${cfg.compileId}"){ + $("#intype").val("${cfg.compileId}"); }else if("${cfg.description}"){ $("#intype").val("${cfg.description}"); }else if("${cfg.level}"){ @@ -33,6 +35,7 @@ $(".Wdate").attr("value",''); $("#description").attr("value",''); $("#searchForm")[0].reset(); + $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); }); }); var edit=function(url){ @@ -73,7 +76,7 @@
- + @@ -102,6 +105,7 @@ + @@ -275,10 +279,12 @@ <%-- --%> + + @@ -299,6 +305,7 @@ + ${cfg.compileId } @@ -314,6 +321,13 @@ + + + + + + + ${cfg.requestName } diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 48d67fad0..8bb931152 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -415,7 +415,31 @@ $(function(){ initCommIpVal(); }); window.onload=function(){ - //日志查询IP类型增加格式提示 + // 配置id的搜索下拉框选择切换 + if ($("#searchForm #seltype").val() == 'compileId') { + $("#searchForm #intype").addClass("number"); + } else { + $("#searchForm #intype").removeClass("number"); + } + // reset时去掉number + $("#resetBtn").on("click", function() { + if ($("#searchForm #seltype").val() == 'compileId') { + $("#searchForm #intype").addClass("number"); + } else { + $("#searchForm #intype").removeClass("number"); + } + }); + // 切换时为compileId加上number + $("#searchForm #seltype").on("change", function() { + if ($("#searchForm #seltype").val() == 'compileId') { + $("#searchForm #intype").addClass("number"); + } else { + $("#searchForm #intype").removeClass("number"); + } + }); + + + // 日志查询IP类型增加格式提示 $("#searchForm [name='capIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::"); $("#searchForm [name='sIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::"); $("#searchForm [name='dIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");