Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-20 71972694f7d5f23cf42226366a9ddaad4b72b89f

 ycl-server/src/main/resources/application-dev.yml

@@ -37,9 +37,12 @@
spring:
  # 数据源配置
  datasource:
    url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
#    url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
#    username: root
#    password: ycl@202466
    url: jdbc:mysql://localhost:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
    username: root
    password: ycl@202466
    password: 1234
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver

@@ -77,12 +80,12 @@
spring.data:
  redis:
    # 地址
    host: 42.193.1.25
#    host: 127.0.0.1
#    host: 42.193.1.25
    host: 127.0.0.1
    # 端口，默认为6379
    port: 6379
    password: ycl2018
#    password:
#    password: ycl2018
    password: 123456
    # 数据库索引
    database: 0
    # 密码(如没有密码请注释掉)