Merge remote-tracking branch 'origin/feature' into dev

# Conflicts:
#	eladmin-system/src/main/resources/config/application-dev.yml
This commit is contained in:
韩鹏辉
2024-06-26 14:24:57 +08:00
50 changed files with 2602 additions and 14 deletions

View File

@@ -41,7 +41,7 @@ spring:
redis:
#数据库索引
database: ${REDIS_DB:0}
host: ${REDIS_HOST:127.0.0.1}
host: ${REDIS_HOST:101.37.12.135}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:111111}
#连接超时时间