diff --git a/account_management/deal_account.py b/account_management/deal_account.py index b8156b0..a267d1e 100644 --- a/account_management/deal_account.py +++ b/account_management/deal_account.py @@ -113,22 +113,25 @@ class DealAccount: restore = self.task_all.restore_system(pad_code=[data["pad_code"]], backup_name=res_dict["backup_name"]) logger.info(f"{data['pad_code']}还原结果为: {restore}") if restore: - result_status = self.task_all.check_phone_status(pad_code=[data["pad_code"]], file_name="test_abc.js") - logger.info(f":{data['pad_code']}{result_status}") - if result_status: - logger.info(f"云机:{data['pad_code']} 环境还原成功,开始下载文件:{res_dict['script_name']}") - # 下载执行脚本 - self.task_all.upload_file_to_phone([data["pad_code"]], file_name=res_dict["script_name"]) - # 设置代理 - logger.info(data) - time.sleep(10) - logger.info(f"{data['pad_code']} 开始设置代理") - self.task_all.set_network_proxy(pad_code=[data["pad_code"]], country=data["country"]) - # 启动对应脚本 - time.sleep(10) - self.task_all.async_execute_adb_command(pad_code=data["pad_code"], file_name=res_dict["script_name"]) - # 需要新增函数 - return True + try: + result_status = self.task_all.check_phone_status(pad_code=[data["pad_code"]], file_name="test_abc.js") + logger.info(f":{data['pad_code']}{result_status}") + if result_status: + logger.info(f"云机:{data['pad_code']} 环境还原成功,开始下载文件:{res_dict['script_name']}") + # 下载执行脚本 + self.task_all.upload_file_to_phone([data["pad_code"]], file_name=res_dict["script_name"]) + # 设置代理 + logger.info(data) + time.sleep(10) + logger.info(f"{data['pad_code']} 开始设置代理") + self.task_all.set_network_proxy(pad_code=[data["pad_code"]], country=data["country"]) + # 启动对应脚本 + time.sleep(10) + self.task_all.async_execute_adb_command(pad_code=data["pad_code"], file_name=res_dict["script_name"]) + # 需要新增函数 + return True + except Exception as e: + logger.info(f"{data['pad_code']} {e}") else: logger.info(f"云机:{data['pad_code']} 300环境还原失败,需要认为干预") else: