From 0ef3d34fe453c82bf026c84653ee3dcb6af03ab1 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Thu, 29 Nov 2018 11:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=9F=9F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84SQL=E8=AF=AD=E5=8F=A5=EF=BC=8CASN=20IP?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2SQL=E5=A2=9E=E5=8A=A0region=5Fid=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=AD=A3=E4=B8=9A=E5=8A=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=9F=9F=E9=94=99=E8=AF=AF=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigSynchronizationDao.xml              | 33 ++++++++++++++-----
 src/main/resources/service/service_config.xml | 26 +++++++--------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
index d2a854923..8d5abd9d9 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
@@ -750,7 +750,7 @@
   <sql id="AsnIpCfg_Column" >
     a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.asn_ip_group,
-    a.user_region1
+    a.user_region1,a.region_id
   </sql>
   <sql id="StrCfg_Column" >
   a.cfg_keywords,a.cfg_type,
@@ -1218,11 +1218,14 @@
     
     <select id="getIpPortListByService" resultMap="ipPortMap" >
 		 select 
-		 	<include refid="BaseCfg_Column"></include>,
+		 	a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
+	a.service_id,a.request_id,a.is_area_effective,a.classify,a.attribute,a.lable,
+	a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2,
+	a.user_region3,a.user_region4,a.user_region5,
     		<include refid="IpCfg_Column"></include>
     		 <trim prefix="," prefixOverrides=",">
 				,s.name as creator_name,u.name as auditor_name
-				<if test="serviceId=1028">
+				<if test="serviceId==1028">
 	     		,a.app_code,a.spec_service_id,a.behav_code
 	     		</if>
 			</trim>
@@ -1270,11 +1273,22 @@
   </select>
   <select id="getStrListByService" resultMap="stringCfgMap" >
 		 select 
-		 	<include refid="BaseCfg_Column"></include>,
-    		<include refid="StrCfg_Column"></include>
+		 	a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
+	a.service_id,a.request_id,a.is_area_effective,a.classify,a.attribute,a.lable,
+	a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2,
+	a.user_region3,a.user_region4,a.user_region5,
+	<choose>
+		<when test="serviceId==1026">
+			a.domain as cfg_keywords,
+		</when>
+		<otherwise>
+			a.cfg_keywords,
+		</otherwise>
+	</choose>   		
+    a.cfg_type, a.expr_type,a.match_method,a.is_hexbin,a.compile_id		
     		 <trim prefix="," prefixOverrides=",">
 				,s.name as creator_name,u.name as auditor_name
-				<if test="serviceId=1024 or serviceId=1026 or serviceId=1029">
+				<if test="serviceId==1024 or serviceId==1026 or serviceId==1029">
 	     		,a.app_code,a.spec_service_id,a.behav_code
 	     		</if>
 			</trim>
@@ -1298,11 +1312,14 @@
   </select>
   <select id="getComplexStrListByService" resultMap="complexCfgMap" >
 		 select 
-		 	<include refid="BaseCfg_Column"></include>,
+		 	a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
+	a.service_id,a.request_id,a.is_area_effective,a.classify,a.attribute,a.lable,
+	a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2,
+	a.user_region3,a.user_region4,a.user_region5,
     		<include refid="ComplexCfg_Column"></include>
     		 <trim prefix="," prefixOverrides=",">
 				,s.name as creator_name,u.name as auditor_name
-				<if test="serviceId=1024 or serviceId=1026 or serviceId=1029">
+				<if test="serviceId==1024 or serviceId==1026 or serviceId==1029">
 	     			,a.app_code,a.spec_service_id,a.behav_code
 	     		</if>
 			</trim>
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 0e5c8a367..842c73102 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -268,42 +268,42 @@
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="145" functionId="63" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="APP监测">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1056" functionId="63" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="APP限速">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="36" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="隧道协议行为封堵">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="148" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="隧道协议行为监测">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1060" functionId="408" serviceType="1" tableName="app_policy_cfg" className="AppPolicyCfg"  desc="隧道协议行为限速">
 		<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
     	<userRegion regionKey="BEHAV_ID" regionColumn="behavCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="Droprate" regionColumn="userRegion2"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1028" functionId="405" serviceType="1" cfgType="1" tableName="app_ip_cfg" className="AppIpCfg"  desc="APP IP特征">
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
@@ -316,11 +316,11 @@
 		<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
 		<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
 	</service>
-	<service id="1026" functionId="403" serviceType="1" tableName="app_domain_cfg" className="AppDomainCfg"  desc="APP 域名特征">
+	<service id="1026" functionId="403" serviceType="1" cfgType="2" tableName="app_domain_cfg" className="AppDomainCfg"  desc="APP 域名特征">
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"  userRegionPosition="0"></userRegion>
     	<userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords"  userRegionPosition="1"></userRegion>
 	</service>
 	<service id="1029" functionId="402" serviceType="1" cfgType="3" tableName="app_ssl_cert_cfg" className="AppSslCertCfg"  desc="APP SSL单特征">
@@ -331,28 +331,28 @@
 		<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
 		<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1025" functionId="563" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex"  desc="APP Payload组合特征">
 		<serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
 		<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1027" functionId="563" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex"  desc="APP DNS组合特征">
 		<serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
 		<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
 	</service>
 	<service id="1030" functionId="567" serviceType="1" tableName="app_feature_index" className="AppFeatureIndex"  desc="APP DK组合特征">
 		<serviceCfg cfgType="1" tableName="app_ip_range_cfg" ></serviceCfg>
 		<serviceCfg cfgType="2" tableName="app_string_feature_cfg" ></serviceCfg>
 		<serviceCfg cfgType="3" tableName="app_complex_feature_cfg" ></serviceCfg>
     	<userRegion regionKey="APP_ID" regionColumn="appCode"  userRegionPosition="1"></userRegion>
-    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="1"></userRegion>
+    	<userRegion regionKey="" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
 	</service>
 	<!-- APP、基础协议、 加密协议行为配置结束-->