Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@
    #  commandTimeout: 5000
  datasource:
    # MySql
    url: jdbc:mysql://localhost:3308/jczz?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://220.176.210.217:3307/jczz_dev?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: root
    password: 1qaz@WSX3edc
    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
    #username: postgres
@@ -52,3 +52,34 @@
    upload-domain: http://localhost:8999
    remote-path: /usr/share/nginx/html

# xxl-job
xxl:
  job:
    accessToken: ''
    admin:
      addresses: http://192.168.1.50:7009/xxl-job-admin
    executor:
      appname: blade-xxljob
      ip: 127.0.0.1
      logpath: ../data/applogs/xxl-job/jobhandler
      logretentiondays: -1
      port: 7018
      address:
  enabled: false

# binlog listener
binlog:
  datasource: # 订阅binlog数据库连接信息，ip，端口，用户密码（用户必须要有权限）
    host: 127.0.0.1
    port: 3306
    username: root
    password: 1qaz@WSX3edc
  db: jczz # 监听数据库
  table: jczz_house,jczz_household,jczz_place
  enabled: false
  # 目标数据库
  from:
    datasource:
      url: jdbc:mysql://106.225.193.35:3306/srjw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
      username: root
      password: HCyj@2022