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

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

diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 3c673e9..0f36468 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -80,6 +80,37 @@
     privateKey:  # RSA绉侀挜
     time: 600000
 
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
+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
+    #鏈嶅姟鍟�-------------end---
+    existsSub: 1
+    appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
+    #瀛愬晢鎴�------------start----
+    subAppId: wxcd2b89fd2ff065f8 #wxcd2b89fd2ff065f8
+    subAppSecret: 3462fa186da7cb06c544df8d8664b63a #3336812504c830b1c3c5243f9ece407a
+    subMchId: 1661772003
+    subMchKey: EVM8E15TKXE0OEMJFC0V6UFVIOZ5CSQS
+    #瀛愬晢鎴�------------end----
+    #      mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+    typeId: gybike
+
 upload:
   type: ftp
 

--
Gitblit v1.9.3