From 30f71e531aa0ceb6d130e2710dde1454b69aed38 Mon Sep 17 00:00:00 2001 From: xiaoxie Date: Fri, 5 Nov 2021 20:39:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95docker-compose=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 11 ++++++----- src/main/resources/application-dev.yml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index eefb8da7..5c9374a0 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -32,14 +32,15 @@ services: - ./logs/media:/opt/media/logs/ environment: TZ: "Asia/Shanghai" - REDIS_HOST: redis - REDIS_PORT: 6379 - REDIS_PWD: root - WVP_DOMAIN: 6101130049 - WVP_ID: 61011300490000000001 # [必须修改] 本机的IP WVP_HOST: 172.18.0.61 WVP_PWD: aseqw_+hiy123 + WVP_DOMAIN: 6101130049 + WVP_ID: 61011300490000000001 + REDIS_HOST: redis + REDIS_PORT: 6379 + REDIS_DB: 6 + REDIS_PWD: root ASSIST_CONFIG: WVP_CONFIG: depends_on: diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4f7d5f3c..98866b83 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -6,7 +6,7 @@ spring: # [必须修改] 端口号 port: ${REDIS_PORT:6379} # [可选] 数据库 DB - database: 6 + database: ${REDIS_DB:6} # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接 password: ${REDIS_PWD} # [可选] 超时时间