修改腾讯电子签功能BUG

config/config.xml

@@ -16,11 +16,11 @@
     <DbName value="orcl"/>
     <DbPort value="1521"/>
     <!-- DbUser DbPwd 支持明文密文 -->
-    <DbUser value="mtp2_test204"/>
+    <DbUser value="mtp2_test208"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.204"/>
+    <Address value="192.168.31.208"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -30,11 +30,11 @@
   </RedisSetting>
   <MqSetting>
     <!-- Url 支持明文密文 -->
-    <Url value="amqp://guest:guest@192.168.31.204:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.208:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.204"/>
+    <HostName value="192.168.31.208"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <!-- Username Password 支持明文密文 -->
@@ -44,28 +44,28 @@
   <MySQLSetting>
     <Host value="192.168.30.72"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test204"/>
+    <DBName value="historyquote_test208"/>
     <!-- Username Password 支持明文密文 -->
-    <Username value="quote_test204"/>
+    <Username value="quote_test208"/>
     <Password value="123456"/>
   </MySQLSetting>
   <Tencent>
     <Enabled value="1"/>
-    <SecretId value="AKIDPktwvneP2WqxvmWFsMclmfLLKDyrbAXp"/>
-    <SecretKey value="GNH9tX8c6Wls02vhNzUvdLuGMYfeVErM"/>
-    <EndPoint value="essbasic.tencentcloudapi.com"/>
-    <AppId value="yDCVHUUnhh968yUBGk3b6eQygvFYco8o"/>
-    <ProxyOrganizationName value="深圳市亿爵珠宝有限公司"/>
-    <ProxyOrganizationOpenId value="SBYJ"/>
-    <ProxyOperatorOpenId value="SBYJ_ADMIN"/>
-    <SignToken value="45CA9AC2778A4B7E8007E3EFC935296E"/>
-    <SignKey value="EB49C115EEDE44049F11495F6EA7526F"/>
+    <SecretId value="AKyDwiyUUckpkct4igUy8lsS7SEqR6c7yR"/>
+    <SecretKey value="SKwvG74cbV3OrAiJdjU5k4507vZwNYDbwT"/>
+    <EndPoint value="essbasic.test.ess.tencent.cn"/>
+    <AppId value="yDCABUUckpyfbvkqUymdfGq8FhvR4fxy"/>
+    <ProxyOrganizationName value="测试永坤黄金"/>
+    <ProxyOrganizationOpenId value="YKHJ"/>
+    <ProxyOperatorOpenId value="YKHJ_LEGAL"/>
+    <SignToken value="9A9F0FA77A744EB294751C0F75FEDDE1"/>
+    <SignKey value="9AEFF9F8F9AD4DD69C4E0606EA121BDF"/>
   </Tencent>
   <Asign>
     <Url value="https://prev.asign.cn"/>
     <AppId value="896210645"/>
     <PrivateKey value="MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqmByEbXbqqq+FYxD1+mJzqrVxG/7xNF3iZJV9q0PqOVwWPEtND8nNuB2FeAwHc5+W7dZwXheVaQqWXvV6lnWp3KaQ9S4CbeOX7zKKF0j42JMj4Adknid9X6OlULZeVoXcQsdQ2h9xpfJhwLka4aOX5p1eP6WocXMrkAVRXEA8aNAlTUHBWhrbiJpKdL4KIDs6hwh0QqLbnt8i7t02wq6qubGW0hYvdY3MQL2GfbNoIZUbYezp5eCyHm/8cFT/WTt1sGSg4hD8JbUn0GTMcrh4rrQLmcJbjStNUOyjqouASTK1A2QQxSS5p2Y7AC4yut3MIqyr7ByAX9/85HtHrdX3AgMBAAECggEAFWRBnzGCyeZhYB6OD+o30j1Dx001aNWiODNYs4t4VrSeoYMqBh3Gtm8x9HybNYwAJRLp4ulJl8i2NSjvK1IWqxgqIt87x74z3ed2tO46jknKGaOMCcfzN7t4b9BxLd83pekRyUewzbV7cVqTW5WTyAZ5EUp14Wtof7vtjsg8ndZp1C0LzJrsQ63LWJAWsfkiRwNwbjkIKTl12xwe3ctZD/PmxYVgWGog+32OiiiTuSf4O1ddp3y2kth66dSIO06VPCqgu8gLwG5epgHmy0Y1ugunpZINN2D7FCH7aaE+H+aQ4nltNIxpQV20grtQG546oDilfPCQLxeW1HUipq2wkQKBgQDyqo180/lJ4wSNFU/hNqLfs2629vU9MH9aSjG5nQpchkTgBxUhAE5RkKgQHLJHJTfPx7vkx2xkI3qddwsWzvt8lNs5NQNxh+LyXQEgy9FCfpopijy2epLpzd2WT+0Y9WK5oB7O32s2YW/6fm0ahu3EJnvBlp1M23FzuRfrV7gu5QKBgQCz98MyV0UAnP3x+Gq5/0siVGPInzYlfTfYcEI3qhlMfqPVkRqqHdGGsiQL70YJlTlZkLeh3r2UvoR956nV9lZgh37aWnaHw7FAYcA5z4FYEFdmpLK/8znaKn/fxypr9xkJtw5V1QgCeaSUCFbt0xp41LaAvwSDBfFqdOTzQMFHqwKBgEyZN4YypxsClPovwwI1K95vFkCc3baN63VFvEJ55r5kB7OrqKi9HvuyLMrBNCku/1oQEyhZJsbJSDgSTqbJeSrPFhANwuOAYEveva9rhsd1jRYVs6pqMJuqxwpeeloJgztS5saoUYBd62nnpGreMolbGG94KnkLP9mmkH1SOCpdAoGAbheD3ljKilx/cLVxvIRy1vZe8EyNGBPoxMuvhlPVFBloae5RLH3/PfHd4TsnUhdqNOM1op0axlJhxI+iMpR2NKjOrg6m8diBpwvlRrgsvM2KWe0ouAm3e0GCZkd1KQTI2UuVRmaCdtkpF7GeU/BPAlnFpy6zON+61k/Z+wDC++8CgYEA54xmJqIr19BpKkcHAxE2pzDrj6ssu2qObKLfsS27o4RevBnrhoY9kPwn8kUKpngoCTd7tM42y9fcpAdUDv+lENAcIF/kz4u+zkyRGR+SpirgAsCYzxZN3GfRNDHBaFEiTkyL6NFdPGV2GTPcd0b6JGf82Thb0JJCxB/J3hVnDIs="/>
     <NotifyUrl value="http://218.17.158.45:15105/api/Asign/HandleASignCompleted"/>
-    <OpenApiUrl value="http://192.168.31.204:5015/mtp2-onlineopen"/>
+    <OpenApiUrl value="http://192.168.31.208:5015/mtp2-onlineopen"/>
   </Asign>
 </Configuration>

config/readme.md

@@ -106,6 +106,44 @@ SBYJ_ADMIN - 管理员（郭远森）
 </Tencent>
 ```
 
+### 永坤黄金正式环境
+
+OpenId
+YKHJ_LEGAL - 法人（）
+YKHJ_ADMIN - 管理员（）
+
+```xml
+<Tencent>
+  <Enabled value="1"/>
+  <SecretId value="AKIDPktwvneP2WqxvmWFsMclmfLLKDyrbAXp"/>
+  <SecretKey value="GNH9tX8c6Wls02vhNzUvdLuGMYfeVErM"/>
+  <EndPoint value="essbasic.tencentcloudapi.com"/>
+  <AppId value="yDCADUUpu1n1m4UEI0NjHCMBOg0yst3p"/>
+  <ProxyOrganizationName value="深圳市永坤黄金有限公司"/>
+  <ProxyOrganizationOpenId value="YKHJ"/>
+  <ProxyOperatorOpenId value="YKHJ_LEGAL"/>
+  <SignToken value="B2EF7AF0E61F4727ACAA57ED4765161B"/>
+  <SignKey value="468EA61DB12741D9928CC73B9628202D"/>
+</Tencent>
+```
+
+### 永坤黄金测试环境
+
+```xml
+<Tencent>
+  <Enabled value="1"/>
+  <SecretId value="AKyDwiyUUckpkct4igUy8lsS7SEqR6c7yR"/>
+  <SecretKey value="SKwvG74cbV3OrAiJdjU5k4507vZwNYDbwT"/>
+  <EndPoint value="essbasic.test.ess.tencent.cn"/>
+  <AppId value="yDCABUUckpyfbvkqUymdfGq8FhvR4fxy"/>
+  <ProxyOrganizationName value="测试永坤黄金"/>
+  <ProxyOrganizationOpenId value="YKHJ"/>
+  <ProxyOperatorOpenId value="YKHJ_LEGAL"/>
+  <SignToken value="9A9F0FA77A744EB294751C0F75FEDDE1"/>
+  <SignKey value="9AEFF9F8F9AD4DD69C4E0606EA121BDF"/>
+</Tencent>
+```
+
 ---
 
 ## 爱签配置说明

services/tencent/ess.go

@@ -95,10 +95,11 @@ func CreateFlowByTemplateDirectly(tmplateName string, userType int,
 	for i := range recipients {
 		recipient := recipients[i]
 
-		if config.SerCfg.TencentCfg.ProxyOrganizationName == *recipient.RoleName &&
-			*recipient.SignType != 1 {
-			// 签署方为本企业，同时不是自动签署时（一般为甲方非自动签署）
-			flowApproverInfos = append(flowApproverInfos, buildSelfOrganizationApprovers(recipient)...)
+		if config.SerCfg.TencentCfg.ProxyOrganizationName == *recipient.RoleName {
+			if *recipient.SignType != 1 {
+				// 签署方为本企业，同时不是自动签署时（一般为甲方非自动签署）
+				flowApproverInfos = append(flowApproverInfos, buildSelfOrganizationApprovers(recipient)...)
+			}
 		} else {
 			// 乙方
 			if userType == 1 {