优化hub浏览器关闭逻辑

utils/common.py

@@ -217,12 +217,13 @@ async def get_task(params: dict = None):
     """
     """
     publish_task = requests.get(f"{settings.DOMAIN}/api/collection/task/getPublishTask", headers=DEFAULT_HEADER).json()
     publish_task = requests.get(f"{settings.DOMAIN}/api/collection/task/getPublishTask", headers=DEFAULT_HEADER).json()
     collection_task = requests.get(f'{settings.DOMAIN}/api/collection/task', headers=DEFAULT_HEADER, params=params).json()
     collection_task = requests.get(f'{settings.DOMAIN}/api/collection/task', headers=DEFAULT_HEADER, params=params).json()
+    tasks = []
     publish_task_data = publish_task.get('data', [])
     publish_task_data = publish_task.get('data', [])
-    if publish_task_data:
-        collection_task['data'].extend(publish_task_data)
-        return collection_task
-    else:
-        return publish_task
+    collection_task_data = collection_task.get('data', [])
+    tasks.extend(publish_task_data)
+    tasks.extend(collection_task_data)
+    collection_task['data'] = tasks
+    return collection_task
 
 
 async def callback_task(data: dict, task_type:int):
 async def callback_task(data: dict, task_type:int):
     """
     """