From b744ac459106e78e916f346ebb746ba30a9f652e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 5 Dec 2023 08:51:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20base=20=E5=81=9A=E5=88=B0celery?=
 =?UTF-8?q?=E5=9C=A8=E9=A1=B9=E7=9B=AE=E9=97=B4=E5=AE=8C=E5=85=A8=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/celery.py   | 4 ++--
 server/settings.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/celery.py b/server/celery.py
index 59449c0d..747a08bb 100755
--- a/server/celery.py
+++ b/server/celery.py
@@ -1,11 +1,11 @@
 import os
-
+from . import conf
 from celery import Celery
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'server.settings')
 
-app = Celery('ehs')
+app = Celery(conf.BASE_PROJECT_CODE)
 
 # Using a string here means the worker doesn't have to serialize
 # the configuration object to child processes.
diff --git a/server/settings.py b/server/settings.py
index 4f033385..c0929740 100755
--- a/server/settings.py
+++ b/server/settings.py
@@ -282,7 +282,7 @@ AUTHENTICATION_BACKENDS = (
 CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": conf.REDIS_LOCATION,
+        "LOCATION": conf.CACHE_LOCATION,
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
         }
@@ -291,6 +291,7 @@ CACHES = {
 
 # celery配置,celery正常运行必须安装redis
 CELERY_BROKER_URL = conf.CELERY_BROKER_URL   # 任务存储
+CELERY_TASK_DEFAULT_QUEUE = conf.CELERY_TASK_DEFAULT_QUEUE  # 任务队列
 CELERYD_MAX_TASKS_PER_CHILD = 100  # 每个worker最多执行100个任务就会被销毁，可防止内存泄露
 CELERY_TIMEZONE = 'Asia/Shanghai'  # 设置时区
 CELERY_ENABLE_UTC = True  # 启动时区设置