From 278da88f21bff29eef96a2e439ac35eb444630fe Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 八月 2025 10:27:23 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai

---
 server/services/src/main/resources/application-test.yml |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/server/services/src/main/resources/application-test.yml b/server/services/src/main/resources/application-test.yml
index 85d8738..585b167 100644
--- a/server/services/src/main/resources/application-test.yml
+++ b/server/services/src/main/resources/application-test.yml
@@ -74,33 +74,34 @@
 ########################寰俊鏀粯鐩稿叧閰嶇疆########################
 wx:
   pay:
-    #鏈嶅姟鍟�---------start-------
-    mchId: 1700071922 #鏈嶅姟鍟嗗晢鎴峰彿
-    appId: wx6cc1087ca79db7f6 #鏈嶅姟鍟咥PPID
-    apiV3Key: 0a056faa107c2b2944b9d6a9aa6d4142
-    serialNumer: 38495CE0137D90E4DC4F64F7ECDE035A35470BE3 #鏈嶅姟鍟嗚瘉涔﹀簭鍒楀彿
+    #鏈嶅姟鍟�---------start------- 鍙傛暟璇﹁В鍦板潃 https://pay.weixin.qq.com/doc/v3/partner/4013080340
+    mchId: 1700071922    #鏈嶅姟鍟嗗湪寰俊鏀粯渚х殑鍞竴韬唤鏍囪瘑
+    appId: wx332441ae5b12be7d    #鏈嶅姟鍟嗗湪寰俊寮�鏀惧钩鍙帮紙绉诲姩搴旂敤锛夋垨鍏紬骞冲彴锛堝叕浼楀彿/灏忕▼搴忥級涓婄敵璇风殑涓�涓敮涓�鏍囪瘑
+    apiV3Key: 0a056faa107c2b2944b9d6a9aa6d4142 #7tG4Vk9Zp2L8dXw5Jq0N3hR6yE1sF3cB
+    serialNumer: 7DCD480EB6DF3791721867A6EB57105DECEF38BE #38495CE0137D90E4DC4F64F7ECDE035A35470BE3 #鏈嶅姟鍟嗚瘉涔﹀簭鍒楀彿
     #mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S
     notifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxPayNotify
     refundNotifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxRefundNotify
-    keyPath: /usr/local/zhengshu/apiclient_cert.p12
-    privateCertPath: /usr/local/zhengshu/apiclient_cert.pem
-    privateKeyPath: /usr/local/zhengshu/apiclient_key.pem
+    keyPath: /usr/local/jars/payFile/apiclient_cert.p12
+    privateCertPath: /usr/local/jars/payFile/apiclient_cert.pem
+    privateKeyPath: /usr/local/jars/payFile/apiclient_key.pem
+
+    #鏈嶅姟鍟�-------------end---
 
     #鍟嗘埛淇℃伅
     wechatSerialNumer: 12C0F0DD0F3D2B565B45586D3FEA225EBF723BEC
-    wechatPayPublicKeyId:  PUB_KEY_ID_0117233260692025072500181939000603 #鍟嗘埛/骞冲彴鏀粯鍏挜id
-    wechatPubKeyPath: /usr/local/zhengshu/pub_key.pem #鍟嗘埛鏀粯鍏挜
-    wechatPrivateKeyPath: /usr/local/zhengshu/shanghu/apiclient_key.pem #鍟嗘埛绉侀挜
+    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 #鍟嗘埛杞处鍥炶皟鍦板潃
 
 
-    #鏈嶅姟鍟�-------------end---
     existsSub: 1
     appSecret:
     #瀛愬晢鎴�------------start----
+    subMchId: 1723326069    #瀛愬晢鎴峰彿
     subAppId: wx332441ae5b12be7d #灏忕▼搴廼d
     subAppSecret: add86d6406f5c14501ac5bbb1a60e004 #灏忕▼搴忕閽�
-    subMchId: 1723326069    #瀛愬晢鎴峰彿
     #瀛愬晢鎴�------------end----
     #      mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
     typeId: gybike

--
Gitblit v1.9.3