From 9088209cdd7e3158d2a04caae05e6726ba3b3ad6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 十二月 2023 18:26:17 +0800
Subject: [PATCH] Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkBike into devPartner

---
 server/services/src/main/resources/application-pro.yml |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/server/services/src/main/resources/application-pro.yml b/server/services/src/main/resources/application-pro.yml
index 7c95b9d..c92867d 100644
--- a/server/services/src/main/resources/application-pro.yml
+++ b/server/services/src/main/resources/application-pro.yml
@@ -5,16 +5,16 @@
 spring:
   # 鏁版嵁婧愰厤缃�
   datasource:
-    url: jdbc:postgresql://175.27.187.84:5432/park_bike?stringtype=unspecified&serverTimezone=GMT%2B8
-    username: postgres
-    password: Doumee@168
+    url: jdbc:postgresql://pgm-8vb8je6y0qbu2n1vlo.pgsql.zhangbei.rds.aliyuncs.com:3433/park_bike?stringtype=unspecified&serverTimezone=GMT%2B8
+    username: parkbike
+    password: parkbikeQWERT!@#$%
     driver-class-name: org.postgresql.Driver
   jpa:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
-        #        hbm2ddl:
-        #          auto: update
+        #hbm2ddl:
+        #auto: update
         temp:
           use_jdbc_metadata_defaults: false
   redis:
@@ -22,8 +22,8 @@
     host: localhost
     port: 6379
     password:
-    #    password: r-uf6is6x17arnu44bem:tlt_2022
-    timeout: 5000      # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+    # password: r-uf6is6x17arnu44bem:tlt_2022
+    timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
 
 knife4j:
   enable: true
@@ -32,9 +32,7 @@
     username: admin
     password: 111111
 
-debug_model: true
-# 鏄惁闇�瑕侀獙璇佺爜
-captcha_check: false
+debug_model: false
 # Swagger閰嶇疆
 swagger:
   host:
@@ -43,3 +41,27 @@
   enabled: true
   # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
   redirect-uri: /
+
+
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
+wx:
+  pay:
+    appId: wxcd2b89fd2ff065f8
+    appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
+    mchId: 1229817002
+    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+    notifyUrl: https://bikes.yxbhlt.cn/bike_h5_api/api/wxPayNotify
+    keyPath: /usr/local/apiclient_cert.p12
+########################mqtt鐩稿叧閰嶇疆########################
+mqtt:
+  host: tcp://39.100.125.239:1883
+  username: parkbike
+  password: parkbike@168
+  version: 003
+
+tencent:
+  map:
+    remoteHost: https://apis.map.qq.com
+    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
+
+

--
Gitblit v1.9.3