diff --git a/dvadmin-backend/application/settings.py b/dvadmin-backend/application/settings.py index 7e19586..a5ab2d6 100644 --- a/dvadmin-backend/application/settings.py +++ b/dvadmin-backend/application/settings.py @@ -243,15 +243,17 @@ else: # redis 缓存 REDIS_URL = f'redis://:{REDIS_PASSWORD if REDIS_PASSWORD else ""}@{os.getenv("REDIS_HOST") or REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}' -CACHES = { - "default": { - "BACKEND": "django_redis.cache.RedisCache", - "LOCATION": REDIS_URL, - "OPTIONS": { - "CLIENT_CLASS": "django_redis.client.DefaultClient", - } - }, -} +# 是否启用redis +if locals().get("REDIS_ENABLE", True): + CACHES = { + "default": { + "BACKEND": "django_redis.cache.RedisCache", + "LOCATION": REDIS_URL, + "OPTIONS": { + "CLIENT_CLASS": "django_redis.client.DefaultClient", + } + }, + } # ================================================= # # ******************** JWT配置 ******************** # # ================================================= # @@ -329,5 +331,4 @@ CELERYBEAT_SCHEDULER = 'django_celery_beat.schedulers.DatabaseScheduler' # Back # ================================================= # # 接口权限 INTERFACE_PERMISSION = locals().get("INTERFACE_PERMISSION", False) -INTERFACE_PERMISSION = {locals().get("INTERFACE_PERMISSION", False)} DJANGO_CELERY_BEAT_TZ_AWARE = False diff --git a/dvadmin-backend/apps/vadmin/system/serializers.py b/dvadmin-backend/apps/vadmin/system/serializers.py index bb8c6ea..e967d1e 100644 --- a/dvadmin-backend/apps/vadmin/system/serializers.py +++ b/dvadmin-backend/apps/vadmin/system/serializers.py @@ -302,4 +302,4 @@ class ExportCeleryLogSerializer(CustomModelSerializer): class Meta: model = CeleryLog - fields = ('name', 'kwargs', 'seconds', 'state', 'result', 'creator_name') + fields = ('name', 'kwargs', 'seconds', 'status', 'result', 'creator_name') diff --git a/dvadmin-backend/conf/env.example.py b/dvadmin-backend/conf/env.example.py index be45875..ec74c6a 100644 --- a/dvadmin-backend/conf/env.example.py +++ b/dvadmin-backend/conf/env.example.py @@ -18,6 +18,9 @@ DATABASE_NAME = "django-vue-admin" # ================================================= # # ************** redis 数据库配置 ************** # # ================================================= # +# 是否启用Redis缓存 +# 注:不使用redis则无法使用celery +REDIS_ENABLE = True REDIS_DB = 1 REDIS_HOST = '127.0.0.1' REDIS_PORT = 6379