优化记录异步任务日志

dromara · Jul 20, 2023 · 5496d0e · 5496d0e
1 parent 1939df8
commit 5496d0e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/domain_admin/api/domain_api.py b/domain_admin/api/domain_api.py
@@ -288,7 +288,8 @@ def update_all_domain_cert_info_of_user():
     """
     current_user_id = g.user_id
 
-    async_task_service.submit_task(fn=domain_service.update_all_domain_cert_info_of_user, user_id=current_user_id)
+    domain_service.update_all_domain_cert_info_of_user(user_id=current_user_id)
+    # async_task_service.submit_task(fn=domain_service.update_all_domain_cert_info_of_user, user_id=current_user_id)
 
 
 def update_domain_row_info_by_id():
@@ -348,7 +349,8 @@ def import_domain_from_file():
     # async_task_service.submit_task(fn=domain_service.add_domain_from_file, filename=filename, user_id=current_user_id)
 
     # 异步查询
-    async_task_service.submit_task(fn=domain_service.update_all_domain_cert_info_of_user, user_id=current_user_id)
+    domain_service.update_all_domain_cert_info_of_user(user_id=current_user_id)
+    # async_task_service.submit_task(fn=domain_service.update_all_domain_cert_info_of_user, user_id=current_user_id)
 
 
 def export_domain_file():
@@ -627,4 +629,4 @@ def get_domain_group_filter():
     return {
         'list': lst,
         'total': len(lst),
-    }
+    }
diff --git a/domain_admin/api/domain_info_api.py b/domain_admin/api/domain_info_api.py
@@ -64,12 +64,17 @@ def add_domain_info():
 
     # 异步提交
     if is_auto_subdomain:
-        async_task_service.submit_task(
-            fn=domain_service.auto_import_from_domain,
+        domain_service.auto_import_from_domain(
             root_domain=domain,
             group_id=group_id,
             user_id=current_user_id
         )
+        # async_task_service.submit_task(
+        #     fn=domain_service.auto_import_from_domain,
+        #     root_domain=domain,
+        #     group_id=group_id,
+        #     user_id=current_user_id
+        # )
 
     return {'domain_info_id': row.id}
 
@@ -129,12 +134,18 @@ def update_domain_info_by_id():
         domain_info_service.update_domain_info_row(domain_info_row)
 
     if is_auto_subdomain:
-        async_task_service.submit_task(
-            fn=domain_service.auto_import_from_domain,
+        domain_service.auto_import_from_domain(
             root_domain=domain,
             group_id=group_id,
             user_id=current_user_id
         )
+        #
+        # async_task_service.submit_task(
+        #     fn=domain_service.auto_import_from_domain,
+        #     root_domain=domain,
+        #     group_id=group_id,
+        #     user_id=current_user_id
+        # )
 
 
 @operation_service.operation_log_decorator(

diff --git a/domain_admin/service/domain_service.py b/domain_admin/service/domain_service.py
@@ -17,7 +17,7 @@
 from domain_admin.model.domain_model import DomainModel
 from domain_admin.model.group_model import GroupModel
 from domain_admin.model.user_model import UserModel
-from domain_admin.service import file_service
+from domain_admin.service import file_service, async_task_service
 from domain_admin.service import render_service, group_service
 from domain_admin.utils import datetime_util, cert_util
 from domain_admin.utils import domain_util
@@ -242,6 +242,7 @@ def update_all_domain_cert_info():
         update_domain_row(row)
 
 
+@async_task_service.async_task_decorator("更新证书信息")
 def update_all_domain_cert_info_of_user(user_id):
     """
     更新用户的所有证书信息
@@ -315,6 +316,7 @@ def check_permission_and_get_row(domain_id, user_id):
     return row
 
 
+@async_task_service.async_task_decorator("自动导入子域名证书")
 def auto_import_from_domain(root_domain, group_id=0, user_id=0):
     """
     自动导入顶级域名下包含的子域名到证书列表