From f3c7c62caa4d6028b343ee23526f4da810dae3e2 Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@intranet.com>
Date: Tue, 5 Jun 2018 11:04:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E7=B1=BB=E9=85=8D=E7=BD=AE=E8=A7=A3=E6=9E=90=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=B8=9A=E5=8A=A1ID=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0INLINE=5FIP=E8=A1=A8=E8=A7=A3=E6=9E=90=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=EF=BC=9B=202=E3=80=81serviceTable.pro=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=9D=9Emaat=E9=85=8D=E7=BD=AERedisDBIndex;=203?=
 =?UTF-8?q?=E3=80=81=E5=B0=86maat.xml=E6=95=B4=E7=90=86=E6=88=90=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=A0=87=E7=AD=BE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/commonSources/commonSources.xml | 20 +++++-
 .../commonSources/commonSourcesSchema.xsd     |  2 +-
 src/main/resources/maatXml/maat.xml           | 72 ++++++++++++++++---
 src/main/resources/serviceTable.properties    |  2 +-
 4 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/commonSources/commonSources.xml b/src/main/resources/commonSources/commonSources.xml
index e77bd08..2738f5a 100644
--- a/src/main/resources/commonSources/commonSources.xml
+++ b/src/main/resources/commonSources/commonSources.xml
@@ -2,7 +2,23 @@
 <t:commonSources xmlns:t="http://www.w3school.com.cn"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.w3school.com.cn commonSourcesSchema.xsd">
-	<t:commonSource serviceIds="96,97,98,99,160,161,162,163">
+	<t:commonSource serviceIds="3,4,25,28,29">
+		<t:field fieldType="String" srcName="service" dstName="service" isRequired="true"/>
+		<t:field fieldType="Number" srcName="cfgId" dstName="cfg_id"  isRequired="true" />
+		<t:field fieldType="IP" srcName="srcIp" dstName="src_ip"  isRequired="true"/>
+		<t:field fieldType="IP" srcName="maskSrcIp" dstName="mask_src_ip"  isRequired="true"/>
+		<t:field fieldType="Port" srcName="srcPort" dstName="src_port" isRequired="true" range="0-65535"/>
+		<t:field fieldType="Port" srcName="maskSrcPort" dstName="mask_src_port" isRequired="true" range="0-65535"/>
+		<t:field fieldType="IP" srcName="dstIp" dstName="dst_ip" isRequired="true"/>
+		<t:field fieldType="IP" srcName="maskDstIp" dstName="mask_dst_ip"  isRequired="true"/>
+		<t:field fieldType="Port" srcName="dstPort" dstName="dst_port" isRequired="true" range="0-65535"/>
+		<t:field fieldType="Port" srcName="maskDstPort" dstName="mask_dst_port" isRequired="true" range="0-65535"/>
+		<t:field fieldType="Number" srcName="direction" dstName="direction" isRequired="true" range="0-1"/>
+		<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/>
+		<t:field fieldType="Date" srcName="opTime" dstName="time_stamp" isRequired="true"/>
+		<t:field fieldType="Number" srcName="" dstName="file_id" defaultVal="[cfgId]"/>
+	</t:commonSource>
+	<t:commonSource serviceIds="261,262,263,264,389,390,391,392">
 		<t:field fieldType="String" srcName="service" dstName="service" isRequired="true"/>
 		<t:field fieldType="Number" srcName="cfgId" dstName="cfg_id"  isRequired="true" />
 		<t:field fieldType="String" srcName="dstFile" dstName="dst_file"  isRequired="true"/>
@@ -12,7 +28,7 @@
 		<t:field fieldType="Date" srcName="opTime" dstName="time_stamp" isRequired="true"/>
 		<t:field fieldType="Number" srcName="" dstName="file_id" defaultVal="[cfgId]"/>
 	</t:commonSource>
-	<t:commonSource serviceIds="100,101,164,165">
+	<t:commonSource serviceIds="265,266,393,394">
 		<t:field fieldType="String" srcName="service" dstName="service" isRequired="true"/>
 		<t:field fieldType="Number" srcName="cfgId" dstName="cfg_id"  isRequired="true" />
 		<t:field fieldType="String" srcName="description" dstName="description"  isRequired="true"/>
diff --git a/src/main/resources/commonSources/commonSourcesSchema.xsd b/src/main/resources/commonSources/commonSourcesSchema.xsd
index 999e54f..7c1ef1f 100644
--- a/src/main/resources/commonSources/commonSourcesSchema.xsd
+++ b/src/main/resources/commonSources/commonSourcesSchema.xsd
@@ -50,7 +50,7 @@
 									</xs:attribute>
 									<xs:attribute name="defaultVal" type="xs:string">
 										<xs:annotation>
-											<xs:documentation><![CDATA[默认值]]>
+											<xs:documentation><![CDATA[默认值，[]包围的代表从其他属性取值]]>
 											</xs:documentation>
 										</xs:annotation>
 									</xs:attribute>	
diff --git a/src/main/resources/maatXml/maat.xml b/src/main/resources/maatXml/maat.xml
index 7f0b4d3..e03496c 100644
--- a/src/main/resources/maatXml/maat.xml
+++ b/src/main/resources/maatXml/maat.xml
@@ -24,7 +24,57 @@
 		</p:expressions>
 	</p:maatType>
 
-	<p:maatType service="100;101;164;165">
+	<p:maatType service="1;2;16;17;18;19;20;21;22;23;24;26;27;30;31;128;129;130;131;132;133;134;135;136;137;138;139;140;141;256;257;258;259;260;384;385;386;387;388;512;513;528;529;544;545;560;561">
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression>
+			<p:valueExpression>[compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time]</p:valueExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{group_table_name};,;[group_id]</p:keyExpression>
+			<p:valueExpression>[group_id];\t;[compile_id];\t;[is_valid];\t;[op_time]</p:valueExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{ip_region_table_name};,;[region_id]</p:keyExpression>
+			<p:valueExpression>[region_id];\t;[group_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]</p:valueExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{str_region_table_name};,;[region_id]</p:keyExpression>
+			<p:valueExpression>[region_id];\t;[group_id];\t;[keywords];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[op_time]</p:valueExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{str_str_region_table_name};,;[region_id]</p:keyExpression>
+			<p:valueExpression>[region_id];\t;[group_id];\t;[keywords];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[op_time]</p:valueExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{num_region_table_name};,;[region_id]</p:keyExpression>
+			<p:valueExpression>[region_id];\t;[group_id];\t;[low_boundary];\t;[up_boundary];\t;[is_valid];\t;[op_time]</p:valueExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{digest_region_table_name};,;[region_id]</p:keyExpression>
+			<p:valueExpression>[region_id];\t;[group_id];\t;[raw_len];\t;[digest];\t;[cfds_level];\t;[is_valid];\t;[op_time]</p:valueExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
+			<!-- <p:valueExpression>add;{tableName};,;{id}</p:valueExpression> -->
+		</p:expressions>
+
+		<p:expressions>
+			<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
+			<!-- <p:valueExpression>[region_id];\t;[group_id];\t;[keywords];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[op_time]</p:valueExpression> -->
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
+			<!-- <p:valueExpression>{region_id};{maatVersion}</p:valueExpression> -->
+		</p:expressions>
+
+		<p:sequences>
+			<p:operation>1</p:operation>
+			<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
+		</p:sequences>
+	</p:maatType>
+
+
+<!-- 	<p:maatType service="100;101;164;165">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
 			<p:valueExpression>[cfg_id];\t;[service];\t;[level];\t;[description];\t;[is_valid]</p:valueExpression>
@@ -65,16 +115,16 @@
 		<p:expressions>
 			<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
 			<!-- <p:valueExpression>add;{tableName};,;{id}</p:valueExpression> -->
-		</p:expressions>
+<!-- 		</p:expressions>
 
 		<p:expressions>
 			<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
 			<!-- <p:valueExpression>[region_id];\t;[group_id];\t;[keywords];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[op_time]</p:valueExpression> -->
-		</p:expressions>
+<!--		</p:expressions>
 		<p:expressions>
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 			<!-- <p:valueExpression>{region_id};{maatVersion}</p:valueExpression> -->
-		</p:expressions>
+<!--	</p:expressions>
 
 		<p:sequences>
 			<p:operation>1</p:operation>
@@ -106,16 +156,16 @@
 		<p:expressions>
 			<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
 			<!-- <p:valueExpression>add;{tableName};,;{id}</p:valueExpression> -->
-		</p:expressions>
+<!--	</p:expressions>
 
 		<p:expressions>
 			<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
 			<!-- <p:valueExpression>[region_id];\t;[group_id];\t;[keywords];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[op_time]</p:valueExpression> -->
-		</p:expressions>
+<!--	</p:expressions>
 		<p:expressions>
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 			<!-- <p:valueExpression>{region_id};{maatVersion}</p:valueExpression> -->
-		</p:expressions>
+<!--	</p:expressions>
 
 		<p:sequences>
 			<p:operation>1</p:operation>
@@ -146,16 +196,16 @@
 		<p:expressions>
 			<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
 			<!-- <p:valueExpression>add;{tableName};,;{id}</p:valueExpression> -->
-		</p:expressions>
+<!--	</p:expressions>
 
 		<p:expressions>
 			<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
 			<!-- <p:valueExpression>[region_id];\t;[group_id];\t;[keywords];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[op_time]</p:valueExpression> -->
-		</p:expressions>
+<!--		</p:expressions>
 		<p:expressions>
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 			<!-- <p:valueExpression>{region_id};{maatVersion}</p:valueExpression> -->
-		</p:expressions>
+<!--		</p:expressions>
 
 		<p:sequences>
 			<p:operation>1</p:operation>
@@ -163,7 +213,7 @@
 		</p:sequences>
 	</p:maatType>
 
-
+-->
 
 </p:maat>
 
diff --git a/src/main/resources/serviceTable.properties b/src/main/resources/serviceTable.properties
index 5599b69..103bf54 100644
--- a/src/main/resources/serviceTable.properties
+++ b/src/main/resources/serviceTable.properties
@@ -93,7 +93,7 @@ unMaatService=3:32;4:96;25:32;28:32;29:32;261:16;262:16;263:16;264:16;265:16;266
 
 ##各业务类型对应的redisdb,业务类型:redisdb,多个业务以“;”分隔,多个db以“,”数量不能超过6个
 #serviceDBIndex=3:2,3;1:2;80:2;81:2;82:2;83:2;84:2;85:2;144:2;145:2;146:2;147:2;148:2;149:2;96:3;97:3;98:3;99:3;160:3,4;161:3;162:3;163:3;100:3;101:3;164:3;165:3
-serviceDBIndex=1:2,3,4;2:2,3,4;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;256:2;257:2;258:2;259:2;260:2;384:2;385:2;386:2;387:2;388:2;512:2;513:2;528:2;529:2;544:2;545:2;560:2;561:2;
+serviceDBIndex=1:2,3,4;2:2,3,4;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;256:2;257:2;258:2;259:2;260:2;384:2;385:2;386:2;387:2;388:2;512:2;513:2;528:2;529:2;544:2;545:2;560:2;561:2;3:5;4:5;25:5;28:5;29:5;261:5;262:5;263:5;264:5;265:5;266:5;389:5;390:5;391:5;392:5;393:5;394:5;