From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 09:58:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 7a3b775..5f66561 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -48,14 +48,16 @@
     appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
     mchId: 1229817002
     mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
-    notifyUrl: http://xiaopiqiu.natapp1.cc/api/wxPayNotify
+#    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: 001
 
 tencent:
   map:

--
Gitblit v1.9.3