From 0cfbaf9a439dc75824c52a6e58b6849064afbc80 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 19 七月 2025 10:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/resources/application-dev.yml |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index add081e..c2f5827 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -85,14 +85,14 @@
   pay:
     #鏈嶅姟鍟�---------start-------
     appId: wx48fd8faa35cc8277
-    mchId: 1229817002 #1661770902
+    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
+    notifyUrl: http://xiaopiqiu2.natapp1.cc/web/wxPayNotify
+    refundNotifyUrl: http://xiaopiqiu2.natapp1.cc/web/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
@@ -102,10 +102,14 @@
 
 
     #鍟嗘埛淇℃伅
-    wechatSerialNumer: 3FE90C2F3D40A56E1C51926F31B8A8D22426CCE0
-    wechatPayPublicKeyId: PUB_KEY_ID_0112298170022025071700291836000600
-    wechatPubKeyPath: d://pub_key.pem
-    wechatPrivateKeyPath: d://wechatApiclient_key.pem
+    wechatSerialNumer: 3C9A32FB6CD453FAAAF97F9737ECAEA9D6625727
+    wechatPayPublicKeyId: 47E172124E73E8098A565E971064C20ACDE7C911 # PUB_KEY_ID_0116617720032025071800291849000801 #鍟嗘埛/骞冲彴鏀粯鍏挜id
+    wechatPubKeyPath: d://pub_key.pem #鍟嗘埛鏀粯鍏挜
+    #wechatPlatformPubKeyPath: d:/wechatpay_47E172124E73E8098A565E971064C20ACDE7C911.pem  #骞冲彴鏀粯鍏挜
+    wechatPrivateKeyPath: d://wechatApiclient_key.pem #鍟嗘埛绉侀挜
+    wechatNotifyUrl: http://xiaopiqiu2.natapp1.cc/web/wechat/transferNotify #鍟嗘埛杞处鍥炶皟鍦板潃
+    #wechatApiV3Key: V4PRKUBTK2BKNKJAD9NSI9YFG2Q0EOT1 #鍟嗘埛APIV3Key
+
 
     #鏈嶅姟鍟�-------------end---
     existsSub: 1

--
Gitblit v1.9.3