From e1fb9c82504c74fd7ef6d6f0a14561fb2f710517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Thu, 30 May 2019 10:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=95=8C=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=B8=8D=E8=AE=A1=E5=85=A5?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/commonSources/applicationConfig-parser.xml | 2 --
 src/main/resources/maatXml/applicationConfig-maatRedis.xml    | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml
index aa5a690..139c3f0 100644
--- a/src/main/resources/commonSources/applicationConfig-parser.xml
+++ b/src/main/resources/commonSources/applicationConfig-parser.xml
@@ -291,8 +291,6 @@
 		<t:field fieldType="Number" srcName="profileId" dstName="profile_id" isRequired="true"/>
 		<t:field fieldType="String" srcName="profileName" dstName="profile_name"  isRequired="true"/>
 		<t:field fieldType="String" srcName="addrList" dstName="addr_list"  isRequired="true"/>
-		<t:field fieldType="String" srcName="addrType" dstName="addr_type"  isRequired="true"/>
-		<t:field fieldType="String" srcName="addrContent" dstName="addr_content"  isRequired="true"/>
 		<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" regexp="[1]"/>
 		<t:field fieldType="Number" srcName="service" dstName="service" isRequired="true"/>
 		<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
index cfbf9d9..f66447e 100644
--- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml
+++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
@@ -311,7 +311,7 @@
 	<p:maatType service="643">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[profile_id]</p:keyExpression>
-			<p:valueExpression>[profile_id];\t;[profile_name];\t;[content_type];\t;[content_name];\t;[path];\t;[is_valid];\t;[service];\t;[op_time];&amp;nbsp;0</p:valueExpression>
+			<p:valueExpression>[profile_id];\t;[profile_name];\t;[content_name];\t;[content_type];\t;[path];\t;[is_valid];\t;[service];\t;[op_time];&amp;nbsp;0</p:valueExpression>
 		</p:expressions>
 		<p:sequences>
 			<p:operation>1</p:operation>
@@ -355,7 +355,7 @@
 	<p:maatType service="645">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[profile_id]</p:keyExpression>
-			<p:valueExpression>[profile_id];\t;[profile_name];\t;[addr_list];\t;[addr_type];\t;[addr_content];\t;[is_valid];\t;[service];\t;[op_time];&amp;nbsp;0</p:valueExpression>
+			<p:valueExpression>[profile_id];\t;[profile_name];\t;[addr_list];\t;[is_valid];\t;[service];\t;[op_time];&amp;nbsp;0</p:valueExpression>
 		</p:expressions>
 		<p:sequences>
 			<p:operation>1</p:operation>