From 6c80e62a45bb1ae6f718f3d3e730304691980647 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 20 Aug 2018 22:27:16 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=9B=BE=E7=89=87IP=EF=BC=8CAPP=20IP=20IP?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=85=B3=E7=B3=BB=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/update_function_region_dict_data.sql | 11 +++- .../WEB-INF/views/cfg/app/appIpCfgForm.jsp | 18 +++--- .../WEB-INF/views/cfg/av/picIp/picIpForm.jsp | 22 ++++--- .../WEB-INF/views/cfg/whitelist/ipForm.jsp | 59 ++++--------------- 4 files changed, 46 insertions(+), 64 deletions(-) diff --git a/src/main/resources/sql/update_function_region_dict_data.sql b/src/main/resources/sql/update_function_region_dict_data.sql index 74ab782f2..b160a3ff3 100644 --- a/src/main/resources/sql/update_function_region_dict_data.sql +++ b/src/main/resources/sql/update_function_region_dict_data.sql @@ -14,4 +14,13 @@ UPDATE function_service_dict SET region_code=1 WHERE function_id=200 AND ACTION UPDATE function_region_dict SET config_service_type='ratelimit',config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=53; #音视频IP UPDATE function_service_dict SET region_code=2 WHERE function_id=20 AND ACTION IN(1,16); -UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=17; \ No newline at end of file +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=17; +#图片IP +UPDATE function_service_dict SET region_code=1 WHERE function_id=21 AND ACTION IN(1,16); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=24; +#APP IP +UPDATE function_service_dict SET region_code=1 WHERE function_id=405 AND ACTION IN(1); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=62; +#IP白名单 +UPDATE function_service_dict SET region_code=1 WHERE function_id=3 AND ACTION IN(128); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=7; \ No newline at end of file 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 51a3797dc..5338c35b9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp @@ -5,12 +5,7 @@ <spring:message code="${cfgName}"></spring:message> <%-- @@ -12,7 +11,17 @@ test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}"> --%> - + <%-- --%> 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 cde6ebb7f..3e3a4077e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -13,13 +13,14 @@ $(document) .ready( function() { - $("#cancel").on("click", function() { + initCommIpVal(); + /* $("#cancel").on("click", function() { window.history.back(); }); $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); - }); + }); */ $("#fileInfo").on('click',function(){ $("#file").trigger("click"); }); @@ -180,6 +181,7 @@ checked> 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 75400e84b..198c88e2b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -13,13 +13,14 @@ $(document) .ready( function() { - $("#cancel").on("click", function() { - window.history.back(); - }); - $(".action").on("change", function() { - $("#serviceId").val($(this).attr("serviceId")); - $("#protocolId").val($(this).attr("protocolId")); - }); + initCommIpVal(); + //$("#cancel").on("click", function() { + // window.history.back(); + //}); + //$(".action").on("change", function() { + // $("#serviceId").val($(this).attr("serviceId")); + // $("#protocolId").val($(this).attr("protocolId")); + //}); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); if($("#cfgId").val()!=""){ @@ -241,6 +242,7 @@ checked> 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 187c5374c..8122884a6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -13,13 +13,14 @@ $(document) .ready( function() { - $("#cancel").on("click", function() { + initCommIpVal(); + /* $("#cancel").on("click", function() { window.history.back(); }); $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); - }); + }); */ $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); $("#cfgFrom").validate( @@ -174,6 +175,7 @@ checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp index 19bcf95b9..85e4826df 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -69,6 +69,7 @@ $(function(){ portPattern="${region.configPortPattern}" direction="${region.configDirection}" protocol="${region.configProtocol}" + regionType="${region.regionType}" value="${region.configRegionCode}"> diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 3dfca5fc4..d3d739052 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -362,52 +362,72 @@ $(function(){ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); - + var actionCode=$(this).val(); var regionCode=$(this).attr("regionCode"); if(!regionCode){ regionCode=$("input[name='action']").attr("regionCode"); } if(regionCode){ - $("[id^='cfgRegionCode']").each(function(){ - if($(this).attr("id")==("cfgRegionCode"+regionCode)){ - $(this).attr("name","cfgRegionCode"); - }else{ - $(this).removeAttr("name"); + if(regionCode.indexOf(",")==-1){ + $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); + $("#cfgType"+regionCode).attr("name","cfgType"); + $("[id^='cfgRegionCode']").each(function(){ + if($(this).attr("id")==("cfgRegionCode"+regionCode)){ + $(this).attr("name","cfgRegionCode"); + }else{ + $(this).removeAttr("name"); + } + }); + $("[id^='cfgType']").each(function(){ + if($(this).attr("id")==("cfgType"+regionCode)){ + $(this).attr("name","cfgType"); + }else{ + $(this).removeAttr("name"); + } + }); + }else{ + var _region=''; + var regionArr=regionCode.split(','); + $("input[name$='cfgRegionCode'][regionType='1']").each(function(){ + for(var re in regionArr){ + if($(this).val()==regionArr[re]){ + serviceType=$(this).attr("serviceType"); + _region=regionArr[re]; + break; + } + } + }); + if(_region!=''){ + regionCode=_region; } - }); - $("[id^='cfgType']").each(function(){ - if($(this).attr("id")==("cfgType"+regionCode)){ - $(this).attr("name","cfgType"); - }else{ - $(this).removeAttr("name"); - } - }); - var ipPortShow=$("input[name='cfgRegionCode']").attr("ipPortShow"), - ipType=$("input[name='cfgRegionCode']").attr("ipType"), - ipPattern=$("input[name='cfgRegionCode']").attr("ipPattern"), - portPattern=$("input[name='cfgRegionCode']").attr("portPattern"), - direction=$("input[name='cfgRegionCode']").attr("direction"), - protocol=$("input[name='cfgRegionCode']").attr("protocol"); + } + var ipPortShow=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPortShow"), + ipType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipType"), + ipPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPattern"), + portPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("portPattern"), + direction=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("direction"), + protocol=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("protocol"), + regionType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("regionType"); //ip，端口处理 if(ipPortShow){ if(ipPortShow.indexOf('1')>-1){//展示源IP,端口 - $("input[name='srcIpAddress']").parents(".form-group").removeClass("hidden"); - $("input[name='srcPort']").parents(".form-group").removeClass("hidden"); + $("input[name$='srcIpAddress']").parents(".form-group").removeClass("hidden"); + $("input[name$='srcPort']").parents(".form-group").removeClass("hidden"); }else{ - $("input[name='srcIpAddress']").parents(".form-group").addClass("hidden"); - $("input[name='srcPort']").parents(".form-group").addClass("hidden"); + $("input[name$='srcIpAddress']").parents(".form-group").addClass("hidden"); + $("input[name$='srcPort']").parents(".form-group").addClass("hidden"); } if(ipPortShow.indexOf('2')>-1){//展示目的IP,端口 - $("input[name='destIpAddress']").parents(".form-group").removeClass("hidden"); - $("input[name='destPort']").parents(".form-group").removeClass("hidden"); + $("input[name$='destIpAddress']").parents(".form-group").removeClass("hidden"); + $("input[name$='destPort']").parents(".form-group").removeClass("hidden"); }else{ - $("input[name='destIpAddress']").parents(".form-group").addClass("hidden"); - $("input[name='destPort']").parents(".form-group").addClass("hidden"); + $("input[name$='destIpAddress']").parents(".form-group").addClass("hidden"); + $("input[name$='destPort']").parents(".form-group").addClass("hidden"); } } if(ipType){ var arr=ipType.split(','); - $("select[name='ipType'] option").each(function(){ + $("select[name$='ipType'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -422,10 +442,11 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='ipType']").selectpicker("refresh"); } if(ipPattern){ arr=ipPattern.split(','); - $("select[name='ipPattern'] option").each(function(){ + $("select[name$='ipPattern'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -440,10 +461,11 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='ipPattern']").selectpicker("refresh"); } if(portPattern){ arr=portPattern.split(','); - $("select[name='portPattern'] option").each(function(){ + $("select[name$='portPattern'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -458,10 +480,11 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='portPattern']").selectpicker("refresh"); } if(direction){ arr=direction.split(','); - $("select[name='direction'] option").each(function(){ + $("select[name$='direction'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -476,11 +499,12 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='direction']").selectpicker("refresh"); } if(protocol){ arr=protocol.split(','); - $("select[name='protocol'] option").each(function(){ + $("select[name$='protocol'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -495,21 +519,19 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='protocol']").selectpicker("refresh"); } //处理自定义字段 - var serviceType=$("#cfgRegionCode"+regionCode).attr("serviceType"); + var serviceType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("serviceType"); if(serviceType){ if(serviceType.indexOf("ipaddr")>-1){ if($(this).val()==32){ - $("select[name='protocol'] option").each(function(){ - if($(this).attr("value")==1){ - $(this).removeAttr("disabled"); - } - }); - $("select[name='protocol']").selectpicker("refresh"); + $("select[name$='protocol'] option[value='1']").removeAttr("disabled") + }else{ + $("select[name$='protocol'] option[value='1']").attr("disabled",true); } - + $("select[name$='protocol']").selectpicker("refresh"); } if(serviceType.indexOf("ipmulitiplex")>-1){ $(".ipmulitiplex").removeClass("hidden"); @@ -526,7 +548,7 @@ $(function(){ $(".ratelimit").addClass("hidden"); } if($(this).val()==0x20||$(this).val()==0x60){ - $("input[name='isAreaEffective']").each(function(){ + $("input[name$='isAreaEffective']").each(function(){ if($(this).val()==0){ $(this).click(); } @@ -1362,35 +1384,55 @@ var validateInvisibleCharTag=function(){ return true; } var initCommIpVal=function(){ - var regionCode,serviceType; - if($("input[name='action']:checked").length>0){ - regionCode=$("input[name='action']:checked").attr("regionCode"); - serviceType=$("#cfgRegionCode"+regionCode).attr("serviceType"); - + var regionCode,serviceType,ipPortShow,ipType, + ipPattern,portPattern,direction,protocol,regionType; + if($("input[name$='action']:checked").length>0){ + regionCode=$("input[name$='action']:checked").attr("regionCode"); }else{ - regionCode=$("input[name='action']").attr("regionCode"); - serviceType=$("#cfgRegionCode"+regionCode).attr("serviceType"); + regionCode=$("input[name$='action']").attr("regionCode"); + } + if(regionCode){ + if(regionCode.indexOf(",")==-1){ + $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); + $("#cfgType"+regionCode).attr("name","cfgType"); + serviceType=$("input[name$='cfgRegionCode'][regionType='1'][value='"+regionCode+"']").attr("serviceType"); + }else{ + var _region=''; + var regionArr=regionCode.split(','); + $("input[name$='cfgRegionCode'][regionType='1']").each(function(){ + for(var re in regionArr){ + if($(this).val()==regionArr[re]){ + serviceType=$(this).attr("serviceType"); + _region=regionArr[re]; + break; + } + } + }); + if(_region!=''){ + regionCode=_region; + } + } } if(serviceType){ - if(serviceType.indexOf("ipaddr")>-1&&$("input[name='action']:checked").val()==32){ - $("select[name='protocol'] option").each(function(){ + if(serviceType.indexOf("ipaddr")>-1&&$("input[name$='action']:checked").val()==32){ + $("select[name$='protocol'] option").each(function(){ if($(this).attr("value")==1){ $(this).removeAttr("disabled"); } }); - $("select[name='protocol']").selectpicker("refresh"); + $("select[name$='protocol']").selectpicker("refresh"); } - if(serviceType&&serviceType.indexOf("ipaddr")>-1&&$("input[name='action']").val()==32){ - $("select[name='protocol'] option").each(function(){ + if(serviceType&&serviceType.indexOf("ipaddr")>-1&&$("input[name$='action']").val()==32){ + $("select[name$='protocol'] option").each(function(){ if($(this).attr("value")==1){ $(this).removeAttr("disabled"); } }); - $("select[name='protocol']").selectpicker("refresh"); + $("select[name$='protocol']").selectpicker("refresh"); } if(serviceType.indexOf("ipmulitiplex")>-1){ $(".ipmulitiplex").removeClass("hidden"); - $("input[name='isAreaEffective']").each(function(){ + $("input[name$='isAreaEffective']").each(function(){ if($(this).val()==0){ $(this).click(); } @@ -1401,7 +1443,7 @@ var initCommIpVal=function(){ $(".ipmulitiplex").addClass("hidden"); } if(serviceType.indexOf("ratelimit")>-1){ - if($("input[name='action']").val()==64||$("input[name='action']:checked").val()==64){ + if($("input[name$='action']").val()==64||$("input[name$='action']:checked").val()==64){ $(".ratelimit").removeClass("hidden"); }else{ $(".ratelimit").addClass("hidden"); @@ -1410,41 +1452,33 @@ var initCommIpVal=function(){ $(".ratelimit").addClass("hidden"); } } - $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); - $("#cfgType"+regionCode).attr("name","cfgType"); - $("div[class^='region']").each(function(){ - if(!$(this).hasClass("region"+regionCode)){ - $(this).addClass("hidden"); - $(this).find("input").removeAttr("name"); - $(this).find("select").removeAttr("name"); - } - }) - var ipPortShow=$("input[name='cfgRegionCode']").attr("ipPortShow"), - ipType=$("input[name='cfgRegionCode']").attr("ipType"), - ipPattern=$("input[name='cfgRegionCode']").attr("ipPattern"), - portPattern=$("input[name='cfgRegionCode']").attr("portPattern"), - direction=$("input[name='cfgRegionCode']").attr("direction"), - protocol=$("input[name='cfgRegionCode']").attr("protocol"); + ipPortShow=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPortShow"), + ipType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipType"), + ipPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPattern"), + portPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("portPattern"), + direction=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("direction"), + protocol=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("protocol"), + regionType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("regionType"); //ip，端口处理 if(ipPortShow){ if(ipPortShow.indexOf('1')>-1){//展示源IP,端口 - $("input[name='srcIpAddress']").parents(".form-group").removeClass("hidden"); - $("input[name='srcPort']").parents(".form-group").removeClass("hidden"); + $("input[name$='srcIpAddress']").parents(".form-group").removeClass("hidden"); + $("input[name$='srcPort']").parents(".form-group").removeClass("hidden"); }else{ - $("input[name='srcIpAddress']").parents(".form-group").addClass("hidden"); - $("input[name='srcPort']").parents(".form-group").addClass("hidden"); + $("input[name$='srcIpAddress']").parents(".form-group").addClass("hidden"); + $("input[name$='srcPort']").parents(".form-group").addClass("hidden"); } if(ipPortShow.indexOf('2')>-1){//展示目的IP,端口 - $("input[name='destIpAddress']").parents(".form-group").removeClass("hidden"); - $("input[name='destPort']").parents(".form-group").removeClass("hidden"); + $("input[name$='destIpAddress']").parents(".form-group").removeClass("hidden"); + $("input[name$='destPort']").parents(".form-group").removeClass("hidden"); }else{ - $("input[name='destIpAddress']").parents(".form-group").addClass("hidden"); - $("input[name='destPort']").parents(".form-group").addClass("hidden"); + $("input[name$='destIpAddress']").parents(".form-group").addClass("hidden"); + $("input[name$='destPort']").parents(".form-group").addClass("hidden"); } } if(ipType){ var arr=ipType.split(','); - $("select[name='ipType'] option").each(function(){ + $("select[name$='ipType'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -1462,7 +1496,7 @@ var initCommIpVal=function(){ } if(ipPattern){ arr=ipPattern.split(','); - $("select[name='ipPattern'] option").each(function(){ + $("select[name$='ipPattern'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -1480,7 +1514,7 @@ var initCommIpVal=function(){ } if(portPattern){ arr=portPattern.split(','); - $("select[name='portPattern'] option").each(function(){ + $("select[name$='portPattern'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -1498,7 +1532,7 @@ var initCommIpVal=function(){ } if(direction){ arr=direction.split(','); - $("select[name='direction'] option").each(function(){ + $("select[name$='direction'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -1516,7 +1550,7 @@ var initCommIpVal=function(){ } if(protocol){ arr=protocol.split(','); - $("select[name='protocol'] option").each(function(){ + $("select[name$='protocol'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ From 0f64a1c10e5705d3c9a7372923a3f7ca75f4b0aa Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 21 Aug 2018 08:27:18 +0800 Subject: [PATCH 3/9] =?UTF-8?q?DDOS=20IP,PXY=E6=8E=A7=E5=88=B6=E7=AD=96?= =?UTF-8?q?=E7=95=A5,FTP=E9=A1=B5=E9=9D=A2IP=E5=8A=A0=E5=85=A5function=5Fr?= =?UTF-8?q?egion=5Fdict=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/update_function_region_dict_data.sql | 25 +++++++++++++++++++ .../WEB-INF/views/cfg/av/picIp/picIpForm.jsp | 1 + .../WEB-INF/views/cfg/ddosIpCfgForm.jsp | 18 ++++++++++--- .../views/cfg/fileTransfer/ftpForm.jsp | 6 +++-- .../cfg/proxy/control/httpRedirectForm.jsp | 6 +++-- 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/main/resources/sql/update_function_region_dict_data.sql b/src/main/resources/sql/update_function_region_dict_data.sql index 84e59ed68..bce43004c 100644 --- a/src/main/resources/sql/update_function_region_dict_data.sql +++ b/src/main/resources/sql/update_function_region_dict_data.sql @@ -33,4 +33,29 @@ UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,4 # mail ip UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=35 AND ACTION IN(16,1); UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=33; +# ddos ip +UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=301 AND ACTION IN(32); +UPDATE function_region_dict SET config_ip_port_show='2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=74; +# ftp ip +UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=51 AND ACTION IN(1,16); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=38; +# pxy control +UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=207 AND ACTION IN(16); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=84; +#pxy redirect +UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=208 AND ACTION IN(48); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=90; +#pxy replace +UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=209 AND ACTION IN(80); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=96; +#pxy monit +UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=210 AND ACTION IN(1); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=105; +#pxy whitelist +UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=211 AND ACTION IN(128); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=101; + + + + 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 d8d983023..25d6eaefe 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 @@ -87,6 +87,7 @@ $(function(){ checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp index bc8d554d0..ff60ed13f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp @@ -5,13 +5,14 @@ <spring:message code="${cfgName}"></spring:message>