策略对象p2p协议提交（无userRegion）

4 files changed, 15 insertions, 9 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 bf9f72b0d..edaef49a1 100644
--- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
+++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
@@ -137,6 +137,12 @@ public class ObjectGroupService extends BaseService {
             }else if(entity.getAction().equals(16)){
                 entity.setServiceId(19);
             }
+        }else if("P2P".equalsIgnoreCase(protocolType)){
+            if(entity.getAction().equals(1)){
+                entity.setServiceId(146);
+            }else if(entity.getAction().equals(16)){
+                entity.setServiceId(34);
+            }
         }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 9b7c7c12d..d4a8980bc 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -203,18 +203,18 @@
     	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="NTC_SUBSCRIBE_ID"></serviceCfg>

 	</service>

     <service id="34" functionId="510" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="P2P封堵">

-    	<serviceCfg cfgType="1" tableName="ip_port_cfg"></serviceCfg>

+    	<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="NTC_P2P_IP"></serviceCfg>

     	<serviceCfg cfgType="2" tableName="p2p_hash_cfg" ></serviceCfg>

     	<serviceCfg cfgType="2" tableName="p2p_keyword_cfg" ></serviceCfg>

-    	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>

+    	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="NTC_SUBSCRIBE_ID"></serviceCfg>

 	    <userRegion regionKey="P2P_IP_TYPE" regionColumn="userRegion2" userRegionPosition="0"></userRegion>

 	    <userRegion regionKey="P2P_HASH_TYPE" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>

 	</service>

 	<service id="146" functionId="510" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="P2P监测">

-    	<serviceCfg cfgType="1" tableName="ip_port_cfg"></serviceCfg>

+    	<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="NTC_P2P_IP"></serviceCfg>

     	<serviceCfg cfgType="2" tableName="p2p_hash_cfg" ></serviceCfg>

     	<serviceCfg cfgType="2" tableName="p2p_keyword_cfg" ></serviceCfg>

-    	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>

+    	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="NTC_SUBSCRIBE_ID"></serviceCfg>

 	    <userRegion regionKey="P2P_IP_TYPE" regionColumn="userRegion2"  userRegionPosition="0"></userRegion>

 	    <userRegion regionKey="P2P_HASH_TYPE" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>

 	</service>

@@ -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,131,132,133,143" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组监测"></service>

-	<service id="-1" serviceIds="576,16,17,18,19,20,21,31" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组阻断"></service>

+	<service id="0" serviceIds="512,592,128,129,130,131,132,133,143,146" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组监测"></service>

+	<service id="-1" serviceIds="576,16,17,18,19,20,21,31,34" 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 7d3052c03..fa66a6438 100644
--- a/src/main/resources/sql/20190701/obj_protocol.sql
+++ b/src/main/resources/sql/20190701/obj_protocol.sql
@@ -7,4 +7,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 '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';
 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 'ssl', 'SSL', 'SSL协议', 8, 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 'p2p', 'P2P', 'P2P协议', 9, 1, 1, sn.id from `sys_data_dictionary_name` sn where sn.mark='OBJ_GROUP_PROTOCOL';
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 e376b58c0..4eacff542 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"){
+	}else if($("[name=userRegion1]").val()=="mail"||$("[name=userRegion1]").val()=="dns"||$("[name=userRegion1]").val()=="ssl"||$("[name=userRegion1]").val()=="p2p"){
 		$(".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()){
+		}else if("mail"==$(this).val()||"dns"==$(this).val()||"ssl"==$(this).val()||"p2p"==$(this).val()){
 			$(".urlGroup").addClass("hidden").addClass("disabled");
 			$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
 			$(".domainGroup").addClass("hidden").addClass("disabled");