summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorduandongmei <[email protected]>2019-07-19 09:30:43 +0800
committerduandongmei <[email protected]>2019-07-19 09:30:43 +0800
commit366cb2a594a03ac957f06bbead231ac45ba4e914 (patch)
tree727ae447fcaad6e8f0a62d28a2645489c696733f
parent5006b3269e8f1ae3e0bd9d3a24b14585e455a86f (diff)
keyring业务去掉reissue_expiry_date属性
-rw-r--r--src/main/resources/commonSources/applicationConfig-parser.xml1
-rw-r--r--src/main/resources/maatXml/applicationConfig-maatRedis.xml2
2 files changed, 1 insertions, 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>