From 9552bdc05f69261c2d64f4e2e4813484e90061e2 Mon Sep 17 00:00:00 2001
From: RenKaiGe-Office <RenKaiGe-Office@renkaige-office>
Date: Tue, 17 Jul 2018 10:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1261;262;263?=
 =?UTF-8?q?;264=E5=AF=B9=E5=BA=94=E7=9A=84=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maatXml/applicationConfig-maatRedis.xml   | 223 +++++++-----------
 1 file changed, 82 insertions(+), 141 deletions(-)

diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
index c8bbd3c..f51d84f 100644
--- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml
+++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
@@ -2,17 +2,36 @@
 <p:maat xmlns:p="http://www.w3school.com.cn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.w3school.com.cn applicationConfig-maatRedis.schema.xsd">
 
-	<!--
-		#0x105	音频样例阻断	261=0:MM_SAMPLE_AUDIO
-		#0x106	视频样例阻断	262=0:MM_SAMPLE_VIDEO
-		#0x107	图片样例阻断	263=0:MM_SAMPLE_PIC
-		#0x108	VOIP样例阻断	264=0:MM_SAMPLE_VOIP
-		#0x185	音频样例监测	389=0:MM_SAMPLE_AUDIO
-		#0x186	视频样例监测	390=0:MM_SAMPLE_VIDEO
-		#0x187	图片样例监测	391=0:MM_SAMPLE_PIC
-		#0x188	VOIP样例监测	392=0:MM_SAMPLE_VOIP
-	 -->
-	<p:maatType service="261;262;263;264;389;390;391;392">
+	<!-- #0x105 音频样例阻断 261=0:MM_SAMPLE_AUDIO #0x106 视频样例阻断 262=0:MM_SAMPLE_VIDEO 
+		#0x107 图片样例阻断 263=0:MM_SAMPLE_PIC #0x108 VOIP样例阻断 264=0:MM_SAMPLE_VOIP #0x185 
+		音频样例监测 389=0:MM_SAMPLE_AUDIO #0x186 视频样例监测 390=0:MM_SAMPLE_VIDEO #0x187 图片样例监测 
+		391=0:MM_SAMPLE_PIC #0x188 VOIP样例监测 392=0:MM_SAMPLE_VOIP -->
+
+	<p:maatType service="261;262;263;264">
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
+			<p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression>
+<!-- 			<p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression> -->
+		</p:expressions>
+		<p:sequences>
+			<p:operation>1</p:operation>
+			<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
+		</p:sequences>
+		<p:expressions>
+			<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
+		</p:expressions>
+
+		<p:expressions>
+			<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
+		</p:expressions>
+	</p:maatType>
+
+
+
+	<p:maatType service="389;390;391;392">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
 			<p:valueExpression>[cfg_id];\t;[service];\t;[action];\t;[level];\t;[dst_file];\t;[dst_file_md5];\t;[is_valid];\t;[op_time];&amp;nbsp;[file_id];\n</p:valueExpression>
@@ -32,12 +51,8 @@
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 		</p:expressions>
 	</p:maatType>
-	<!-- 
-		#0x109	音频色情阻断	265=0:MM_PORN_AUDIO_LEVEL
-		#0x10A	视频色情阻断	266=0:MM_PORN_VIDEO_LEVEL
-		#0x189	音频色情监测	393=0:MM_PORN_AUDIO_LEVEL
-		#0x18A	视频色情监测	394=0:MM_PORN_VIDEO_LEVEL
-	 -->
+	<!-- #0x109 音频色情阻断 265=0:MM_PORN_AUDIO_LEVEL #0x10A 视频色情阻断 266=0:MM_PORN_VIDEO_LEVEL 
+		#0x189 音频色情监测 393=0:MM_PORN_AUDIO_LEVEL #0x18A 视频色情监测 394=0:MM_PORN_VIDEO_LEVEL -->
 	<p:maatType service="265;266;393;394">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
@@ -58,13 +73,8 @@
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 		</p:expressions>
 	</p:maatType>
-	<!-- 
-		#0x03	IP地址丢弃		3=0:INLINE_IP_CB
-		#0x04	IP地址丢弃		4=0:INLINE_IP_CB
-		#0x19	IPSec丢弃		25=0:INLINE_IP_CB
-		#0x1C	GRE 丢弃		28=0:INLINE_IP_CB
-		#0x05	DDOS流量丢弃	5=0:DDOS_PROTECT_TARGET_IP_CB
-	-->
+	<!-- #0x03 IP地址丢弃 3=0:INLINE_IP_CB #0x04 IP地址丢弃 4=0:INLINE_IP_CB #0x19 IPSec丢弃 
+		25=0:INLINE_IP_CB #0x1C GRE 丢弃 28=0:INLINE_IP_CB #0x05 DDOS流量丢弃 5=0:DDOS_PROTECT_TARGET_IP_CB -->
 	<p:maatType service="3;4;25;28;5">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
@@ -85,9 +95,7 @@
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 		</p:expressions>
 	</p:maatType>
-	<!-- 
-		 #0x40	DNS欺骗配置(回调)	64=0:NTC_DNS_FAKE_IP_CB
-	-->
+	<!-- #0x40 DNS欺骗配置(回调) 64=0:NTC_DNS_FAKE_IP_CB -->
 	<p:maatType service="64">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
@@ -108,9 +116,7 @@
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 		</p:expressions>
 	</p:maatType>
-	<!-- 
-		#0x41	DNS 响应策略配置（回调）	65=0:NTC_DNS_RES_STRATEGY 
-	-->
+	<!-- #0x41 DNS 响应策略配置（回调） 65=0:NTC_DNS_RES_STRATEGY -->
 	<p:maatType service="65">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
@@ -131,9 +137,7 @@
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 		</p:expressions>
 	</p:maatType>
-	<!--
-		 #0x340	IP复用地址池配置（回调）	832=0:IR_STATIC_IP_POOL_CB
-	-->
+	<!-- #0x340 IP复用地址池配置（回调） 832=0:IR_STATIC_IP_POOL_CB -->
 	<p:maatType service="832">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
@@ -155,8 +159,9 @@
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 		</p:expressions>
 	</p:maatType>
-	
-	<p:maatType service="1;2;16;17;18;19;20;21;22;23;24;26;27;30;31;32;33;34;128;129;130;131;132;133;134;135;136;137;138;139;140;141;143;144;145;256;257;258;259;260;384;385;386;387;388;512;513;528;529;544;545;560;561;768;848;1024;1025;1026;1027;1028;1040;1056;1057;1058">
+
+	<p:maatType
+		service="1;2;16;17;18;19;20;21;22;23;24;26;27;30;31;32;33;34;128;129;130;131;132;133;134;135;136;137;138;139;140;141;143;144;145;256;257;258;259;260;384;385;386;387;388;512;513;528;529;544;545;560;561;768;848;1024;1025;1026;1027;1028;1040;1056;1057;1058">
 		<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];&amp;nbsp;0;\n</p:valueExpression>
@@ -208,113 +213,49 @@
 			<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
 		</p:sequences>
 	</p:maatType>
- 	
-<!-- 
-	<p:maatType service="17;1;256;258;260;384;386;388">
-		<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>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="257;385">
-		<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;[cfg_id];\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>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="259;387">
-		<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;:;{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>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="17;1;256;258;260;384;386;388"> <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>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="257;385"> <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;[cfg_id];\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>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="259;387"> <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;:;{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>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:maat>