From 679f61c18ff5b6109944aa61ca85125164717581 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 4 Dec 2024 16:19:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 ++-- index.py | 5 ++--- util/api.py | 30 ++++++++++++++++++++++-------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.env b/.env index 1949a34..59de584 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ TEMPLATE_DIR=template/ -API_ENDPOINT=/task -API_TOKEN=123456 +API_ENDPOINT=http://127.0.0.1:8030/task/v1/sync +ACCESS_KEY=TEST_ACCESS_KEY TEMP_DIR=tmp/ \ No newline at end of file diff --git a/index.py b/index.py index 9b0640a..2b14166 100644 --- a/index.py +++ b/index.py @@ -4,7 +4,6 @@ import biz.task import config from template import load_local_template from util import api -from util.system import get_sys_info load_local_template() @@ -12,8 +11,8 @@ load_local_template() while True: # print(get_sys_info()) print("waiting for task...") - task_list = api.get_render_task() + task_list = api.sync_center() for task in task_list: print("start task:", task) biz.task.start_task(task) - break \ No newline at end of file + sleep(1) \ No newline at end of file diff --git a/util/api.py b/util/api.py index 8250d07..62b49f1 100644 --- a/util/api.py +++ b/util/api.py @@ -1,19 +1,33 @@ +import logging +import os + import requests +import util.system + session = requests.Session() +logger = logging.getLogger(__name__) - -def get_render_task(): +def sync_center(): """ 通过接口获取任务 :return: 任务列表 """ - tasks = [] - tasks.append({ - 'user_videos': { - 'CAM_ID': 'paper-planes.mp4' - } - }) + try: + response = session.post(os.getenv('API_ENDPOINT'), json={ + 'accessKey': os.getenv('ACCESS_KEY'), + 'clientStatus': util.system.get_sys_info() + }, timeout=10) + except requests.RequestException as e: + logger.error("请求失败!", e) + return [] + data = response.json() + logger.debug("获取任务结果:【%s】", data) + if data.get('code', 0) == 200: + tasks = data.get('data', {}).get('tasks', []) + else: + tasks = [] + logger.warning("获取任务失败") return tasks