From a0abbe16da90920047206493f96a77b44987dde7 Mon Sep 17 00:00:00 2001 From: chengkai3 Date: Sun, 28 Jun 2026 18:10:13 +0800 Subject: [PATCH] =?UTF-8?q?[feat]:[FL-xxx][Redis=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=AE=A4=E8=AF=81]=20=E6=96=B0=E5=A2=9E=20RE?= =?UTF-8?q?DIS=5FPASSWORD=20=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=80=E6=9C=89=E6=9C=8D=E5=8A=A1=20Redis?= =?UTF-8?q?=20=E8=BF=9E=E6=8E=A5=20URL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 5 +++-- deploy/dev-deploy/.env.dev | 5 +++-- deploy/dev-deploy/compose.yml | 18 ++++++++++-------- deploy/pro-deploy/.env.prod | 5 +++-- deploy/pro-deploy/compose.yml | 18 ++++++++++-------- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/.env.example b/.env.example index 0886803..b192916 100644 --- a/.env.example +++ b/.env.example @@ -30,8 +30,8 @@ LLM_PROVIDER_API_KEYS=openai=sk-your-key LLM_REQUEST_TIMEOUT_SECONDS=60 CHAT_CONTEXT_MESSAGE_LIMIT=12 CHAT_DEFAULT_SYSTEM_PROMPT=You are a helpful assistant. -CELERY_BROKER_URL=redis://redis:6379/0 -CELERY_RESULT_BACKEND=redis://redis:6379/1 +CELERY_BROKER_URL=redis://:${REDIS_PASSWORD}@redis:6379/0 +CELERY_RESULT_BACKEND=redis://:${REDIS_PASSWORD}@redis:6379/1 CELERY_TIMEZONE=Asia/Shanghai CELERY_LOG_LEVEL=INFO CELERY_WORKER_CONCURRENCY=2 @@ -61,6 +61,7 @@ MINIO_IMAGE=minio/minio:latest MINIO_MC_IMAGE=minio/mc:latest REDIS_IMAGE=docker.m.daocloud.io/library/redis:7-alpine REDIS_PORT=6379 +REDIS_PASSWORD=change-this-in-production # Redis 持久化策略： # - 启用 AOF（appendonly yes） # - 关闭 RDB 快照（save ""） diff --git a/deploy/dev-deploy/.env.dev b/deploy/dev-deploy/.env.dev index 844e6dc..b270891 100644 --- a/deploy/dev-deploy/.env.dev +++ b/deploy/dev-deploy/.env.dev @@ -29,8 +29,8 @@ LLM_REQUEST_TIMEOUT_SECONDS=60 CHAT_CONTEXT_MESSAGE_LIMIT=12 CHAT_DEFAULT_SYSTEM_PROMPT=You are a helpful assistant. -CELERY_BROKER_URL=redis://redis:6379/0 -CELERY_RESULT_BACKEND=redis://redis:6379/1 +CELERY_BROKER_URL=redis://:${REDIS_PASSWORD}@redis:6379/0 +CELERY_RESULT_BACKEND=redis://:${REDIS_PASSWORD}@redis:6379/1 CELERY_TIMEZONE=Asia/Shanghai SCHEDULER_EXPIRE_INTERVAL_SECONDS=60 FLOWER_API_BASE_URL=http://flower:5555 @@ -38,6 +38,7 @@ FLOWER_API_TIMEOUT_SECONDS=10 FLOWER_BASIC_AUTH=admin:admin WORKER_REGISTRY_TTL_SECONDS=90 CELERY_WORKER_QUEUES=default,celery +REDIS_PASSWORD=replace_me WINE_BINARY_PATH=wine WINE_ALLOWED_ROOT=./data/wine diff --git a/deploy/dev-deploy/compose.yml b/deploy/dev-deploy/compose.yml index 32c4f44..5c2ed8c 100644 --- a/deploy/dev-deploy/compose.yml +++ b/deploy/dev-deploy/compose.yml @@ -24,6 +24,8 @@ services: - redis-server - --appendonly - "yes" + - --requirepass + - ${REDIS_PASSWORD} - --save - "" - --stop-writes-on-bgsave-error @@ -87,8 +89,8 @@ services: DB_HOST: db DB_PORT: 5432 MINIO_ENDPOINT: http://minio:9000 - CELERY_BROKER_URL: redis://redis:6379/0 - CELERY_RESULT_BACKEND: redis://redis:6379/1 + CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0 + CELERY_RESULT_BACKEND: redis://:${REDIS_PASSWORD}@redis:6379/1 FLOWER_BASIC_AUTH: ${FLOWER_BASIC_AUTH} ports: - "${API_PORT}:8000" @@ -122,8 +124,8 @@ services: environment: DB_HOST: db DB_PORT: 5432 - CELERY_BROKER_URL: redis://redis:6379/0 - CELERY_RESULT_BACKEND: redis://redis:6379/1 + CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0 + CELERY_RESULT_BACKEND: redis://:${REDIS_PASSWORD}@redis:6379/1 FLOWER_API_BASE_URL: http://flower:5555 volumes: - ./data/app:/app/data @@ -154,8 +156,8 @@ services: environment: DB_HOST: db DB_PORT: 5432 - CELERY_BROKER_URL: redis://redis:6379/0 - CELERY_RESULT_BACKEND: redis://redis:6379/1 + CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0 + CELERY_RESULT_BACKEND: redis://:${REDIS_PASSWORD}@redis:6379/1 volumes: - ./data/app:/app/data restart: unless-stopped @@ -182,8 +184,8 @@ services: depends_on: - redis environment: - CELERY_BROKER_URL: redis://redis:6379/0 - CELERY_RESULT_BACKEND: redis://redis:6379/1 + CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0 + CELERY_RESULT_BACKEND: redis://:${REDIS_PASSWORD}@redis:6379/1 CELERY_TIMEZONE: ${CELERY_TIMEZONE} FLOWER_BASIC_AUTH: ${FLOWER_BASIC_AUTH:-admin:admin} ports: diff --git a/deploy/pro-deploy/.env.prod b/deploy/pro-deploy/.env.prod index 4a4aff5..15b66aa 100644 --- a/deploy/pro-deploy/.env.prod +++ b/deploy/pro-deploy/.env.prod @@ -29,8 +29,8 @@ LLM_REQUEST_TIMEOUT_SECONDS=60 CHAT_CONTEXT_MESSAGE_LIMIT=12 CHAT_DEFAULT_SYSTEM_PROMPT=You are a helpful assistant. -CELERY_BROKER_URL=redis://redis:6379/0 -CELERY_RESULT_BACKEND=redis://redis:6379/1 +CELERY_BROKER_URL=redis://:${REDIS_PASSWORD}@redis:6379/0 +CELERY_RESULT_BACKEND=redis://:${REDIS_PASSWORD}@redis:6379/1 CELERY_TIMEZONE=Asia/Shanghai SCHEDULER_EXPIRE_INTERVAL_SECONDS=60 FLOWER_API_BASE_URL=http://flower:5555 @@ -38,6 +38,7 @@ FLOWER_API_TIMEOUT_SECONDS=10 FLOWER_BASIC_AUTH=admin:change_me WORKER_REGISTRY_TTL_SECONDS=90 CELERY_WORKER_QUEUES=default,celery +REDIS_PASSWORD=replace_strong_redis_password WINE_BINARY_PATH=wine WINE_ALLOWED_ROOT=./data/wine diff --git a/deploy/pro-deploy/compose.yml b/deploy/pro-deploy/compose.yml index db61e13..74b2a56 100644 --- a/deploy/pro-deploy/compose.yml +++ b/deploy/pro-deploy/compose.yml @@ -18,6 +18,8 @@ services: - redis-server - --appendonly - "yes" + - --requirepass + - ${REDIS_PASSWORD} - --save - "" - --stop-writes-on-bgsave-error @@ -75,8 +77,8 @@ services: DB_HOST: db DB_PORT: 5432 MINIO_ENDPOINT: http://minio:9000 - CELERY_BROKER_URL: redis://redis:6379/0 - CELERY_RESULT_BACKEND: redis://redis:6379/1 + CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0 + CELERY_RESULT_BACKEND: redis://:${REDIS_PASSWORD}@redis:6379/1 FLOWER_BASIC_AUTH: ${FLOWER_BASIC_AUTH} ports: - "${API_PORT}:8000" @@ -102,8 +104,8 @@ services: environment: DB_HOST: db DB_PORT: 5432 - CELERY_BROKER_URL: redis://redis:6379/0 - CELERY_RESULT_BACKEND: redis://redis:6379/1 + CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0 + CELERY_RESULT_BACKEND: redis://:${REDIS_PASSWORD}@redis:6379/1 FLOWER_API_BASE_URL: http://flower:5555 volumes: - ./data/app:/app/data @@ -126,8 +128,8 @@ services: environment: DB_HOST: db DB_PORT: 5432 - CELERY_BROKER_URL: redis://redis:6379/0 - CELERY_RESULT_BACKEND: redis://redis:6379/1 + CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0 + CELERY_RESULT_BACKEND: redis://:${REDIS_PASSWORD}@redis:6379/1 volumes: - ./data/app:/app/data restart: unless-stopped @@ -146,8 +148,8 @@ services: depends_on: - redis environment: - CELERY_BROKER_URL: redis://redis:6379/0 - CELERY_RESULT_BACKEND: redis://redis:6379/1 + CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0 + CELERY_RESULT_BACKEND: redis://:${REDIS_PASSWORD}@redis:6379/1 CELERY_TIMEZONE: ${CELERY_TIMEZONE} FLOWER_BASIC_AUTH: ${FLOWER_BASIC_AUTH:-admin:change_me} ports: