From 6ac696a7cee32ef658878ec0e11bee126971cf18 Mon Sep 17 00:00:00 2001 From: minecraft1024a Date: Tue, 12 Aug 2025 15:30:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(qzone=5Futils):=20=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E4=BB=8ENapCat=E8=8E=B7=E5=8F=96Cookie=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86=E5=92=8C=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AF=B7=E6=B1=82=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=EF=BC=8C=E7=A1=AE=E4=BF=9D=E5=9C=A8?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5=E6=97=B6=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E8=AF=A6=E7=BB=86=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/built_in/Maizone/qzone_utils.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/plugins/built_in/Maizone/qzone_utils.py b/src/plugins/built_in/Maizone/qzone_utils.py index 88cc99e34..635838956 100644 --- a/src/plugins/built_in/Maizone/qzone_utils.py +++ b/src/plugins/built_in/Maizone/qzone_utils.py @@ -65,16 +65,32 @@ class CookieManager: async def fetch_cookies(domain: str, port: str, host: str) -> Dict[str, Any]: """从NapCat获取Cookie""" url = f"http://{host}:{port}/get_cookies?domain={domain}" + logger.info(f"正在从NapCat获取Cookie，URL: {url}") + try: - async with httpx.AsyncClient(timeout=10.0, trust_env=False) as client: + async with httpx.AsyncClient(timeout=20.0, trust_env=False) as client: + logger.debug(f"发送GET请求到: {url}") resp = await client.get(url) + logger.debug(f"响应状态码: {resp.status_code}") + resp.raise_for_status() data = resp.json() + logger.info(f"响应数据: {data}") if data.get("status") != "ok" or "cookies" not in data.get("data", {}): raise RuntimeError(f"获取Cookie失败: {data}") + logger.info("成功从NapCat获取Cookie") return data["data"] + except httpx.ConnectError as e: + logger.error(f"无法连接到NapCat服务器 {host}:{port} - 请检查NapCat是否运行: {str(e)}") + raise + except httpx.TimeoutException as e: + logger.error(f"连接NapCat超时: {str(e)}") + raise + except httpx.HTTPStatusError as e: + logger.error(f"NapCat返回错误状态码 {e.response.status_code}: {e.response.text}") + raise except Exception as e: logger.error(f"从NapCat获取Cookie失败: {str(e)}") raise