Merge remote-tracking branch 'origin/develop' into develop

backend/application/celery.py

@@ -1,9 +1,11 @@
+import functools
 import os
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
 
 from django.conf import settings
 from celery import platforms
+
 # 租户模式
 if "django_tenants" in settings.INSTALLED_APPS:
     from tenant_schemas_celery.app import CeleryApp as TenantAwareCeleryApp
@@ -16,3 +18,23 @@ else:
 app.config_from_object('django.conf:settings')
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 platforms.C_FORCE_ROOT = True
+
+
+def retry_base_task_error():
+    """
+    celery 失败重试装饰器
+    :return:
+    """
+
+    def wraps(func):
+        @app.task(bind=True, retry_delay=180, max_retries=3)
+        @functools.wraps(func)
+        def wrapper(self, *args, **kwargs):
+            try:
+                return func(*args, **kwargs)
+            except Exception as exc:
+                raise self.retry(exc=exc)
+
+        return wrapper
+
+    return wraps

backend/application/settings.py

@@ -63,6 +63,7 @@ INSTALLED_APPS = [
 ]
 
 MIDDLEWARE = [
+    "dvadmin.utils.middleware.HealthCheckMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",