From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/resources/application-test.yml |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/server/services/src/main/resources/application-test.yml b/server/services/src/main/resources/application-test.yml
index 7c95b9d..1d97529 100644
--- a/server/services/src/main/resources/application-test.yml
+++ b/server/services/src/main/resources/application-test.yml
@@ -1,7 +1,3 @@
-# WEB鏈嶅姟鍣ㄩ厤缃�
-server:
-  port: 10012
-
 spring:
   # 鏁版嵁婧愰厤缃�
   datasource:
@@ -43,3 +39,27 @@
   enabled: true
   # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
   redirect-uri: /
+
+
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
+wx:
+  pay:
+    appId: wxcd2b89fd2ff065f8
+    appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
+    mchId: 1229817002
+    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+    #    notifyUrl: http://xiaopiqiu.natapp1.cc/api/wxPayNotify
+    notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
+    #    keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
+    keyPath: /usr/local/apiclient_cert.p12
+########################mqtt鐩稿叧閰嶇疆########################
+mqtt:
+  host: tcp://175.27.187.84:1883
+  username: doumee1
+  password: doumee@168
+  version: 005
+
+tencent:
+  map:
+    remoteHost: https://apis.map.qq.com
+    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ

--
Gitblit v1.9.3