From 22603b2519b8dcb7f9a7c7d9ba636d9aba240a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 09:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/resources/application-dev.yml |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 0f36468..add081e 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -85,7 +85,7 @@
   pay:
     #鏈嶅姟鍟�---------start-------
     appId: wx48fd8faa35cc8277
-    mchId: 1661770902
+    mchId: 1229817002 #1661770902
     apiV3Key: iF3kC8pL8dZ9iU3hN5fX9zI6eF4xQ6fT
     serialNumer: 368B835A194384FD583B83B77977B84127D2F655
     mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S
@@ -96,9 +96,17 @@
     #keyPath: /usr/local/aliConfig/bike/apiclient_cert.p12
     #privateCertPath: /usr/local/aliConfig/bike/apiclient_cert.pem
     #privateKeyPath: /usr/local/aliConfig/bike/apiclient_key.pem
-    #    keyPath: d://apiclient_cert.p12
-    #    privateCertPath: d://apiclient_cert.pem
-    #    privateKeyPath: d://apiclient_key.pem
+    keyPath: d://apiclient_cert.p12
+    privateCertPath: d://apiclient_cert.pem
+    privateKeyPath: d://apiclient_key.pem
+
+
+    #鍟嗘埛淇℃伅
+    wechatSerialNumer: 3FE90C2F3D40A56E1C51926F31B8A8D22426CCE0
+    wechatPayPublicKeyId: PUB_KEY_ID_0112298170022025071700291836000600
+    wechatPubKeyPath: d://pub_key.pem
+    wechatPrivateKeyPath: d://wechatApiclient_key.pem
+
     #鏈嶅姟鍟�-------------end---
     existsSub: 1
     appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24

--
Gitblit v1.9.3