From c140d30e44e44e09940c709195e0f1380beef143 Mon Sep 17 00:00:00 2001 From: tt-P607 <68868379+tt-P607@users.noreply.github.com> Date: Tue, 19 Aug 2025 16:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dqzone=5Fservice.py=E4=B8=AD?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E7=9A=84pathlib.Path=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=A0=E6=B3=95=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E5=88=B0=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98=EF=BC=8C=E8=BF=98?= =?UTF-8?q?=E6=9C=89host=E5=92=8C=E7=AB=AF=E5=8F=A3=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=BF=AE=E6=94=B9=F0=9F=91=80=E6=80=BB=E4=B9=8B?= =?UTF-8?q?=E5=B0=B1=E6=98=AF=E5=8F=88=E6=B7=B7=E5=88=B0=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BA=86=F0=9F=98=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/built_in/maizone_refactored/plugin.py | 5 +++-- .../built_in/maizone_refactored/services/cookie_service.py | 5 +++-- .../built_in/maizone_refactored/services/qzone_service.py | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/plugins/built_in/maizone_refactored/plugin.py b/src/plugins/built_in/maizone_refactored/plugin.py index d0f9d2ad9..08b32f0a2 100644 --- a/src/plugins/built_in/maizone_refactored/plugin.py +++ b/src/plugins/built_in/maizone_refactored/plugin.py @@ -70,8 +70,9 @@ class MaiZoneRefactoredPlugin(BasePlugin): "random_interval_max_minutes": ConfigField(type=int, default=15, description="随机间隔分钟数上限"), }, "cookie": { - "http_fallback_host": ConfigField(type=str, default="127.0.0.1", description="备用Cookie获取服务的主机地址"), - "http_fallback_port": ConfigField(type=int, default=8080, description="备用Cookie获取服务的端口"), + "http_fallback_host": ConfigField(type=str, default="172.20.130.55", description="备用Cookie获取服务的主机地址"), + "http_fallback_port": ConfigField(type=int, default=9999, description="备用Cookie获取服务的端口"), + "napcat_token": ConfigField(type=str, default="", description="Napcat服务的认证Token（可选）"), }, } diff --git a/src/plugins/built_in/maizone_refactored/services/cookie_service.py b/src/plugins/built_in/maizone_refactored/services/cookie_service.py index a244fdccb..aee9cd1e2 100644 --- a/src/plugins/built_in/maizone_refactored/services/cookie_service.py +++ b/src/plugins/built_in/maizone_refactored/services/cookie_service.py @@ -68,10 +68,11 @@ class CookieService: async def _get_cookies_from_http(self) -> Optional[Dict[str, str]]: """通过备用HTTP端点获取Cookie""" - host = self.get_config("cookie.http_fallback_host") - port = self.get_config("cookie.http_fallback_port") + host = self.get_config("cookie.http_fallback_host", "172.20.130.55") + port = self.get_config("cookie.http_fallback_port", "9999") if not host or not port: + logger.warning("Cookie HTTP备用配置缺失：请在配置文件中设置 cookie.http_fallback_host 和 cookie.http_fallback_port") return None http_url = f"http://{host}:{port}/get_cookies" diff --git a/src/plugins/built_in/maizone_refactored/services/qzone_service.py b/src/plugins/built_in/maizone_refactored/services/qzone_service.py index 96c824081..2fd956888 100644 --- a/src/plugins/built_in/maizone_refactored/services/qzone_service.py +++ b/src/plugins/built_in/maizone_refactored/services/qzone_service.py @@ -9,6 +9,7 @@ import json import os import random import time +from pathlib import Path from typing import Callable, Optional, Dict, Any, List, Tuple import aiohttp @@ -245,9 +246,9 @@ class QZoneService: try: # 使用HTTP服务器方式获取Cookie - host = self.get_config("cookie.http_fallback_host", "127.0.0.1") - port = self.get_config("cookie.http_fallback_port", "8080") - napcat_token = self.get_config("plugin.napcat_token", "") + host = self.get_config("cookie.http_fallback_host", "172.20.130.55") + port = self.get_config("cookie.http_fallback_port", "9999") + napcat_token = self.get_config("cookie.napcat_token", "") cookie_data = await self._fetch_cookies_http(host, port, napcat_token) if cookie_data and "cookies" in cookie_data: