From 5a7210bb43a194cb4695f4161f7475f3a8efc1ff Mon Sep 17 00:00:00 2001 From: liujianjiang Date: Fri, 9 Jan 2026 17:22:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account_management/deal_account.py | 45 +++++++++++++++--------------- public_function/deal_all_task.py | 24 ++++++++-------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/account_management/deal_account.py b/account_management/deal_account.py index c5332cd..b8156b0 100644 --- a/account_management/deal_account.py +++ b/account_management/deal_account.py @@ -108,28 +108,29 @@ class DealAccount: where_conditions = "account_id = %s " result_sql = await self.update_device_status(set_param, where_conditions, params) logger.info(f"{data['account_id']} 开始修改数据状态，修改结果为：{result_sql}") - if result_sql: - 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 - else: - logger.info(f"云机:{data['pad_code']} 300环境还原失败，需要认为干预") + # if result_sql: + logger.info(f"{data['pad_code']} 开始进行还原") + 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 + else: + logger.info(f"云机:{data['pad_code']} 300环境还原失败，需要认为干预") else: logger.info("未查询到可用还原数据") return False diff --git a/public_function/deal_all_task.py b/public_function/deal_all_task.py index 7b40e21..00b9e23 100644 --- a/public_function/deal_all_task.py +++ b/public_function/deal_all_task.py @@ -21,12 +21,12 @@ class DealAllTask: self.logger = logger def send_post_get(self, api_endpoint, payload, is_check=False): - logger.info(f"{api_endpoint}: 参数为{payload}") + self.logger.info(f"{api_endpoint}: 参数为{payload}") try: arm_obj = ArmCloudSignatureV2(self.access_key_id, self.secret_key, self.end_point) response = arm_obj.post(api_endpoint, payload) result = response.json() - logger.info(f"接口：{api_endpoint}返回结果为{result} ") + self.logger.info(f"接口：{api_endpoint}返回结果为{result} ") if result.get("code") == 200: if isinstance(result['data'], dict): return [result['data']] @@ -40,7 +40,7 @@ class DealAllTask: time.sleep(random.randint(1, 3)) return [] except Exception as e: - logger.info(f": {str(e)}") + self.logger.info(f": {str(e)}") return [] def one_click_new_device(self, pad_code: list[str], country: str): @@ -54,12 +54,12 @@ class DealAllTask: @staticmethod def set_network_proxy(pad_code: list[str], country: str, proxy_platform="kkoip"): if proxy_platform == "kkoip": - logger.info(f"{pad_code}使用kkoip") + self.logger.info(f"{pad_code}使用kkoip") set_network_proxy(pad_codes=pad_code, account='6255452-2ff229fb', password='ef9996e4-%s-%d-60m' % (country, int(time.time() * 1000) + random.randint(0, 10000)), ip='gate-hk.kkoip.com', port='15636', proxy_name='socks5', proxy_type='proxy') if proxy_platform == "uniproxy": - logger.info(f"{pad_code}使用 uniproxy") + self.logger.info(f"{pad_code}使用 uniproxy") session = random.randint(1000000, 1000000000) # curl -x socks5://uniproxy-zone-custom-region-US:uniproxy@adv3.uipoxy.com:3000 ipinfo.io set_network_proxy(pad_codes=pad_code, @@ -70,7 +70,7 @@ class DealAllTask: def install_app(self, pad_code: list[str]): end_point = "/openapi/open/pad/installApp" payload = {"apps": [{"appId": 691720698, "appName": "AutoJs6", "pkgName": "org.autojs.autojs6", "padCodes": pad_code, }]} - logger.info(f"{pad_code};开始安装autojs") + self.logger.info(f"{pad_code};开始安装autojs") self.send_post_get(end_point, payload) def get_app_list(self, pad_code): @@ -121,7 +121,7 @@ class DealAllTask: end_point = "/file-center/open/file/list" payload = {"page": 1, "rows": 10, "fileName": file_name} res = self.send_post_get(end_point, payload) - logger.info(res) + self.logger.info(res) if res: if len(res[0]['pageData']) > 0: return res[0]['pageData'][0]['fileUniqueId'] @@ -146,7 +146,7 @@ class DealAllTask: if isinstance(result, list): return True else: - logger.info(f"{pad_code[0]}未就绪; 返回结果为: {result}") + self.logger.info(f"{pad_code[0]}未就绪; 返回结果为: {result}") count += 1 time.sleep(30) if count == times: @@ -168,7 +168,7 @@ class DealAllTask: time_zone_list = pytz.country_timezones.get(country_code) time_zone = random.choice(time_zone_list) payload = {"padCodes": pad_code, "timeZone": time_zone} - logger.info(f"云机：{pad_code};将时区修改为：{time_zone}") + self.logger.info(f"云机：{pad_code};将时区修改为：{time_zone}") return self.send_post_get(end_point, payload) def backup_system(self, pad_code: list[str], backup_name: str): @@ -219,7 +219,7 @@ class DealAllTask: if __name__ == '__main__': obj = DealAllTask() results = obj.async_execute_adb_command(["ACP251024MKBZTCO"], "test_abc.js", is_check=True) - logger.info(type(results)) + self.logger.info(type(results)) if results: - logger.info(123113) - logger.info(f"1223{results}1223") + self.logger.info(123113) + self.logger.info(f"1223{results}1223")