From 4ad6ecd5c9fe7fe0f2f7579a5addf62466cf48ba Mon Sep 17 00:00:00 2001 From: houhuan Date: Wed, 18 Nov 2026 10:32:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20--upload-only=20?= =?UTF-8?q?=E8=A1=A5=E4=BC=A0=E6=A8=A1=E5=BC=8F=E4=B8=8E=20reupload.bat?= =?UTF-8?q?=EF=BC=88NAS=20=E9=87=8D=E5=90=AF=E5=90=8E=E6=97=A0=E9=9C=80?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=EF=BC=89=EF=BC=9B=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=86=85=E7=BD=91=E5=9C=B0=E5=9D=80=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=BB=95=E8=BF=87=E7=B3=BB=E7=BB=9F=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.example.yaml | 6 +- fengxiang/config.py | 3 +- fengxiang_scraper.py | 128 ++++++++++++++++++++++++++++++++++++------- reupload.bat | 22 ++++++++ 4 files changed, 134 insertions(+), 25 deletions(-) create mode 100644 reupload.bat diff --git a/config.example.yaml b/config.example.yaml index 255e9f7..63a904d 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -7,10 +7,8 @@ timezone: Asia/Shanghai api: base_url: https://fs.szfx.com order_path: /saasmerchant/pcweb/order/quickpayorder/list - login_url: >- - https://fspass.szfx.com/ucenter/userlogin?platform=saas - &redirect_url=https%3A%2F%2Ffs.szfx.com%2FMMS%23%2F - &return_url=https%3A%2F%2Ffs.szfx.com%2Fsaasmerchant%2Fsetstoken + # 必须写在一行:用 >- 折行会在 query 里折出空格,导致登录链接失效 + login_url: "https://fspass.szfx.com/ucenter/userlogin?platform=saas&redirect_url=https%3A%2F%2Ffs.szfx.com%2FMMS%23%2F&return_url=https%3A%2F%2Ffs.szfx.com%2Fsaasmerchant%2Fsetstoken" timeout: 20 max_retries: 2 diff --git a/fengxiang/config.py b/fengxiang/config.py index 9df2409..79cf46b 100644 --- a/fengxiang/config.py +++ b/fengxiang/config.py @@ -244,7 +244,8 @@ def load_config(path: str | os.PathLike | None = None) -> Config: api=ApiCfg( base_url=data["api"]["base_url"], order_path=data["api"]["order_path"], - login_url=data["api"]["login_url"], + # YAML 多行折叠可能往 query 里折出空格,登录链接会失效,这里兜底清掉 + login_url="".join(str(data["api"]["login_url"]).split()), timeout=int(data["api"]["timeout"]), max_retries=int(data["api"]["max_retries"]), ), diff --git a/fengxiang_scraper.py b/fengxiang_scraper.py index f22c3cc..69036e4 100644 --- a/fengxiang_scraper.py +++ b/fengxiang_scraper.py @@ -20,6 +20,7 @@ from __future__ import annotations import argparse import json +import os import sys import time from pathlib import Path @@ -29,42 +30,90 @@ import requests from fengxiang.config import load_config MMS_BASE = "https://fs.szfx.com/MMS" -LOGIN_TIMEOUT_MS = 600_000 # 10 分钟 +LOGIN_TIMEOUT_SEC = 1800 # 30 分钟,够你在忙的时候回来登 +PROFILE_DIR = Path("data/browser-profile") # 持久化会话,减少重复登录 -def login_with_browser(login_url: str) -> dict[str, str] | None: +def prefill_credentials(page, account: str, password: str) -> None: + """可选:自动填入账号密码,验证码仍由人工完成。""" + try: + page.fill('input[placeholder*="手机号"]', account, timeout=8000) + page.fill('input[type="password"]', password, timeout=8000) + print(" 已自动填入账号密码,请手动完成验证码并点登录") + except Exception as exc: # noqa: BLE001 - 填不上就交给人工 + print(f" 自动填写失败({exc}),请手动输入") + + +def login_with_browser(login_url: str, timeout_sec: int = LOGIN_TIMEOUT_SEC, + account: str | None = None, password: str | None = None) -> dict[str, str] | None: try: from playwright.sync_api import sync_playwright except ImportError: print("[错误] 未安装 playwright:pip install playwright && playwright install chromium", file=sys.stderr) return None + PROFILE_DIR.mkdir(parents=True, exist_ok=True) print("[1/3] 启动浏览器,请在窗口中完成登录(账号密码 + 验证码)...") with sync_playwright() as p: - browser = p.chromium.launch(headless=False, args=["--start-maximized"]) - context = browser.new_context(no_viewport=True) - page = context.new_page() - page.goto(login_url) - - print("[2/3] 等待登录完成(最多 10 分钟)...") + ctx = p.chromium.launch_persistent_context( + str(PROFILE_DIR), + headless=False, + args=["--start-maximized"], + no_viewport=True, + ) + page = ctx.pages[0] if ctx.pages else ctx.new_page() try: - page.wait_for_url("**/MMS**", timeout=LOGIN_TIMEOUT_MS) - print(" 登录成功,正在提取 Cookie...") - except Exception: - print(" 等待超时,已退出。请重新运行。", file=sys.stderr) - browser.close() + page.goto(login_url, wait_until="domcontentloaded", timeout=60_000) + except Exception as exc: # noqa: BLE001 - 网络慢不该直接判死 + print(f" 打开登录页失败:{exc}", file=sys.stderr) + + if account and password: + prefill_credentials(page, account, password) + + print(f"[2/3] 等待登录完成(最多 {timeout_sec // 60} 分钟,请勿关闭窗口)...") + shot = PROFILE_DIR.parent / "login-state.png" + deadline = time.time() + timeout_sec + last_note = 0.0 + ok = False + while time.time() < deadline: + try: + if "fs.szfx.com/mms" in page.url.lower(): + ok = True + break + page.wait_for_timeout(1000) + except Exception: + print(" 浏览器窗口已被关闭,退出。", file=sys.stderr) + ctx.close() + return None + if time.time() - last_note >= 60: + last_note = time.time() + left = int((deadline - time.time()) / 60) + 1 + # 截图留证:窗口到底渲染成什么样 + try: + page.screenshot(path=str(shot)) + except Exception: + pass + print(f" [心跳] 仍在等待登录,剩余约 {left} 分钟(当前:{page.url[:80]})") + + if not ok: + try: + print(f" 等待超时,当前页面:{page.url}", file=sys.stderr) + except Exception: + pass + print(" 已退出,请重新运行。", file=sys.stderr) + ctx.close() return None + print(" 登录成功,正在提取 Cookie...") # 访问一次首页,确保必要的 Cookie 都下发了 try: - page.goto(MMS_BASE) - page.wait_for_load_state("networkidle", timeout=30_000) + page.goto(MMS_BASE, wait_until="networkidle", timeout=30_000) except Exception: pass time.sleep(2) - cookies = {c["name"]: c["value"] for c in context.cookies()} - browser.close() + cookies = {c["name"]: c["value"] for c in ctx.cookies()} + ctx.close() print(f"[3/3] 提取到 {len(cookies)} 个 Cookie") return cookies @@ -91,11 +140,20 @@ def upload(server: str, token: str, cookies: dict[str, str]) -> bool: headers = {"Content-Type": "application/json"} if token: headers["X-Auth-Token"] = token + # 局域网地址必须绕过系统代理:本机代理连不上内网会把请求变成 502 + from urllib.parse import urlparse + + host = urlparse(url).hostname or "" + session = requests.Session() + if host.startswith(("192.168.", "10.", "127.", "localhost", "172.1", "172.2", "172.3")): + session.trust_env = False + print(f" 目标为内网地址,已绕过系统代理") print(f" 上传到 {url} ...") try: - resp = requests.post(url, json={"cookies": cookies}, headers=headers, timeout=20) + resp = session.post(url, json={"cookies": cookies}, headers=headers, timeout=20) except requests.RequestException as exc: print(f" 上传失败(网络):{exc}", file=sys.stderr) + print(" 若 NAS 刚开机,等 1-2 分钟再试;或确认 192.168.8.210 是否在线。", file=sys.stderr) return False print(f" HTTP {resp.status_code} {resp.text[:300]}") return resp.status_code == 200 @@ -106,10 +164,41 @@ def main() -> int: parser.add_argument("--upload", action="store_true", help="登录成功后上传到服务器") parser.add_argument("--server", default=None, help="服务器地址,如 http://192.168.8.210:52100") parser.add_argument("--token", default=None, help="管理接口 token") + parser.add_argument("--timeout", type=int, default=LOGIN_TIMEOUT_SEC, help="等待登录的秒数") + parser.add_argument("--account", default=None, help="可选:自动填入的账号/手机号") + parser.add_argument("--password", default=None, help="可选:自动填入的密码") + parser.add_argument( + "--upload-only", + action="store_true", + help="不打开浏览器:直接把本地已保存的 Cookie 校验并上传(服务器恢复后补传用)", + ) args = parser.parse_args() cfg = load_config() - cookies = login_with_browser(cfg.api.login_url) + out = Path(cfg.paths.cookies) + + # 补传模式:NAS 重启/网络恢复后,用已保存的有效 Cookie 直接推上去,不用再登录 + if args.upload_only: + if not out.exists(): + print(f"[错误] 本地没有 Cookie 文件:{out},请先正常登录一次", file=sys.stderr) + return 3 + cookies = json.loads(out.read_text(encoding="utf-8")) + print(f"[补传] 读取本地 Cookie({len(cookies)} 个):{out}") + if not verify(cfg, cookies): + print("本地 Cookie 已失效,需要重新登录(去掉 --upload-only 再跑)", file=sys.stderr) + return 2 + server = args.server or os.environ.get("FX_SERVER") + token = args.token or os.environ.get("FX_ADMIN_TOKEN") or cfg.admin.token + if not server: + print("[错误] 未指定服务器:用 --server 或环境变量 FX_SERVER", file=sys.stderr) + return 3 + return 0 if upload(server, token, cookies) else 4 + + print(f" 登录页:{cfg.api.login_url[:100]}") + account = args.account or os.environ.get("FX_ACCOUNT") + password = args.password or os.environ.get("FX_PASSWORD") + cookies = login_with_browser(cfg.api.login_url, timeout_sec=args.timeout, + account=account, password=password) if not cookies: return 1 @@ -124,7 +213,6 @@ def main() -> int: print(f" 已保存到 {out}") if args.upload: - import os server = args.server or os.environ.get("FX_SERVER") token = args.token or os.environ.get("FX_ADMIN_TOKEN") or cfg.admin.token if not server: diff --git a/reupload.bat b/reupload.bat new file mode 100644 index 0000000..fc416fc --- /dev/null +++ b/reupload.bat @@ -0,0 +1,22 @@ +@echo off +chcp 65001 >nul +title 补传丰享 Cookie 到服务器 +cd /d "%~dp0" + +echo ============================================ +echo 用本地已保存的 Cookie 补传到服务器 +echo (不打开浏览器,NAS 恢复后用这个) +echo ============================================ +echo. + +set "PYTHON=" +if exist ".venv\Scripts\python.exe" set "PYTHON=.venv\Scripts\python.exe" +if not defined PYTHON if defined FX_PYTHON set "PYTHON=%FX_PYTHON%" +if not defined PYTHON set "PYTHON=python" + +if not defined FX_SERVER set "FX_SERVER=http://192.168.8.210:52100" + +"%PYTHON%" fengxiang_scraper.py --upload-only --server "%FX_SERVER%" +echo. +echo 若提示 Cookie 已失效:改跑 login.bat 重新登录一次即可。 +pause