From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/resources/application-dev.yml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 0ceac3a..b9061a1 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -49,18 +49,20 @@
mchId: 1661770902
apiV3Key: iF3kC8pL8dZ9iU3hN5fX9zI6eF4xQ6fT
serialNumer: 368B835A194384FD583B83B77977B84127D2F655
- notifyUrl: http://xiaopiqiu2.natapp1.cc/api/wxPayNotify
- refundNotifyUrl: http://xiaopiqiu2.natapp1.cc/api/wxRefundNotify
-# notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
- keyPath: D://apiclient_cert.p12
- privateCertPath: D://apiclient_cert.pem
- privateKeyPath: D://apiclient_key.pem
+ 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
#鏈嶅姟鍟�-------------end---
existsSub: 1
appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
#瀛愬晢鎴�------------start----
- subAppId: wxcd2b89fd2ff065f8
- subAppSecret: 3336812504c830b1c3c5243f9ece407a
+ subAppId: wxcd2b89fd2ff065f8 #wxcd2b89fd2ff065f8
+ subAppSecret: 3462fa186da7cb06c544df8d8664b63a #3336812504c830b1c3c5243f9ece407a
subMchId: 1661772003
subMchKey: EVM8E15TKXE0OEMJFC0V6UFVIOZ5CSQS
#瀛愬晢鎴�------------end----
@@ -73,6 +75,13 @@
password: doumee@168
version: 003
+########################mqtt鐩稿叧閰嶇疆########################
+#mqtt:
+# host: tcp://39.100.125.239:1883
+# username: parkbike
+# password: parkbike@168
+# version: 003
+
tencent:
map:
remoteHost: https://apis.map.qq.com
--
Gitblit v1.9.3