From 273fbe22619e6d8b0db786f116c31574b7e283bf Mon Sep 17 00:00:00 2001 From: aoxuan Date: Wed, 26 Mar 2025 14:26:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(MAA):=20=E4=BF=AE=E5=A4=8D`=E6=8A=80?= =?UTF-8?q?=E5=B7=A7=E6=A6=82=E8=A6=81=C2=B7=E5=8D=B71`=E7=AD=89=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E4=B9=A6=E4=B8=8D=E8=83=BD=E8=A2=AB=E6=8E=89=E8=90=BD?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=AD=A3=E7=A1=AE=E7=BB=9F=E8=AE=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 2 +- app/models/MAA.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index 30f8417..20b58c3 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -529,7 +529,7 @@ class AppConfig: if current_stage: item_match: List[str] = re.findall( - r"^(?!\[)([\u4e00-\u9fa5A-Za-z0-9\-]+)\s*:\s*([\d,]+)(?:\s*\(\+[\d,]+\))?", + r"^(?!\[)([\u4e00-\u9fa5A-Za-z0-9·\-]+)\s*:\s*([\d,]+)(?:\s*\(\+[\d,]+\))?", line, re.M, ) diff --git a/app/models/MAA.py b/app/models/MAA.py index a050645..2d1fc31 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -1305,8 +1305,8 @@ class MaaManager(QObject): Notify.send_mail("网页", title, message_html) # ServerChan的换行是两个换行符。故而将\n替换为\n\n - severchan_message = message_text.replace("\n", "\n\n") - Notify.ServerChanPush(title, f"{severchan_message}\n\nAUTO_MAA 敬上") + serverchan_message = message_text.replace("\n", "\n\n") + Notify.ServerChanPush(title, f"{serverchan_message}\n\nAUTO_MAA 敬上") Notify.CompanyWebHookBotPush(title, f"{message_text}\n\nAUTO_MAA 敬上") elif mode == "公招六星":