合并解决冲突

This commit is contained in:
yujicun
2023-07-31 17:00:23 +08:00
20 changed files with 345 additions and 145 deletions

View File

@@ -1,9 +1,12 @@
## redis
spring.redis.database=3
spring.redis.host=10.251.129.122
spring.redis.password=qwert!W588
spring.redis.database=1
spring.redis.host=10.251.160.38
spring.redis.password=qwert!W577
spring.redis.port=6379
# cloud nacos config
spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848
## datasource config
spring.jpa.hibernate.ddl-auto=none
spring.datasource.driverClassName=com.mysql.jdbc.Driver
@@ -54,4 +57,4 @@ xboe.elasticsearch.server.password=
xboe.email.url=https://u.boe.com/api/b1/email/send
xboe.email.from=boeu_learning@boe.com.cn
xboe.email.user=
xboe.email.security=
xboe.email.security=