From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

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

diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 8bad4e1..cbf46c8 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
 spring:
   # 鏁版嵁婧愰厤缃�
   datasource:
-    url: jdbc:postgresql://175.27.187.84:5432/park_bike?stringtype=unspecified&serverTimezone=GMT%2B8
+    url: jdbc:postgresql://192.168.0.211:5432/park_bike?stringtype=unspecified&serverTimezone=GMT%2B8
     username: postgres
     password: Doumee@168
     driver-class-name: org.postgresql.Driver
@@ -52,11 +52,11 @@
     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
+    notifyUrl: https://test.doumee.cn/bikeWeb/api/wxPayNotify
+    refundNotifyUrl: https://test.doumee.cn/bikeWeb/api/wxRefundNotify
+    keyPath: /usr/local/jars/bike/apiclient_cert.p12
+    privateCertPath: /usr/local/jars/bike/apiclient_cert.pem
+    privateKeyPath: /usr/local/jars/bike/apiclient_key.pem
 #    keyPath: d://apiclient_cert.p12
 #    privateCertPath: d://apiclient_cert.pem
 #    privateKeyPath: d://apiclient_key.pem
@@ -73,9 +73,9 @@
     typeId: gybike
 ########################mqtt鐩稿叧閰嶇疆########################
 mqtt:
-  host: tcp://175.27.187.84:1883
-  username: doumee1
-  password: doumee@168
+  host: tcp://192.168.0.212:1883
+  username: doumee
+  password: Doumee@168
   version: 003
 
 ########################mqtt鐩稿叧閰嶇疆########################
@@ -90,3 +90,10 @@
     remoteHost: https://apis.map.qq.com
     appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
 
+########################鎶栭煶寮�鏀惧钩鍙�(鐢熸椿鏈嶅姟/鍥㈣喘鏍搁攢)閰嶇疆########################
+douyin:
+  host: https://open.douyin.com
+  # client_key / client_secret / account_id / poi_id 鏀逛负瀛樻暟鎹簱瀛楀吀(DOUYIN_CONFIG),
+  # 鍚庡彴 /system/dictData 鍙敼銆佸厤閲嶅惎;姝ゅ浠呬繚鐣欐妧鏈弬鏁般��
+  # client_token 鍦� Redis 涓殑缂撳瓨 key
+  redis-token-key: douyin:client_token
\ No newline at end of file

--
Gitblit v1.9.3