zuowei/erpnew
1
0
Fork 0
forked from erp-dev/erp
Code Pull Requests Activity

feat: added fields like plate_order api into printing jobs api

Browse Source
This commit is contained in:
colaftc
2026-01-06 11:59:37 +08:00
parent 5a40c07345
commit 2ecfc8dd06
5 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
docker-compose.prod.yml
View File

@@ -68,10 +68,17 @@ services:
DB_NAME: "${DB_NAME:-flower}"
DB_USER: "${DB_USER:-postgres}"
DB_PASSWORD: "${DB_PASSWORD:-postgres}"
CELERY_BROKER_URL: "${CELERY_BROKER_URL:-amqp://guest:guest@rabbitmq:5672//}"
CELERY_RESULT_BACKEND: "${CELERY_RESULT_BACKEND:-redis://redis:6379/0}"
CACHE_HOST: ${CACHE_HOST:-redis}
CACHE_PORT: "${CACHE_PORT:-6379}"
# Celery Broker（RabbitMQ）连接：容器内用服务名访问
CELERY_BROKER_HOST: ${CELERY_BROKER_HOST:-rabbitmq}
CELERY_BROKER_PORT: "${CELERY_BROKER_PORT:-5672}"
CELERY_BROKER_USER: "${CELERY_BROKER_USER:-guest}"
CELERY_BROKER_PASSWORD: "${CELERY_BROKER_PASSWORD:-guest}"
# Celery Result Backend（Redis）连接：容器内用服务名访问
CELERY_RESULT_HOST: ${CELERY_RESULT_HOST:-redis}
CELERY_RESULT_PORT: "${CELERY_RESULT_PORT:-6379}"
CELERY_RESULT_DB: "${CELERY_RESULT_DB:-1}"
depends_on:
- pgbouncer
- redis
@@ -97,8 +104,14 @@ services:
DB_NAME: "${DB_NAME:-flower}"
DB_USER: "${DB_USER:-postgres}"
DB_PASSWORD: "${DB_PASSWORD:-postgres}"
CELERY_BROKER_URL: "${CELERY_BROKER_URL:-amqp://guest:guest@rabbitmq:5672//}"
CELERY_RESULT_BACKEND: "${CELERY_RESULT_BACKEND:-redis://redis:6379/0}"
# Celery 连接配置：容器内用服务名访问
CELERY_BROKER_HOST: ${CELERY_BROKER_HOST:-rabbitmq}
CELERY_BROKER_PORT: "${CELERY_BROKER_PORT:-5672}"
CELERY_BROKER_USER: "${CELERY_BROKER_USER:-guest}"
CELERY_BROKER_PASSWORD: "${CELERY_BROKER_PASSWORD:-guest}"
CELERY_RESULT_HOST: ${CELERY_RESULT_HOST:-redis}
CELERY_RESULT_PORT: "${CELERY_RESULT_PORT:-6379}"
CELERY_RESULT_DB: "${CELERY_RESULT_DB:-1}"
# 数据库备份输出目录（api_v1.tasks.backup_database 默认输出到 BASE_DIR/data-bak）
volumes:
# 默认落在 compose 同级目录的 ./data-bak，方便宿主机直接查看/拷贝
@@ -130,8 +143,14 @@ services:
DB_NAME: "${DB_NAME:-flower}"
DB_USER: "${DB_USER:-postgres}"
DB_PASSWORD: "${DB_PASSWORD:-postgres}"
CELERY_BROKER_URL: "${CELERY_BROKER_URL:-amqp://guest:guest@rabbitmq:5672//}"
CELERY_RESULT_BACKEND: "${CELERY_RESULT_BACKEND:-redis://redis:6379/0}"
# Celery 连接配置：容器内用服务名访问
CELERY_BROKER_HOST: ${CELERY_BROKER_HOST:-rabbitmq}
CELERY_BROKER_PORT: "${CELERY_BROKER_PORT:-5672}"
CELERY_BROKER_USER: "${CELERY_BROKER_USER:-guest}"
CELERY_BROKER_PASSWORD: "${CELERY_BROKER_PASSWORD:-guest}"
CELERY_RESULT_HOST: ${CELERY_RESULT_HOST:-redis}
CELERY_RESULT_PORT: "${CELERY_RESULT_PORT:-6379}"
CELERY_RESULT_DB: "${CELERY_RESULT_DB:-1}"
# Celery Beat 的持久化调度文件，避免重启后重复/错过调度
volumes:
- celery_beat_data:/var/lib/celery