diff options
4 files changed, 17 insertions, 10 deletions
diff --git a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java index 915eabd18..c55e64aba 100644 --- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java +++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java @@ -125,6 +125,12 @@ public class ObjectGroupService extends BaseService { }else if(entity.getAction().equals(16)){ entity.setServiceId(21); } + }else if("BGP".equalsIgnoreCase(protocolType)){ + if(entity.getAction().equals(1)){ + entity.setServiceId(143); + }else if(entity.getAction().equals(16)){ + entity.setServiceId(31); + } }else if(StringUtils.isBlank(protocolType)){ if(MapUtils.isNotEmpty(entity.getUserRegion())&&entity.getUserRegion().containsKey("ipGroup")){ if(entity.getAction().equals(1)){ diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml index f2df1291e..8276910e3 100644 --- a/src/main/resources/service/service_config.xml +++ b/src/main/resources/service/service_config.xml @@ -106,14 +106,14 @@ <userRegion regionKey="config_id" regionColumn="compileId" userRegionPosition="1"></userRegion>
</service>
<service id="31" functionId="61" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="BGP封堵">
- <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
+ <serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="NTC_UNIVERSAL_IP" protocolMaatTable="NTC_UNIVERSAL_PROTO_TYPE"></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_bgp_as_cfg" ></serviceCfg>
- <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
+ <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="NTC_SUBSCRIBE_ID"></serviceCfg>
</service>
<service id="143" functionId="61" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="BGP监测">
- <serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
+ <serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="NTC_UNIVERSAL_IP" protocolMaatTable="NTC_UNIVERSAL_PROTO_TYPE"></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_bgp_as_cfg" ></serviceCfg>
- <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
+ <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="NTC_SUBSCRIBE_ID"></serviceCfg>
</service>
<service id="18" functionId="7" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="DNS封堵">
<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="NTC_UNIVERSAL_IP" protocolMaatTable="NTC_UNIVERSAL_PROTO_TYPE"></serviceCfg>
@@ -437,6 +437,6 @@ <serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
- <service id="0" serviceIds="512,592,128,129,130,132,133" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组监测"></service>
- <service id="-1" serviceIds="576,16,17,18,20,21" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组阻断"></service>
+ <service id="0" serviceIds="512,592,128,129,130,132,133,143" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组监测"></service>
+ <service id="-1" serviceIds="576,16,17,18,20,21,31" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组阻断"></service>
</serviceList>
\ No newline at end of file diff --git a/src/main/resources/sql/20190701/obj_protocol.sql b/src/main/resources/sql/20190701/obj_protocol.sql index 5be23d138..dd3d1f544 100644 --- a/src/main/resources/sql/20190701/obj_protocol.sql +++ b/src/main/resources/sql/20190701/obj_protocol.sql @@ -5,4 +5,5 @@ INSERT INTO`sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `i INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'mail', 'mail', '邮件协议', 4, 1, 1, sn.id from `sys_data_dictionary_name` sn where sn.mark='OBJ_GROUP_PROTOCOL'; INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'intercept', 'intercept', 'HTTPS拦截', 3, 1, 1, sn.id from `sys_data_dictionary_name` sn where sn.mark='OBJ_GROUP_PROTOCOL'; INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'https', 'HTTPS', 'HTTPS协议', 2, 1, 1, sn.id from `sys_data_dictionary_name` sn where sn.mark='OBJ_GROUP_PROTOCOL'; -INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'http', 'HTTP', 'HTTP协议', 1, 1, 1, sn.id from `sys_data_dictionary_name` sn where sn.mark='OBJ_GROUP_PROTOCOL';
\ No newline at end of file +INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'http', 'HTTP', 'HTTP协议', 1, 1, 1, sn.id from `sys_data_dictionary_name` sn where sn.mark='OBJ_GROUP_PROTOCOL'; +INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'bgp', 'BGP', 'BGP协议', 7, 1, 1, sn.id from `sys_data_dictionary_name` sn where sn.mark='OBJ_GROUP_PROTOCOL';
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp index 12995535e..2f42f5bee 100644 --- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp @@ -38,7 +38,7 @@ $(function(){ $(".domainGroup").addClass("hidden").addClass("disabled"); $(".subscribeIdGroup").removeClass("hidden").removeClass("disabled"); $(".urlGroup").removeClass("hidden").removeClass("disabled"); - }else if("${_cfg.userRegion1}"==""){ + }else if("${_cfg.userRegion1}"==""||"${_cfg.userRegion1}"=="bgp"){ $(".domainGroup").addClass("hidden").addClass("disabled"); $(".subscribeIdGroup").addClass("hidden").addClass("disabled"); $(".urlGroup").addClass("hidden").addClass("disabled"); @@ -104,7 +104,7 @@ $(function(){ $(".domainGroup").addClass("hidden").addClass("disabled"); //处理do_log $(".doLog").removeClass("hidden"); - }else if(""==$(this).val()){ + }else if(""==$(this).val()||"bgp"==$(this).val()){ $(".urlGroup").addClass("hidden").addClass("disabled"); $(".subscribeIdGroup").addClass("hidden").addClass("disabled"); $(".domainGroup").addClass("hidden").addClass("disabled"); @@ -161,7 +161,7 @@ $(function(){ top.$.jBox.tip("<spring:message code='at_least_one_group'/>", "<spring:message code='info'/>"); return; }else{ - if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail"||$("[name='userRegion1']").val()=="dns"||$("[name='userRegion1']").val()=="ftp")&&ipGroupLen>0){ + if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail"||$("[name='userRegion1']").val()=="dns"||$("[name='userRegion1']").val()=="ftp"||$("[name='userRegion1']").val()=="bgp")&&ipGroupLen>0){ if(grouplen>7){ top.$.jBox.tip("<spring:message code='most_seven_group'/>", "<spring:message code='info'/>"); return; |