From 377cca923cbee0d35633f3ceb432db376bef7504 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 4 Jul 2019 11:38:34 +0800 Subject: [PATCH] =?UTF-8?q?(1)=E6=B5=81=E5=AA=92=E4=BD=93=E6=9C=80?= =?UTF-8?q?=E5=A4=9A7=E4=B8=AA=E7=BB=84=E6=8F=90=E7=A4=BA(2)VoIp=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/configuration/ObjectGroupService.java | 6 ++++++ src/main/resources/service/service_config.xml | 12 ++++++------ src/main/resources/sql/20190701/obj_protocol.sql | 3 ++- src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp | 7 ++++--- 4 files changed, 18 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 cc3a9d1da..be5803f49 100644 --- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java +++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java @@ -149,6 +149,12 @@ public class ObjectGroupService extends BaseService { }else if(entity.getAction().equals(16)){ entity.setServiceId(39); } + }else if("voip".equalsIgnoreCase(protocolType)){ + if(entity.getAction().equals(1)){ + entity.setServiceId(150); + }else if(entity.getAction().equals(16)){ + entity.setServiceId(38); + } }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 55a013006..6c6597af1 100644 --- a/src/main/resources/service/service_config.xml +++ b/src/main/resources/service/service_config.xml @@ -229,14 +229,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 19d4cb402..d7ec588c6 100644 --- a/src/main/resources/sql/20190701/obj_protocol.sql +++ b/src/main/resources/sql/20190701/obj_protocol.sql @@ -8,4 +8,5 @@ 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 +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'; +INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'voip', 'VoIP', 'VoIP协议', 11, 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 3fb94eb79..b54c4e4ed 100644 --- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp @@ -42,7 +42,7 @@ $(function(){ $(".domainGroup").addClass("hidden").addClass("disabled"); $(".subscribeIdGroup").addClass("hidden").addClass("disabled"); $(".urlGroup").addClass("hidden").addClass("disabled"); - }else if($("[name=userRegion1]").val()=="mail"||$("[name=userRegion1]").val()=="dns"||$("[name=userRegion1]").val()=="ssl"||$("[name=userRegion1]").val()=="p2p"){ + }else if($("[name=userRegion1]").val()=="mail"||$("[name=userRegion1]").val()=="dns"||$("[name=userRegion1]").val()=="ssl"||$("[name=userRegion1]").val()=="p2p"||$("[name=userRegion1]").val()=="voip"){ $(".domainGroup").addClass("hidden").addClass("disabled"); $(".subscribeIdGroup").removeClass("hidden").removeClass("disabled"); $(".urlGroup").addClass("hidden").addClass("disabled"); @@ -110,7 +110,7 @@ $(function(){ $(".domainGroup").addClass("hidden").addClass("disabled"); //处理do_log $(".doLog").removeClass("hidden"); - }else if("mail"==$(this).val()||"dns"==$(this).val()||"ssl"==$(this).val()||"p2p"==$(this).val()){ + }else if("mail"==$(this).val()||"dns"==$(this).val()||"ssl"==$(this).val()||"p2p"==$(this).val()||"voip"==$(this).val()){ $(".urlGroup").addClass("hidden").addClass("disabled"); $(".subscribeIdGroup").removeClass("hidden").removeClass("disabled"); $(".domainGroup").addClass("hidden").addClass("disabled"); @@ -163,7 +163,8 @@ $(function(){ }else{ if(($("[name='userRegion1']").val()=="http"||$("[name='userRegion1']").val()=="mail"|| $("[name='userRegion1']").val()=="dns"||$("[name='userRegion1']").val()=="ftp"|| - $("[name='userRegion1']").val()=="bgp"||$("[name='userRegion1']").val()=="ssl")&&ipGroupLen>0){ + $("[name='userRegion1']").val()=="bgp"||$("[name='userRegion1']").val()=="ssl"|| + $("[name='userRegion1']").val()=="streaming_media"||$("[name='userRegion1']").val()=="voip")&&ipGroupLen>0){ if(grouplen>7){ top.$.jBox.tip("", ""); return;