From a38d337776cbb4a72dfb68979f863c3e13db4331 Mon Sep 17 00:00:00 2001 From: wangxin Date: Sat, 12 Jan 2019 20:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B9=9F=E5=8A=A0=E5=85=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=80=BB=E8=BE=91=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function_service_dict_add_do_log.sql | 142 +++++++++--------- .../webapp/static/global/scripts/doLog.js | 77 +++++----- 2 files changed, 112 insertions(+), 107 deletions(-) diff --git a/src/main/resources/sql/20190112/function_service_dict_add_do_log.sql b/src/main/resources/sql/20190112/function_service_dict_add_do_log.sql index 5fe2d0079..6e2043749 100644 --- a/src/main/resources/sql/20190112/function_service_dict_add_do_log.sql +++ b/src/main/resources/sql/20190112/function_service_dict_add_do_log.sql @@ -1,141 +1,141 @@ -ALTER TABLE function_service_dict ADD COLUMN `config_do_log` VARCHAR(10) DEFAULT NULL; +ALTER TABLE function_service_dict ADD COLUMN `config_do_log` VARCHAR(10) DEFAULT NULL COMMENT '是否显示字段;字段可选值;字段默认值'; #IP White List -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=1 AND function_id=3; +UPDATE function_service_dict SET config_do_log='1;0,2;0' WHERE service_id=1 AND function_id=3; #IP Address Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=128 AND function_id=5; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=128 AND function_id=5; #IP Address Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=16 AND function_id=5; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=16 AND function_id=5; #IP Address Drop -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=3 AND function_id=5; +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=3 AND function_id=5; #IP Address Ratelimit -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=514 AND function_id=5; +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=514 AND function_id=5; #IP Payload Replace -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=517 AND function_id=212; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=517 AND function_id=212; #IP Spoofing Spoofing -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=518 AND function_id=214; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=518 AND function_id=214; #Protocol Identify Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=147 AND function_id=407; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=147 AND function_id=407; #Protocol Identify Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=35 AND function_id=407; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=35 AND function_id=407; #Protocol Identify Rate Limit -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=1059 AND function_id=407; +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=1059 AND function_id=407; #App Identify Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=145 and function_id=63; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=145 and function_id=63; #App Identify Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=33 AND function_id=63; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=33 AND function_id=63; #App Identify Rate Limit -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=1056 AND function_id=63; +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=1056 AND function_id=63; #Behavior Identify Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=148 AND function_id=408; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=148 AND function_id=408; #Behavior Identify Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=36 AND function_id=408; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=36 AND function_id=408; #Behavior Identify Rate Limit -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=1060 AND function_id=408; +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=1060 AND function_id=408; #BGP Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=143 and function_id=61; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=143 and function_id=61; #BGP Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=31 AND function_id=61; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=31 AND function_id=61; #DNS Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=130 and function_id=7; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=130 and function_id=7; #DNS Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=18 AND function_id=7; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=18 AND function_id=7; #SSL Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=131 and function_id=34; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=131 and function_id=34; #SSL Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=19 AND function_id=34; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=19 AND function_id=34; #HTTP url Monitor -UPDATE function_service_dict SET config_do_log='1;1,2' WHERE service_id=129 AND function_id=6; +UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=129 AND function_id=6; #HTTP url Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=17 and function_id=6; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=17 and function_id=6; #HTTP url WhiteList -UPDATE function_service_dict SET config_do_log='0;0' WHERE service_id=2 AND function_id=6; +UPDATE function_service_dict SET config_do_log='0;0;0' WHERE service_id=2 AND function_id=6; #HTTP Website Keyword Monitor -UPDATE function_service_dict SET config_do_log='1;1,2' WHERE service_id=152 AND function_id=635; +UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=152 AND function_id=635; #HTTP Website Keyword Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=40 AND function_id=635; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=40 AND function_id=635; #HTTP Advanced Monitor -UPDATE function_service_dict SET config_do_log='1;1,2' WHERE service_id=129 AND function_id=8; +UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=129 AND function_id=8; #HTTP Advanced Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=17 AND function_id=8; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=17 AND function_id=8; #Mail Monitor -UPDATE function_service_dict SET config_do_log='1;1,2' WHERE service_id=132 AND function_id=37; +UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=132 AND function_id=37; #Mail Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=20 AND function_id=37; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=20 AND function_id=37; #Mail WhiteList -UPDATE function_service_dict SET config_do_log='0;0' WHERE service_id=66 AND function_id=37; +UPDATE function_service_dict SET config_do_log='0;0;0' WHERE service_id=66 AND function_id=37; #FTP Monitor -UPDATE function_service_dict SET config_do_log='1;1,2' WHERE service_id=133 AND function_id=51; +UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=133 AND function_id=51; #FTP Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=21 AND function_id=51; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=21 AND function_id=51; #P2P Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=146 AND function_id=510; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=146 AND function_id=510; #P2P Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=34 AND function_id=510; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=34 AND function_id=510; #Streaming Media Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=151 AND function_id=22; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=151 AND function_id=22; #Streaming Media Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=39 AND function_id=22; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=39 AND function_id=22; #VoIP Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=150 AND function_id=24; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=150 AND function_id=24; #VoIP Block -UPDATE function_service_dict SET config_do_log='1;0,2' WHERE service_id=38 AND function_id=24; +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=38 AND function_id=24; #File Digest Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=399 AND function_id=52; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=399 AND function_id=52; #File Digest Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=273 AND function_id=52; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=273 AND function_id=52; #Audio Sample Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=389 AND function_id=28; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=389 AND function_id=28; #Audio Sample Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=261 AND function_id=28; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=261 AND function_id=28; #Video Sample Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=390 AND function_id=29; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=390 AND function_id=29; #Video Sample Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=262 AND function_id=29; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=262 AND function_id=29; #Picture Sample Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=391 AND function_id=30; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=391 AND function_id=30; #Picture Sample Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=263 AND function_id=30; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=263 AND function_id=30; #VoIP Voice Sample Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=392 AND function_id=31; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=392 AND function_id=31; #VoIP Voice Sample Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=264 AND function_id=31; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=264 AND function_id=31; #Speaker Recognization Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=396 AND function_id=630; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=396 AND function_id=630; #Speaker Recognization Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=268 AND function_id=630; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=268 AND function_id=630; #Logo Detection Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=269 AND function_id=631; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=269 AND function_id=631; #Logo Detection Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=397 AND function_id=631; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=397 AND function_id=631; #Face Recognization Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=270 AND function_id=632; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=270 AND function_id=632; #Face Recognization Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=398 AND function_id=632; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=398 AND function_id=632; #Porn Detection Monitor -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=394 AND function_id=33; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=394 AND function_id=33; #Porn Detection Block -UPDATE function_service_dict SET config_do_log='1;1' WHERE service_id=266 AND function_id=33; +UPDATE function_service_dict SET config_do_log='1;1;1' WHERE service_id=266 AND function_id=33; #Anti DDOS Monitor -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=6 AND function_id=301; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=6 AND function_id=301; #Anti DDOS Loop -UPDATE function_service_dict SET config_do_log='1;2' WHERE service_id=5 AND function_id=301; +UPDATE function_service_dict SET config_do_log='1;2;2' WHERE service_id=5 AND function_id=301; #Intercept Policy Bypass -UPDATE function_service_dict SET config_do_log='0;0' WHERE service_id=521 AND function_id=200; +UPDATE function_service_dict SET config_do_log='0;0;0' WHERE service_id=521 AND function_id=200; #Intercept Policy Intercept -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=512 AND function_id=200; +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=512 AND function_id=200; #Intercept Policy Rate Limit -UPDATE function_service_dict SET config_do_log='0;0' WHERE service_id=514 AND function_id=200; +UPDATE function_service_dict SET config_do_log='0;0;0' WHERE service_id=514 AND function_id=200; #Control Policy Monitor -UPDATE function_service_dict SET config_do_log='1;1,2' WHERE service_id=592 AND function_id=210; +UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=592 AND function_id=210; #Control Policy Block -UPDATE function_service_dict SET config_do_log='1;0,1,2' WHERE service_id=576 AND function_id=207; +UPDATE function_service_dict SET config_do_log='1;0,1,2;2' WHERE service_id=576 AND function_id=207; #Control Policy Redirect -UPDATE function_service_dict SET config_do_log='1;0,1,2' WHERE service_id=528 AND function_id=208; +UPDATE function_service_dict SET config_do_log='1;0,1,2;2' WHERE service_id=528 AND function_id=208; #Control Policy Replace -UPDATE function_service_dict SET config_do_log='1;0,1,2' WHERE service_id=560 AND function_id=209; +UPDATE function_service_dict SET config_do_log='1;0,1,2;2' WHERE service_id=560 AND function_id=209; #Control Policy White List -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=750 AND function_id=211; +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=750 AND function_id=211; #Cache Policy Bypass -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=624 AND function_id=213; +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=624 AND function_id=213; #Cache Policy Cache -UPDATE function_service_dict SET config_do_log='0;2' WHERE service_id=625 AND function_id=213; \ No newline at end of file +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=625 AND function_id=213; \ No newline at end of file diff --git a/src/main/webapp/static/global/scripts/doLog.js b/src/main/webapp/static/global/scripts/doLog.js index b73e7215f..4389b1097 100644 --- a/src/main/webapp/static/global/scripts/doLog.js +++ b/src/main/webapp/static/global/scripts/doLog.js @@ -19,49 +19,54 @@ $(function(){ var processDoLog=function(doLog){ var doLogValue=$("[name$='doLog']:checked").val(); var dologObj=doLogOpt(doLog); - if(dologObj.isShown==0){ - $(".doLog").addClass("hidden"); - }else{ - $(".doLog").removeClass("hidden"); - } - var dologOptionValues=dologObj.options.split(","); - if(dologOptionValues.length==1){ - $(".doLog").find("[name='doLog']").each(function(){ - if($(this).val()==dologObj.options){ - $(this).attr("checked",true); - $(this).parents(".radio-inline").removeClass("hidden"); - }else{ - $(this).removeAttr("checked"); - $(this).parents(".radio-inline").addClass("hidden"); - } - }); - }else{ - $(".doLog").find("[name$='doLog']").each(function(){ - var has=false; - for(var j in dologOptionValues){ - if($(this).val()==dologOptionValues[j]){ - has=true; - break; - } - } - if(has){ - $(this).parents(".radio-inline").removeClass("hidden"); - }else{ - $(this).parents(".radio-inline").addClass("hidden"); - } - }); - if($(".doLog").find("[name$='doLog'] [value='"+doLogValue+"']:visible")){ - $(".doLog").find("[name$='doLog'] [value='"+doLogValue+"']:visible").attr("checked",true); - }else if($(".doLog").find("[name$='doLog'] [value='2']:visible")){//默认值为2 - $(".doLog").find("[name$='doLog'] [value='2']:visible").attr("checked",true); + if(dologObj){ + var defaults=dologObj.defaults; + if(dologObj.isShown==0){ + $(".doLog").addClass("hidden"); + }else{ + $(".doLog").removeClass("hidden"); + } + var dologOptionValues=dologObj.options.split(","); + if(dologOptionValues.length==1){ + $(".doLog").find("[name='doLog']").each(function(){ + if($(this).val()==dologObj.options){ + $(this).attr("checked",true); + $(this).parents(".radio-inline").removeClass("hidden"); + }else{ + $(this).removeAttr("checked"); + $(this).parents(".radio-inline").addClass("hidden"); + } + }); + }else{ + $(".doLog").find("[name$='doLog']").each(function(){ + var has=false; + for(var j in dologOptionValues){ + if($(this).val()==dologOptionValues[j]){ + has=true; + break; + } + } + if(has){ + $(this).parents(".radio-inline").removeClass("hidden"); + }else{ + $(this).parents(".radio-inline").addClass("hidden"); + } + }); + if($(".doLog").find("[name$='doLog'] [value='"+doLogValue+"']:visible")){ + $(".doLog").find("[name$='doLog'] [value='"+doLogValue+"']:visible").attr("checked",true); + }else if($(".doLog").find("[name$='doLog'] [value='"+defaults+"']:visible")){//默认值为2 + $(".doLog").find("[name$='doLog'] [value='2']:visible").attr("checked",true); + } + } - } + } var doLogOpt=function(doLog){ var doLogObj={}; var doArr=doLog.split(';'); doLogObj.isShown=doArr[0]; doLogObj.options=doArr[1]; + doLogObj.defaults=doArr[2]; return doLogObj; } \ No newline at end of file