所有代理的service去掉

3 files changed, 9 insertions, 9 deletions

diff --git a/src/main/resources/applicationConfig-rule.properties b/src/main/resources/applicationConfig-rule.properties
index 7a0a67f..b95a7b4 100644
--- a/src/main/resources/applicationConfig-rule.properties
+++ b/src/main/resources/applicationConfig-rule.properties
@@ -311,7 +311,7 @@ unMaatService=3:32;4:96;25:32;28:32;64;65;261:16;262:16;263:16;264:16;265:16;266
 398=0:MM_FACE_RECOGNIZATION

 

 #0x208	PXY 证书管理

-520=0:PXY_OBJ_KEYRING

+520=0:PXY_PROFILE_KEYRING

 #0x260	PXY 管控文件策略

 608=0:PXY_OBJ_FILE

 

diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml
index 0ea06d5..ce99cab 100644
--- a/src/main/resources/commonSources/applicationConfig-parser.xml
+++ b/src/main/resources/commonSources/applicationConfig-parser.xml
@@ -152,7 +152,7 @@
 		<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="expire_after"  defaultVal="30" 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 641b906..801c274 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;[service];\t;[keyring_name];\t;[keyring_type];\t;[private_key_file];\t;[public_key_file];\t;[expire_after];\t;[public_key_algo];\t;[crl];\t;[is_valid];\t;[redisFile_private_key_file];\t;[redisFile_public_key_file];\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;[reissue_expiry_date];\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>

@@ -246,7 +246,7 @@
 	<p:maatType service="640">

 		<p:expressions>

 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>

-			<p:valueExpression>[cfg_id];\t;[cert_name];\t;[redisFile_private_cert_file];\t;[is_valid];\t;[service];\t;[op_time];&amp;nbsp;0</p:valueExpression>

+			<p:valueExpression>[cfg_id];\t;[cert_name];\t;[redisFile_private_cert_file];\t;[is_valid];\t;[op_time];&amp;nbsp;0</p:valueExpression>

 		</p:expressions>

 		<p:sequences>

 			<p:operation>1</p:operation>

@@ -267,7 +267,7 @@
 	<p:maatType service="641">

 		<p:expressions>

 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>

-			<p:valueExpression>[cfg_id];\t;[cert_id];\t;[redisFile_private_crl_file];\t;[is_valid];\t;[service];\t;[op_time];&amp;nbsp;0</p:valueExpression>

+			<p:valueExpression>[cfg_id];\t;[cert_id];\t;[redisFile_private_crl_file];\t;[is_valid];\t;[op_time];&amp;nbsp;0</p:valueExpression>

 		</p:expressions>

 		<p:sequences>

 			<p:operation>1</p:operation>

@@ -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_name];\t;[content_type];\t;[redisFile_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;[redisFile_path];\t;[is_valid];\t;[op_time];&amp;nbsp;0</p:valueExpression>

 		</p:expressions>

 		<p:sequences>

 			<p:operation>1</p:operation>

@@ -333,7 +333,7 @@
 	<p:maatType service="644">

 		<p:expressions>

 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[profile_id]</p:keyExpression>

-			<p:valueExpression>[profile_id];\t;[profile_name];\t;[format];\t;[redisFile_path];\t;[is_valid];\t;[service];\t;[op_time];&amp;nbsp;0</p:valueExpression>

+			<p:valueExpression>[profile_id];\t;[profile_name];\t;[format];\t;[redisFile_path];\t;[is_valid];\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;[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;[op_time];&amp;nbsp;0</p:valueExpression>

 		</p:expressions>

 		<p:sequences>

 			<p:operation>1</p:operation>

@@ -376,7 +376,7 @@
 	<p:maatType service="646">

 		<p:expressions>

 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[profile_id]</p:keyExpression>

-			<p:valueExpression>[profile_id];\t;[profile_name];\t;[format];\t;[redisFile_path];\t;[is_valid];\t;[service];\t;[op_time];&amp;nbsp;0</p:valueExpression>

+			<p:valueExpression>[profile_id];\t;[profile_name];\t;[format];\t;[redisFile_path];\t;[is_valid];\t;[op_time];&amp;nbsp;0</p:valueExpression>

 		</p:expressions>

 		<p:sequences>

 			<p:operation>1</p:operation>