diff --git a/model/model.py b/model/model.py index 074235e..4724962 100644 --- a/model/model.py +++ b/model/model.py @@ -35,3 +35,5 @@ class DataReceive(BaseModel): class DeviceResetData(BaseModel): device_id: str = Field(..., description="设备ID") + country: str = Field(..., description="国家") + app_name: str = Field(..., description="应用名称") diff --git a/task_management/all_task_management.py b/task_management/all_task_management.py index 656001b..0929f7f 100644 --- a/task_management/all_task_management.py +++ b/task_management/all_task_management.py @@ -23,7 +23,7 @@ class AllTask: # 任务结束后开始等待 endtime = time.time() + 55 while time.time() < endtime: - await time.sleep(1) + await time.sleep(5) result = self.redis_conn.read_data(key) if result: return result @@ -62,8 +62,7 @@ class AllTask: await self.db_pool.insert_many(table="crawler_task_record_info", data=param) except Exception as e: print("将任务记录到数据库失败,失败原因为:{}".format(e)) + result = [] if param["app_name"] == "Shopee": result = await self.deal_shopee_task(data) - if result: - return result - return None + return result