From 30f71e531aa0ceb6d130e2710dde1454b69aed38 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期五, 05 十一月 2021 20:39:32 +0800
Subject: [PATCH] 尝试docker-compose启动
---
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 eefb8da..5c9374a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -32,14 +32,15 @@
- ./logs/media:/opt/media/logs/
environment:
TZ: "Asia/Shanghai"
- REDIS_HOST: redis
- REDIS_PORT: 6379
- REDIS_PWD: root
- WVP_DOMAIN: 6101130049
- WVP_ID: 61011300490000000001
# [蹇呴』淇敼] 鏈満鐨処P
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 4f7d5f3..98866b8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@
# [蹇呴』淇敼] 绔彛鍙�
port: ${REDIS_PORT:6379}
# [鍙�塢 鏁版嵁搴� DB
- database: 6
+ database: ${REDIS_DB:6}
# [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
password: ${REDIS_PWD}
# [鍙�塢 瓒呮椂鏃堕棿
--
Gitblit v1.8.0