From 366cb2a594a03ac957f06bbead231ac45ba4e914 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Fri, 19 Jul 2019 09:30:43 +0800
Subject: [PATCH] =?UTF-8?q?keyring=E4=B8=9A=E5=8A=A1=E5=8E=BB=E6=8E=89reis?=
 =?UTF-8?q?sue=5Fexpiry=5Fdate=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 | 1 -
 src/main/resources/maatXml/applicationConfig-maatRedis.xml    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml
index ce99cab..51d6ec3 100644
--- a/src/main/resources/commonSources/applicationConfig-parser.xml
+++ b/src/main/resources/commonSources/applicationConfig-parser.xml
@@ -152,7 +152,6 @@
 		<t:field fieldType="String" srcName="keyringType" dstName="keyring_type"  isRequired="true"/>
 		<t:field fieldType="String" srcName="privateKeyFile" dstName="private_key_file"  isRequired="true"/>
 		<t:field fieldType="String" srcName="publicKeyFile" dstName="public_key_file"  isRequired="true"/>
-		<t:field fieldType="String" srcName="expireAfter" dstName="reissue_expiry_date"  defaultVal="30" isRequired="true"/>
 		<t:field fieldType="String" srcName="publicKeyAlgo" dstName="public_key_algo"  isRequired="true"/>
 		<t:field fieldType="String" srcName="crl" dstName="crl" />
 		<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" regexp="[1]"/>
diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
index 801c274..e3c6175 100644
--- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml
+++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
@@ -204,7 +204,7 @@
 	<p:maatType service="520">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
-			<p:valueExpression>[cfg_id];\t;[keyring_name];\t;[keyring_type];\t;[redisFile_private_key_file];\t;[redisFile_public_key_file];\t;[reissue_expiry_date];\t;[public_key_algo];\t;[crl];\t;[is_valid];\t;[op_time];&amp;nbsp;0</p:valueExpression>
+			<p:valueExpression>[cfg_id];\t;[keyring_name];\t;[keyring_type];\t;[redisFile_private_key_file];\t;[redisFile_public_key_file];\t;[public_key_algo];\t;[crl];\t;[is_valid];\t;[op_time];&amp;nbsp;0</p:valueExpression>
 		</p:expressions>
 		<p:sequences>
 			<p:operation>1</p:operation>