From 391c0cfc4ba595ef26c7a2315c555d8c75afec7d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 八月 2025 11:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/resources/application-test.yml |   51 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/server/services/src/main/resources/application-test.yml b/server/services/src/main/resources/application-test.yml
index bf7bdcf..8628d7d 100644
--- a/server/services/src/main/resources/application-test.yml
+++ b/server/services/src/main/resources/application-test.yml
@@ -70,32 +70,41 @@
     password: 111111
 
 ########################寰俊鏀粯鐩稿叧閰嶇疆########################
+
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
 wx:
   pay:
-    #鏈嶅姟鍟�---------start-------
-    appId: wx48fd8faa35cc8277
-    mchId: 1661770902
-    apiV3Key: iF3kC8pL8dZ9iU3hN5fX9zI6eF4xQ6fT
-    serialNumer: 368B835A194384FD583B83B77977B84127D2F655
-    mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S
-    #    notifyUrl: http://xiaopiqiu3.natapp1.cc/api/wxPayNotify
-    #    refundNotifyUrl: http://xiaopiqiu3.natapp1.cc/api/wxRefundNotify
-    notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
-    refundNotifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxRefundNotify
-    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
+    #鏈嶅姟鍟�---------start------- 鍙傛暟璇﹁В鍦板潃 https://pay.weixin.qq.com/doc/v3/partner/4013080340
+    mchId: 1700071922    #鏈嶅姟鍟嗗湪寰俊鏀粯渚х殑鍞竴韬唤鏍囪瘑
+    appId: wx6cc1087ca79db7f6    #鏈嶅姟鍟嗗湪寰俊寮�鏀惧钩鍙帮紙绉诲姩搴旂敤锛夋垨鍏紬骞冲彴锛堝叕浼楀彿/灏忕▼搴忥級涓婄敵璇风殑涓�涓敮涓�鏍囪瘑
+    apiV3Key: 0a056faa107c2b2944b9d6a9aa6d4142 #7tG4Vk9Zp2L8dXw5Jq0N3hR6yE1sF3cB
+    serialNumer: 6696086F6EFB8D6A4F821BD47DDBAF75C3BC1209 #38495CE0137D90E4DC4F64F7ECDE035A35470BE3 #鏈嶅姟鍟嗚瘉涔﹀簭鍒楀彿
+    payPublicKeyId: PUB_KEY_ID_0117000719222024112700219100000508 #鍟嗘埛/骞冲彴鏀粯鍏挜id
+    #mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S
+    notifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxPayNotify
+    refundNotifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxRefundNotify
+    keyPath: /usr/local/jars/payFile/apiclient_cert.p12
+    privateCertPath: /usr/local/jars/payFile/apiclient_cert.pem
+    privateKeyPath: /usr/local/jars/payFile/apiclient_key.pem
+    pubKeyPath: /usr/local/jars/payFile/pub_key.pem #鍟嗘埛鏀粯鍏挜
+
     #鏈嶅姟鍟�-------------end---
+
+    #鍟嗘埛淇℃伅
+    wechatSerialNumer: 12C0F0DD0F3D2B565B45586D3FEA225EBF723BEC
+    wechatPayPublicKeyId: PUB_KEY_ID_0117233260692025072500181939000603 #鍟嗘埛/骞冲彴鏀粯鍏挜id
+    wechatPubKeyPath: /usr/local/jars/payFile/shanghu/pub_key.pem #鍟嗘埛鏀粯鍏挜
+    wechatPrivateKeyPath: /usr/local/jars/payFile/shanghu/apiclient_key.pem #鍟嗘埛绉侀挜
+    wechatNotifyUrl: https://test.doumee.cn/jinkuai_admin/web/wechat/transferNotify #鍟嗘埛杞处鍥炶皟鍦板潃
+    wechatApiV3Key: 7tG4Vk9Zp2L8dXw5Jq0N3hR6yE1sF3cB
+
+
     existsSub: 1
-    appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
+    appSecret:
     #瀛愬晢鎴�------------start----
-    subAppId: wxcd2b89fd2ff065f8 #wxcd2b89fd2ff065f8
-    subAppSecret: 3462fa186da7cb06c544df8d8664b63a #3336812504c830b1c3c5243f9ece407a
-    subMchId: 1661772003
-    subMchKey: EVM8E15TKXE0OEMJFC0V6UFVIOZ5CSQS
+    subMchId: 1723326069    #瀛愬晢鎴峰彿
+    subAppId: wx332441ae5b12be7d #灏忕▼搴廼d
+    subAppSecret: add86d6406f5c14501ac5bbb1a60e004 #灏忕▼搴忕閽�
     #瀛愬晢鎴�------------end----
     #      mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
     typeId: gybike

--
Gitblit v1.9.3