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 edaef49a1..cc3a9d1da 100644 --- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java +++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java @@ -143,6 +143,12 @@ public class ObjectGroupService extends BaseService { }else if(entity.getAction().equals(16)){ entity.setServiceId(34); } + }else if("streaming_media".equalsIgnoreCase(protocolType)){ + if(entity.getAction().equals(1)){ + entity.setServiceId(151); + }else if(entity.getAction().equals(16)){ + entity.setServiceId(39); + } }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 d4a8980bc..55a013006 100644 --- a/src/main/resources/service/service_config.xml +++ b/src/main/resources/service/service_config.xml @@ -219,14 +219,14 @@ - - - + + + - - - + + + @@ -437,6 +437,6 @@ - - + + \ 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 fa66a6438..19d4cb402 100644 --- a/src/main/resources/sql/20190701/obj_protocol.sql +++ b/src/main/resources/sql/20190701/obj_protocol.sql @@ -8,3 +8,4 @@ INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, ` 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'; INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'p2p', 'P2P', 'P2P协议', 9, 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 'streaming_media', 'streaming_media', '流媒体协议', 10, 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 4eacff542..3fb94eb79 100644 --- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp @@ -34,7 +34,7 @@ $(function(){ //处理do_log $(".doLog").addClass("hidden"); $("[name='doLog']").find("[value=2]").prop("checked",true); - }else if('${_cfg.userRegion1}'=='https'||'${_cfg.userRegion1}'=='http'||'${_cfg.userRegion1}'=='ftp'){ + }else if('${_cfg.userRegion1}'=='https'||'${_cfg.userRegion1}'=='http'||'${_cfg.userRegion1}'=='ftp'||'${_cfg.userRegion1}'=='streaming_media'){ $(".domainGroup").addClass("hidden").addClass("disabled"); $(".subscribeIdGroup").removeClass("hidden").removeClass("disabled"); $(".urlGroup").removeClass("hidden").removeClass("disabled"); @@ -98,7 +98,7 @@ $(function(){ $(this).removeAttr("checked"); } }) - }else if("https"==$(this).val()||"http"==$(this).val()||"ftp"==$(this).val()){ + }else if("https"==$(this).val()||"http"==$(this).val()||"ftp"==$(this).val()||"streaming_media"==$(this).val()){ $(".urlGroup").removeClass("hidden").removeClass("disabled"); $(".subscribeIdGroup").removeClass("hidden").removeClass("disabled"); $(".domainGroup").addClass("hidden").addClass("disabled");