fix: 修改获取org时，thread_local缓存问题

Co-authored-by: xinwen <coderWen@126.com>

apps/ops/celery/utils.py

@@ -2,6 +2,7 @@
 #
 import json
 import os
+import uuid
 
 import redis_lock
 import redis
@@ -103,6 +104,10 @@ def get_celery_periodic_task(task_name):
 
 def get_celery_task_log_path(task_id):
     task_id = str(task_id)
+    try:
+        uuid.UUID(task_id)
+    except:
+        return
     rel_path = os.path.join(task_id[0], task_id[1], task_id + '.log')
     path = os.path.join(settings.CELERY_LOG_DIR, rel_path)
     os.makedirs(os.path.dirname(path), exist_ok=True)

apps/ops/ws.py

@@ -16,7 +16,7 @@ class CeleryLogWebsocket(JsonWebsocketConsumer):
 
     def connect(self):
         user = self.scope["user"]
-        if user.is_authenticated and user.is_org_admin:
+        if user.is_authenticated:
             self.accept()
         else:
             self.close()

apps/orgs/utils.py

@@ -84,16 +84,26 @@ def set_org_mapper(org_mapper):
 
 def get_org_mapper():
     org_mapper = _find('org_mapper')
-    if org_mapper is None:
-        org_mapper = construct_org_mapper()
-        set_org_mapper(org_mapper)
+    return org_mapper
+
+
+def update_org_mapper():
+    org_mapper = construct_org_mapper()
+    set_org_mapper(org_mapper)
     return org_mapper
 
 
 def get_org_by_id(org_id):
     org_id = str(org_id)
     org_mapper = get_org_mapper()
+    if not org_mapper:
+        org_mapper = update_org_mapper()
+
     org = org_mapper.get(org_id)
+    if not org:
+        # 解决celery缓存org_mapper问题
+        org_mapper = update_org_mapper()
+        org = org_mapper.get(org_id)
     return org