From 7a9853d77fe645a56872a9567421d2ef4f3d4493 Mon Sep 17 00:00:00 2001
From: RenKaiGe-Office <RenKaiGe-Office@renkaige-office>
Date: Tue, 29 May 2018 15:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9maat.xml=E4=B8=ADcfg=5Fid?=
 =?UTF-8?q?=E4=B8=BAcompile=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/maatXml/maat.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/maatXml/maat.xml b/src/main/resources/maatXml/maat.xml
index 89a6e50..f4f7d8b 100644
--- a/src/main/resources/maatXml/maat.xml
+++ b/src/main/resources/maatXml/maat.xml
@@ -5,8 +5,8 @@
 
 	<p:maatType service="96;97;98;99;160;161;162;163">
 		<p:expressions>
-			<p:keyExpression>EFFECTIVE_RULE;:;FILE_INDEX_INFO;,;[cfg_id]</p:keyExpression>
-			<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:keyExpression>EFFECTIVE_RULE;:;FILE_INDEX_INFO;,;[compile_id]</p:keyExpression>
+			<p:valueExpression>[compile_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>
@@ -26,8 +26,8 @@
 
 	<p:maatType service="100;101;164;165">
 		<p:expressions>
-			<p:keyExpression>EFFECTIVE_RULE;:;mark_sample;,;[cfg_id]</p:keyExpression>
-			<p:valueExpression>[cfg_id];\t;[service];\t;[level];\t;[description];\t;[is_valid]</p:valueExpression>
+			<p:keyExpression>EFFECTIVE_RULE;:;mark_sample;,;[compile_id]</p:keyExpression>
+			<p:valueExpression>[compile_id];\t;[service];\t;[level];\t;[description];\t;[is_valid]</p:valueExpression>
 		</p:expressions>
 		<p:sequences>
 			<p:operation>1</p:operation>
@@ -47,12 +47,12 @@
 
 	<p:maatType service="80;82;84;144;146;148">
 		<p:expressions>
-			<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id]</p:keyExpression>
-			<p:valueExpression>[cfg_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: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_compile_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: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>
@@ -86,12 +86,12 @@
 
 	<p:maatType service="81;145">
 		<p:expressions>
-			<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id]</p:keyExpression>
-			<p:valueExpression>[cfg_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: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_compile_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:valueExpression>[group_id];\t;[compile_id];\t;[is_valid];\t;[op_time]</p:valueExpression>
 		</p:expressions>
 
 
@@ -128,12 +128,12 @@
 
 	<p:maatType service="83;85;147;149">
 		<p:expressions>
-			<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id]</p:keyExpression>
-			<p:valueExpression>[cfg_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: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_compile_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: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>