Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

rk

4 小时以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 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