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

Merge branch 'dev' of github.com:DLmaster361/AUTO_MAA into dev

Browse Source
This commit is contained in:
DLmaster361
2025-05-18 13:54:19 +08:00
parent 34ac0c5ab3 c0f887ff9d
commit 04079dd57b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/MAA.py
View File

@@ -122,6 +122,7 @@ class MaaManager(QObject):
def run(self): def run(self):
"""主进程，运行MAA代理进程""" """主进程，运行MAA代理进程"""
current_date = datetime.now().strftime("%m-%d")
curdate = Config.server_date().strftime("%Y-%m-%d") curdate = Config.server_date().strftime("%Y-%m-%d")
begin_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") begin_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -654,7 +655,6 @@ class MaaManager(QObject):
if (run_book["Annihilation"] and run_book["Routine"]) if (run_book["Annihilation"] and run_book["Routine"])
else "代理任务未全部完成" else "代理任务未全部完成"
) )
current_date = datetime.now().strftime("%m-%d")
self.push_notification( self.push_notification(
"统计信息", "统计信息",
f"{current_date} | 用户 {user[0]} 的自动代理统计报告", f"{current_date} | 用户 {user[0]} 的自动代理统计报告",
@@ -830,9 +830,9 @@ class MaaManager(QObject):
# 保存运行日志 # 保存运行日志
title = ( title = (
f"{self.set["MaaSet"]["Name"]}的{self.mode[:4]}任务报告" f"{current_date} | {self.set["MaaSet"]["Name"]}的{self.mode[:4]}任务报告"
if self.set["MaaSet"]["Name"] != "" if self.set["MaaSet"]["Name"] != ""
else f"{self.mode[:4]}任务报告" else f"{current_date} | {self.mode[:4]}任务报告"
) )
result = { result = {
"title": f"{self.mode[:4]}任务报告", "title": f"{self.mode[:4]}任务报告",