automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: AUTO_MAA 配置分享中心上线

Browse Source
This commit is contained in:
DLmaster361
2025-07-19 21:38:38 +08:00
parent 8d6071f794
commit eb1fade6f5
8 changed files with 380 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/config.py
View File

@@ -597,7 +597,7 @@ class GeneralConfig(LQConfig):
super().__init__()
self.Script_Name = ConfigItem("Script", "Name", "")
self.Script_RootPath = ConfigItem("Script", "RootPath", ".", FolderValidator())
self.Script_RootPath = ConfigItem("Script", "RootPath", ".", FileValidator())
self.Script_ScriptPath = ConfigItem(
"Script", "ScriptPath", ".", FileValidator()
)

121
app/core/network.py
View File

@@ -31,6 +31,7 @@ import time
import requests
import truststore
from pathlib import Path
from typing import Dict
from .logger import logger
@@ -42,7 +43,14 @@ class NetworkThread(QThread):
timeout = 10
backoff_factor = 0.1
def __init__(self, mode: str, url: str, path: Path = None) -> None:
def __init__(
self,
mode: str,
url: str,
path: Path = None,
files: Dict = None,
data: Dict = None,
) -> None:
super().__init__()
self.setObjectName(
@@ -54,6 +62,8 @@ class NetworkThread(QThread):
self.mode = mode
self.url = url
self.path = path
self.files = files
self.data = data
from .config import Config
@@ -78,6 +88,8 @@ class NetworkThread(QThread):
self.get_json(self.url)
elif self.mode == "get_file":
self.get_file(self.url, self.path)
elif self.mode == "upload_file":
self.upload_file(self.url, self.files, self.data)
def get_json(self, url: str) -> None:
"""
@@ -102,7 +114,7 @@ class NetworkThread(QThread):
self.response_json = None
self.error_message = str(e)
logger.exception(
f"子线程 {self.objectName()} 网络请求失败：{e}",
f"子线程 {self.objectName()} 网络请求失败：{e}，第{_+1}次尝试",
module="网络请求子线程",
)
time.sleep(self.backoff_factor)
@@ -122,14 +134,15 @@ class NetworkThread(QThread):
response = None
try:
response = requests.get(url, timeout=10, proxies=self.proxies)
response = requests.get(url, timeout=self.timeout, proxies=self.proxies)
if response.status_code == 200:
with open(path, "wb") as file:
file.write(response.content)
self.status_code = response.status_code
self.error_message = None
else:
self.status_code = response.status_code
self.error_message = "下载失败"
self.error_message = f"下载失败，状态码: {response.status_code}"
except Exception as e:
self.status_code = response.status_code if response else None
@@ -140,6 +153,54 @@ class NetworkThread(QThread):
self.loop.quit()
def upload_file(self, url: str, files: Dict, data: Dict = None) -> None:
"""
通过POST方法上传文件
:param url: 请求的URL
:param files: 文件字典，格式为 {'file': ('filename', file_obj, 'content_type')}
:param data: 表单数据字典
"""
logger.info(f"子线程 {self.objectName()} 开始上传文件", module="网络请求子线程")
response = None
for _ in range(self.max_retries):
try:
response = requests.post(
url,
files=files,
data=data,
timeout=self.timeout,
proxies=self.proxies,
)
self.status_code = response.status_code
print(response.text)
# 尝试解析JSON响应
try:
self.response_json = response.json()
except ValueError:
# 如果不是JSON格式，保存文本内容
self.response_json = {"text": response.text}
self.error_message = None
break
except Exception as e:
self.status_code = response.status_code if response else None
self.response_json = None
self.error_message = str(e)
logger.exception(
f"子线程 {self.objectName()} 文件上传失败：{e}，第{_+1}次尝试",
module="网络请求子线程",
)
time.sleep(self.backoff_factor)
self.loop.quit()
class _Network(QObject):
"""网络请求线程管理类"""
@@ -149,19 +210,28 @@ class _Network(QObject):
self.task_queue = []
def add_task(self, mode: str, url: str, path: Path = None) -> NetworkThread:
def add_task(
self,
mode: str,
url: str,
path: Path = None,
files: Dict = None,
data: Dict = None,
) -> NetworkThread:
"""
添加网络请求任务
:param mode: 请求模式，支持 "get", "get_file"
:param mode: 请求模式，支持 "get", "get_file", "upload_file"
:param url: 请求的URL
:param path: 下载文件的保存路径，仅在 mode 为 "get_file" 时有效
:param files: 上传文件字典，仅在 mode 为 "upload_file" 时有效
:param data: 表单数据字典，仅在 mode 为 "upload_file" 时有效
:return: 返回创建的 NetworkThread 实例
"""
logger.info(f"添加网络请求任务: {mode} {url} {path}", module="网络请求")
network_thread = NetworkThread(mode, url, path)
network_thread = NetworkThread(mode, url, path, files, data)
self.task_queue.append(network_thread)
@@ -169,6 +239,43 @@ class _Network(QObject):
return network_thread
def upload_config_file(
self, file_path: Path, username: str = "", description: str = ""
) -> NetworkThread:
"""
上传配置文件到分享服务器
:param file_path: 要上传的文件路径
:param username: 用户名（可选）
:param description: 文件描述（必填）
:return: 返回创建的 NetworkThread 实例
"""
if not file_path.exists():
raise FileNotFoundError(f"文件不存在: {file_path}")
if not description:
raise ValueError("文件描述不能为空")
# 准备上传的文件
with open(file_path, "rb") as f:
files = {"file": (file_path.name, f.read(), "application/json")}
# 准备表单数据
data = {"description": description}
if username:
data["username"] = username
url = "http://221.236.27.82:10023/api/upload/share"
logger.info(
f"准备上传配置文件: {file_path.name}，用户: {username or '匿名'}，描述: {description}",
extra={"module": "网络请求"},
)
return self.add_task("upload_file", url, files=files, data=data)
def get_result(self, network_thread: NetworkThread) -> dict:
"""
获取网络请求结果