合并分支 'main' 到 'master'

target/classes/application.properties

-server.port=8085
-spring.aop.proxy-target-class= true
-# true为使用CGLIB代理 #172.30.30.86
-spring.datasource.remote0.url = jdbc:mysql://192.168.0.232:3306/yl_test?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
-spring.datasource.remote0.username = root
-spring.datasource.remote0.password = tykj@2022
-spring.datasource.remote0.driverClassName = com.mysql.cj.jdbc.Driver
-
-spring.datasource.remote1.url = jdbc:mysql://192.168.0.232:3307/yl_test?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
-spring.datasource.remote1.username = root
-spring.datasource.remote1.password = tykj@2022
-spring.datasource.remote1.driverClassName = com.mysql.cj.jdbc.Driver
-
-spring.datasource.type= com.alibaba.druid.pool.DruidDataSource
-spring.datasource.druid.initialSize = 5
-spring.datasource.druid.min-idle = 5
-spring.datasource.druid.max-active = 20
-spring.datasource.druid.max-wait= 60000
-spring.datasource.druid.time-between-eviction-runs-millis = 60000
-spring.jpa.hibernate.ddl-auto=update
-spring.mvc.async.request-timeout= -1
-
-#172.30.30.89
-spring.redis.host=192.168.0.233
-spring.redis.password=
-spring.redis.port=6379
-# 连接池最大连接数（使用负值表示没有限制）
-spring.redis.jedis.pool.max-active=8
-## 连接池最大阻塞等待时间（使用负值表示没有限制）
-spring.redis.jedis.pool.max-wait=-1
-## 连接池中的最大空闲连接
-spring.redis.jedis.pool.max-idle=20
-## 连接池中的最小空闲连接
-spring.redis.jedis.pool.min-idle=0
-## 连接超时时间（毫秒）
-spring.redis.timeout=5000000
-
-logging.file.name=./log/worksite.log
-