From c79c832128be1a96defe3b049e9c06d04d85a76e Mon Sep 17 00:00:00 2001 From: zayac Date: Fri, 31 May 2024 14:42:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE,=E6=9B=B4=E6=96=B0=E4=BA=86=E6=96=B0?= =?UTF-8?q?=E7=89=88=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/change_url/Dockerfile | 8 +- src/change_url/change_url_bot.py | 2 +- src/core/api_request.py | 5 +- src/core/login.py | 295 ++++++++++++++++++------------- src/ui/app.py | 6 +- src/ui/title_bar.py | 5 +- 6 files changed, 189 insertions(+), 132 deletions(-) diff --git a/src/change_url/Dockerfile b/src/change_url/Dockerfile index c4e20cd..183a127 100644 --- a/src/change_url/Dockerfile +++ b/src/change_url/Dockerfile @@ -1,12 +1,14 @@ # 使用官方 Python 3.11 镜像 -FROM python:3.11 +FROM python:3.11-slim + + +# 设置工作目录 +WORKDIR /app # 将应用代码复制到 /app 目录下 COPY . /app COPY requirements.txt /app/requirements.txt -# 设置工作目录 -WORKDIR /app # 安装 Python 依赖 RUN pip install -r requirements.txt diff --git a/src/change_url/change_url_bot.py b/src/change_url/change_url_bot.py index 38ebf1b..b8ffb74 100644 --- a/src/change_url/change_url_bot.py +++ b/src/change_url/change_url_bot.py @@ -4,7 +4,7 @@ import time import os from loguru import logger -BOT_TOKEN = os.getenv('BOT_TOKEN', default="6356456493:AAF2J03isyhlOFF6WgoovRCzuvHheTrTKmM") +BOT_TOKEN = os.getenv('BOT_TOKEN', default="7153107488:AAEfeznAQzcvJhoEa0QqKN9baP4luQ4Xd1Y") API_URL = os.getenv('API_URL', default="http://127.0.0.1:8080/changeurl") logger.debug(f"bot_token:{BOT_TOKEN}") diff --git a/src/core/api_request.py b/src/core/api_request.py index 943cc5b..c8282b4 100644 --- a/src/core/api_request.py +++ b/src/core/api_request.py @@ -44,7 +44,7 @@ async def async_post(url: str, headers: dict, params: dict) -> ApiResponse[Any]: def account_post(url: str, account: Account, params: dict) -> ApiResponse[Any]: for _ in range(3): try: - if account.headers is None: + if not account.headers: account = login(account) api_res = post(url=account.url + url, headers=account.headers, params=params) if api_res.status_code == 6000: @@ -89,5 +89,6 @@ async def async_account_post(url: str, account: Account, params: dict) -> ApiRes # Add a delay before retrying await asyncio.sleep(10) - send_message(account.user.bot_token, account.user.group_id, f'{account.url}: Retry limit exceeded, please check the code') + send_message(account.user.bot_token, account.user.group_id, + f'{account.url}: Retry limit exceeded, please check the code') logger.error("Retry limit exceeded, please check the code") diff --git a/src/core/login.py b/src/core/login.py index 92469c1..752e0b1 100644 --- a/src/core/login.py +++ b/src/core/login.py @@ -1,156 +1,214 @@ import base64 -import json import re -import time - -import requests -from playwright.sync_api import Position, TimeoutError, sync_playwright - +import asyncio +from playwright.async_api import async_playwright, TimeoutError from loguru import logger + +from src.core.message_client import send_message from src.entity.account import Account, AccountType +import aiohttp + from src.entity.database import db -from src.ui import global_signals -def on_request(request, account: Account): - if 'banner' in request.url: +# 提取重复的请求和响应处理逻辑 +async def handle_event(page, event_type, callback, *args): + page.on(event_type, lambda event: asyncio.create_task(callback(event, *args))) + + +async def handle_request(request, result_container, request_event): + if 'perInfo' in request.url: headers = request.headers - account.headers = headers - logger.info(f'Headers for account {account.name}: {headers}') - persistence(account, headers) - # 通知app数据更新了 - global_signals.user_data_updated.emit() + result_container['headers'] = headers + logger.info(f'Successfully got headers: {headers}') + request_event.set() -def login(account: Account) -> Account: - logger.info(f'Starting login for account: {account.name}') +async def handle_response(response, response_container, response_event): + if 'loginFlow' in response.url: + data = await response.json() + response_container['data'] = data + response_event.set() + + +async def playwright_login(account: Account) -> dict: + result_container = {'headers': {}} + response_container = {'data': {}} + logger.info(f'Starting login for username: {account.username}') try: - with sync_playwright() as playwright: - account = perform_login(playwright, account) + async with async_playwright() as playwright: + await perform_login(playwright, account, result_container, response_container) except Exception as e: - logger.error(f'Error during login for account {account.name}: {e}', exc_info=True) - handle_login_failure(account) - return account + logger.error(f'Error during login for account {account.username}: {e}', exc_info=True) + await handle_login_failure(account) + return result_container['headers'] -def perform_login(playwright, account: Account) -> Account: - browser = playwright.chromium.launch(headless=False) - context = browser.new_context() - page = context.new_page() - page.goto(account.url) - fill_login_form(page, account) - if handle_captcha(page, account.type, retry_count=0): - account.headers = capture_request_headers(page, account) - logger.info('登录成功') +async def perform_login(playwright, account: Account, request_container: dict, + response_container: dict): + browser = await playwright.chromium.launch(headless=False) + context = await browser.new_context() + page = await context.new_page() + + request_event = asyncio.Event() + response_event = asyncio.Event() + + await page.goto(account.url) + + await handle_event(page, 'request', handle_request, request_container, request_event) + await handle_event(page, 'response', handle_response, response_container, response_event) + # 填充基本的元素 + await fill_form_common(page, account) + # 如果是九游 验证码滑动,并且滑动之后自动登录成功 + if account.type == AccountType.jy: + await handle_jy_captcha(page, account, 0) + logger.info("验证码处理成功") + try: + # 等待请求发送 获取header返回值 + await request_event.wait() + except TimeoutError: + # 超时 即验证码处理失败 + logger.warning("登录处理失败") else: - logger.error('登录失败了') - close_resources(page, context, browser) - return account + # 验证码输入成功 + max_retries = 3 + for attempt in range(max_retries): + if await handle_captcha(page): + response_event.clear() # 重置事件 + await page.locator("div").filter(has_text=re.compile(r"^登录$")).get_by_role("button").click() + try: + await response_event.wait() + if response_container['data'].get('status_code') != 6000: + logger.warning(f"登录发生错误, {response_container['data'].get('message', '未知错误')}") + close_button = page.locator("button.ant-modal-close") + await close_button.wait_for() + await close_button.click() + else: + break + except TimeoutError: + logger.warning(f"等待响应超时，重试 {attempt + 1}/{max_retries}") + else: + logger.warning(f"验证码输入失败，重试 {attempt + 1}/{max_retries}") + else: + logger.warning("登录失败，达到最大重试次数") + try: + # 等待请求发送 获取header返回值 + await request_event.wait() + except TimeoutError: + # 超时 即验证码处理失败 + logger.warning("登录处理失败") + await close_resources(page, context, browser) -def fill_login_form(page, account: Account): +async def fill_form_common(page, account: Account): username_input = page.get_by_placeholder('用户名') password_input = page.get_by_placeholder('密码') - username_input.click() - username_input.fill(account.username) - password_input.click() - password_input.fill(account.password) - page.locator("div").filter(has_text=re.compile(r"^登录$")).get_by_role("button").click() - logger.info(f'{account.name}登录ing...........') + await username_input.click() + await username_input.fill(account.username) + await password_input.click() + await password_input.fill(account.password) -def handle_captcha(page, account_type, retry_count) -> bool: - if retry_count < 3: - try: - validate_code = page.locator('.geetest_box') - validate_code.wait_for(state='visible') - time.sleep(1) - return process_validate_code(page, validate_code, account_type) - except TimeoutError: - retry_count += 1 - logger.error(f'验证码识别失败,正在重试:{retry_count}次') - return handle_captcha(page, account_type, retry_count) - return False - - -def process_validate_code(page, validate_code, account_type): - validate_code_buffer = validate_code.screenshot() +async def handle_jy_captcha(page, account, retry_count=0): + await page.locator("div").filter(has_text=re.compile(r"^登录$")).get_by_role("button").click() + validate_code = page.locator('.geetest_box') + await validate_code.wait_for(state='visible') + await asyncio.sleep(1) + validate_code_buffer = await validate_code.screenshot() img = base64.b64encode(validate_code_buffer).decode('utf-8') - # 九游滑动验证 需要单独处理 - if account_type == AccountType.jy: - res = base64_api(img=img, typeid=33) - drag_btn = validate_code.locator(".geetest_btn") - drag_btn_box = drag_btn.bounding_box() + res = await base64_api(img=img, typeid=33) + drag_btn = validate_code.locator(".geetest_btn") + drag_btn_box = await drag_btn.bounding_box() + try: + distance = int(res) + 3 + target_x = drag_btn_box['x'] + distance + await drag_btn.hover() + await page.mouse.down() + await page.mouse.move(target_x, drag_btn_box["y"], steps=25) + await page.mouse.up() + await validate_code.wait_for(state='hidden') + return True + except (ValueError, TimeoutError): + retry_count += 1 + logger.error(f"验证码处理失败，重试: {res}") + return await handle_jy_captcha(page, account, retry_count) - try: - distance = int(res) - target_x = drag_btn_box['x'] + distance - drag_btn.hover() - page.mouse.down() - # 缓慢滑动元素 - step = distance // 10 # 每次滑动的步长 - for i in range(0, distance, step): - page.mouse.move(drag_btn_box["x"] + i, drag_btn_box["y"]) - page.wait_for_timeout(1 // 10) - # 模拟鼠标移动操作，将元素向 x 轴滑动指定距离 - page.mouse.move(target_x, drag_btn_box["y"]) - page.mouse.up() - validate_code.wait_for(state='hidden') - logger.debug('验证码点击成功') - return True - except ValueError: - logger.error(f"获取移动距离失败,实际返回内容为：{res}") - return False - except TimeoutError: - logger.debug("验证码滑动失败") - return process_validate_code(page, validate_code, account_type) +async def handle_captcha(page): + validate_code_input = page.get_by_placeholder('请输入验证码') + validate_code_img = page.locator('#boxModle') + await validate_code_img.wait_for() + validate_code_buffer = await validate_code_img.screenshot() + img_base64 = base64.b64encode(validate_code_buffer).decode('utf-8') + res = await base64_api(img=img_base64, typeid=1003) + await validate_code_input.click() + await validate_code_input.fill(res) + return True + + +async def handle_standard_captcha(page, validate_code, img): + res = await base64_api(img=img) + if '|' in res: + await click_captcha_positions(validate_code, res) + await validate_code.locator('.geetest_submit').click() + await validate_code.wait_for(state='hidden') + logger.debug('验证码点击成功') + return True else: - res = base64_api(img=img) - if '|' in res: - click_captcha_positions(validate_code, res) - validate_code.locator('.geetest_submit').click() - validate_code.wait_for(state='hidden') - logger.debug('验证码点击成功') - return True - else: - logger.error(res) - return False + logger.error(res) + return False -def click_captcha_positions(validate_code, positions_str): +async def click_captcha_positions(validate_code, positions_str): for part in positions_str.split('|'): x, y = part.split(',') - validate_code.click(position=Position(x=int(x), y=int(y))) - time.sleep(.5) + await validate_code.click(position={"x": int(x), "y": int(y)}) + await asyncio.sleep(.5) -def capture_request_headers(page, account: Account): - page.on('request', lambda request: on_request(request, account)) - page.wait_for_url(f'{account.url}/app/home?showWelcome=false') - return account.headers +async def close_resources(page, context, browser): + try: + await page.close() + await context.close() + await browser.close() + except Exception as e: + logger.error(f'Error closing browser resources: {e}', exc_info=True) -def close_resources(page, context, browser): - page.close() - context.close() - browser.close() +async def handle_login_failure(account: Account): + send_message(account.user.bot_token, account.user.group_id, + f'{account.url}:加载超时，请检查是否后台更换了链接') + return -def handle_login_failure(account: Account): - # 处理登录失败的情况 - pass +async def base64_api(uname='luffy230505', pwd='qwer12345', img='', typeid=20): + logger.info('Calling third part interfaces') + data = { + "username": uname, + "password": pwd, + "typeid": typeid, + "image": img, + 'softid': '8d13df0efe074035b54ee9c2bef85106' + } + async with aiohttp.ClientSession() as session: + async with session.post("http://api.ttshitu.com/predict", json=data) as response: + result = await response.json() + if result['success']: + return result["data"]["result"] + else: + return result["message"] -def base64_api(uname='luffy230505', pwd='qwer12345', img='', typeid=20): - logger.info('Calling base64_api') - data = {"username": uname, "password": pwd, "typeid": typeid, "image": img, - 'softid': '8d13df0efe074035b54ee9c2bef85106'} - result = json.loads(requests.post("http://api.ttshitu.com/predict", json=data).text) - if result['success']: - return result["data"]["result"] +def login(account: Account): + headers = asyncio.run(playwright_login(account)) + if headers: + account.headers = headers + persistence(account, headers) + return account else: - return result["message"] + send_message(account.user.bot_token, account.user.group_id, + f'{account.url}:加载超时，请检查是否后台更换了链接') + return def persistence(account: Account, headers: dict): @@ -161,10 +219,3 @@ def persistence(account: Account, headers: dict): db_account.headers = headers session.commit() logger.info(f'Headers persisted for account {account.name}') - -# if __name__ == '__main__': -# with open('C:\\Users\\Administrator\\Desktop\\Snipaste_2024-03-26_21-46-35.png', 'rb') as f: -# base64_data = base64.b64encode(f.read()) -# b64 = base64_data.decode('utf-8') -# res = base64_api(img= b64,typeid=33) -# print(res) diff --git a/src/ui/app.py b/src/ui/app.py index 314e8dc..9feffd1 100644 --- a/src/ui/app.py +++ b/src/ui/app.py @@ -75,7 +75,7 @@ class Application(QMainWindow): def set_window_properties(self): self.resize(600, 400) - self.setWindowTitle("zayac的小工具") + self.setWindowTitle(f'{self.username}的小工具') self.setWindowIcon(QIcon("icons:icon.png")) self.setWindowFlags(Qt.WindowType.FramelessWindowHint) @@ -93,6 +93,7 @@ class Application(QMainWindow): def init_tray_icon(self): self.tray_icon = SystemTrayIcon(QIcon("icons:icon.png"), self) # 替换为正确的图标路径 + self.tray_icon.setToolTip(self.windowTitle()) # 设置工具提示文本为窗口标题 self.tray_icon.show() def load_config(self): @@ -341,6 +342,7 @@ class Application(QMainWindow): self.update_cell_color(table, row, col, count_change) # 确保传递 cell_data 和 count_change 参数 self.generate_notifications(account_username, col, new_data, count_change, notifications) + def update_cell_color(self, table, row, col, count_change): """更新单元格颜色""" cell = table.item(row, col) @@ -482,7 +484,7 @@ class Application(QMainWindow): return "right" if pos.y() < top + border_width: return "top" - if pos.y() > bottom - border_width: + if pos.y() > bottom + border_width: return "bottom" return None diff --git a/src/ui/title_bar.py b/src/ui/title_bar.py index 8bef181..277fdc8 100644 --- a/src/ui/title_bar.py +++ b/src/ui/title_bar.py @@ -2,6 +2,7 @@ from PyQt6.QtCore import Qt from PyQt6.QtGui import QFont, QIcon, QPixmap from PyQt6.QtWidgets import QHBoxLayout, QLabel, QToolButton, QWidget + class CustomTitleBar(QWidget): def __init__(self, parent): super().__init__(parent) @@ -30,7 +31,7 @@ class CustomTitleBar(QWidget): def setup_title_label(self): font = QFont() font.setPointSize(11) - self.titleLabel = QLabel("zayac’s Toolkit") + self.titleLabel = QLabel(f"{self.parent.username}的小工具") self.titleLabel.setFont(font) self.titleLabel.setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter) self.layout.addWidget(self.titleLabel, 1) @@ -77,4 +78,4 @@ class CustomTitleBar(QWidget): self.maximizeButton.setIcon(QIcon('icons:max.svg')) # Update icon if needed else: self.parent.showMaximized() - self.maximizeButton.setIcon(QIcon('icons:restore.svg')) # Update icon if needed \ No newline at end of file + self.maximizeButton.setIcon(QIcon('icons:restore.svg')) # Update icon if needed