修复qzone_service.py中缺失的pathlib.Path导入导致的无法查找到路径问题,还有host和端口的一些修改👀总之就是又混到提交了😋
This commit is contained in:
@@ -70,8 +70,9 @@ class MaiZoneRefactoredPlugin(BasePlugin):
|
|||||||
"random_interval_max_minutes": ConfigField(type=int, default=15, description="随机间隔分钟数上限"),
|
"random_interval_max_minutes": ConfigField(type=int, default=15, description="随机间隔分钟数上限"),
|
||||||
},
|
},
|
||||||
"cookie": {
|
"cookie": {
|
||||||
"http_fallback_host": ConfigField(type=str, default="127.0.0.1", description="备用Cookie获取服务的主机地址"),
|
"http_fallback_host": ConfigField(type=str, default="172.20.130.55", description="备用Cookie获取服务的主机地址"),
|
||||||
"http_fallback_port": ConfigField(type=int, default=8080, description="备用Cookie获取服务的端口"),
|
"http_fallback_port": ConfigField(type=int, default=9999, description="备用Cookie获取服务的端口"),
|
||||||
|
"napcat_token": ConfigField(type=str, default="", description="Napcat服务的认证Token(可选)"),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -68,10 +68,11 @@ class CookieService:
|
|||||||
|
|
||||||
async def _get_cookies_from_http(self) -> Optional[Dict[str, str]]:
|
async def _get_cookies_from_http(self) -> Optional[Dict[str, str]]:
|
||||||
"""通过备用HTTP端点获取Cookie"""
|
"""通过备用HTTP端点获取Cookie"""
|
||||||
host = self.get_config("cookie.http_fallback_host")
|
host = self.get_config("cookie.http_fallback_host", "172.20.130.55")
|
||||||
port = self.get_config("cookie.http_fallback_port")
|
port = self.get_config("cookie.http_fallback_port", "9999")
|
||||||
|
|
||||||
if not host or not port:
|
if not host or not port:
|
||||||
|
logger.warning("Cookie HTTP备用配置缺失:请在配置文件中设置 cookie.http_fallback_host 和 cookie.http_fallback_port")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
http_url = f"http://{host}:{port}/get_cookies"
|
http_url = f"http://{host}:{port}/get_cookies"
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import json
|
|||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
import time
|
import time
|
||||||
|
from pathlib import Path
|
||||||
from typing import Callable, Optional, Dict, Any, List, Tuple
|
from typing import Callable, Optional, Dict, Any, List, Tuple
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
@@ -245,9 +246,9 @@ class QZoneService:
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
# 使用HTTP服务器方式获取Cookie
|
# 使用HTTP服务器方式获取Cookie
|
||||||
host = self.get_config("cookie.http_fallback_host", "127.0.0.1")
|
host = self.get_config("cookie.http_fallback_host", "172.20.130.55")
|
||||||
port = self.get_config("cookie.http_fallback_port", "8080")
|
port = self.get_config("cookie.http_fallback_port", "9999")
|
||||||
napcat_token = self.get_config("plugin.napcat_token", "")
|
napcat_token = self.get_config("cookie.napcat_token", "")
|
||||||
|
|
||||||
cookie_data = await self._fetch_cookies_http(host, port, napcat_token)
|
cookie_data = await self._fetch_cookies_http(host, port, napcat_token)
|
||||||
if cookie_data and "cookies" in cookie_data:
|
if cookie_data and "cookies" in cookie_data:
|
||||||
|
|||||||
Reference in New Issue
Block a user