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 == "公招六星":