Commit fc37c9b9 by baiquan

refactor(utils): 优化任务回调逻辑

- 修改 common.py 中的 callback_task 函数,增加对不同任务类型的处理
- 在 upload_image_and_video.py 中增加对回调结果的处理,根据返回码进行日志记录
parent 7f053888
...@@ -266,7 +266,13 @@ async def uploadImageAndVideo(task: dict = None): ...@@ -266,7 +266,13 @@ async def uploadImageAndVideo(task: dict = None):
} }
callback_str = json.dumps(callback_data) callback_str = json.dumps(callback_data)
logger.info(f"{callback_str[:1000]}......{callback_str[-1000:]}") logger.info(f"{callback_str[:1000]}......{callback_str[-1000:]}")
await callback_task(callback_data, TaskType.DOUDIAN_UPLOAD_IMAGE_AND_VIDEO) response = await callback_task(callback_data, TaskType.DOUDIAN_UPLOAD_IMAGE_AND_VIDEO)
if response.get('code') == 0:
logger.debug(f"任务回调结果 --> {response.get('message')}")
elif response.get('code') == 1:
logger.error(f"任务回调结果 --> {response}")
else:
logger.error(f"未知错误 --> {response}")
async def run_in_executor(func, *args): async def run_in_executor(func, *args):
"""在异步环境中运行同步函数""" """在异步环境中运行同步函数"""
......
...@@ -234,9 +234,9 @@ async def callback_task(data: dict, task_type:int): ...@@ -234,9 +234,9 @@ async def callback_task(data: dict, task_type:int):
:return: :return:
""" """
if task_type == TaskType.DOUDIAN_SHOP_LOGIN: if task_type == TaskType.DOUDIAN_SHOP_LOGIN:
return requests.post(f"{settings.DOMAIN}/api/collection/task", json=data, headers=DEFAULT_HEADER) return requests.post(f"{settings.DOMAIN}/api/collection/task", json=data, headers=DEFAULT_HEADER).json()
elif task_type == TaskType.DOUDIAN_UPLOAD_IMAGE_AND_VIDEO: elif task_type == TaskType.DOUDIAN_UPLOAD_IMAGE_AND_VIDEO:
return requests.post(f"{settings.DOMAIN}/api/collection/task/callBackPublishTask", json=data, headers=DEFAULT_HEADER) return requests.get(f"{settings.DOMAIN}/api/collection/task/getPublishTask", headers=DEFAULT_HEADER).json()
else: else:
raise Exception(f"未知任务类型 --> {task_type}") raise Exception(f"未知任务类型 --> {task_type}")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment