From fd8f602da2aaddae54c730d6ae040815f191f4fe Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Wed, 10 Sep 2025 23:07:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E6=88=90AUTO-MAS=E6=94=B9?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/__init__.py | 10 ++--- app/api/__init__.py | 10 ++--- app/api/core.py | 10 ++--- app/api/dispatch.py | 10 ++--- app/api/history.py | 10 ++--- app/api/info.py | 10 ++--- app/api/plan.py | 10 ++--- app/api/queue.py | 10 ++--- app/api/scripts.py | 10 ++--- app/api/setting.py | 10 ++--- app/api/update.py | 10 ++--- app/core/__init__.py | 10 ++--- app/core/broadcast.py | 10 ++--- app/core/config.py | 38 +++++++++---------- app/core/task_manager.py | 10 ++--- app/core/timer.py | 10 ++--- app/models/ConfigBase.py | 10 ++--- app/models/__init__.py | 10 ++--- app/models/schema.py | 10 ++--- app/services/__init__.py | 10 ++--- app/services/matomo.py | 10 ++--- app/services/notification.py | 30 +++++++-------- app/services/system.py | 24 ++++++------ app/services/update.py | 20 +++++----- app/task/MAA.py | 30 +++++++-------- app/task/__init__.py | 10 ++--- app/task/general.py | 22 +++++------ app/task/skland.py | 10 ++--- app/utils/ImageUtils.py | 10 ++--- app/utils/ProcessManager.py | 10 ++--- app/utils/__init__.py | 10 ++--- app/utils/constants.py | 10 ++--- app/utils/logger.py | 10 ++--- app/utils/security.py | 10 ++--- dev.md | 23 ----------- frontend/README.md | 2 +- frontend/electron/main.ts | 6 +-- frontend/electron/services/gitService.ts | 2 +- frontend/index.html | 2 +- frontend/package.json | 12 +++--- frontend/src/components/ScriptTable.vue | 2 +- .../components/initialization/AutoMode.vue | 2 +- .../components/initialization/ManualMode.vue | 4 +- frontend/src/views/ScriptEdit.vue | 4 +- frontend/src/views/Scripts.vue | 2 +- frontend/src/views/Settings.vue | 4 +- main.py | 14 +++---- pyproject.toml | 4 +- res/html/MAA_result.html | 10 ++--- res/html/MAA_statistics.html | 10 ++--- res/html/general_result.html | 10 ++--- res/html/general_statistics.html | 10 ++--- 52 files changed, 272 insertions(+), 295 deletions(-) delete mode 100644 dev.md diff --git a/app/__init__.py b/app/__init__.py index 29fe0ce..e051765 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/__init__.py b/app/api/__init__.py index 7b0eb8c..6d74dda 100644 --- a/app/api/__init__.py +++ b/app/api/__init__.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/core.py b/app/api/core.py index 803b5fd..402ff3a 100644 --- a/app/api/core.py +++ b/app/api/core.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/dispatch.py b/app/api/dispatch.py index 77160a8..756306f 100644 --- a/app/api/dispatch.py +++ b/app/api/dispatch.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/history.py b/app/api/history.py index a7e3bd7..eb7f61d 100644 --- a/app/api/history.py +++ b/app/api/history.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/info.py b/app/api/info.py index 0f91606..54476e3 100644 --- a/app/api/info.py +++ b/app/api/info.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/plan.py b/app/api/plan.py index d418a8c..95b7837 100644 --- a/app/api/plan.py +++ b/app/api/plan.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/queue.py b/app/api/queue.py index 8fb39de..626f50c 100644 --- a/app/api/queue.py +++ b/app/api/queue.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/scripts.py b/app/api/scripts.py index 82719e3..eaeb09f 100644 --- a/app/api/scripts.py +++ b/app/api/scripts.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/setting.py b/app/api/setting.py index 647df00..33a5210 100644 --- a/app/api/setting.py +++ b/app/api/setting.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/api/update.py b/app/api/update.py index e6e4754..4534456 100644 --- a/app/api/update.py +++ b/app/api/update.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/core/__init__.py b/app/core/__init__.py index f9b827c..adcd523 100644 --- a/app/core/__init__.py +++ b/app/core/__init__.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/core/broadcast.py b/app/core/broadcast.py index d145deb..703b9a9 100644 --- a/app/core/broadcast.py +++ b/app/core/broadcast.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/core/config.py b/app/core/config.py index 6569e9c..1b5894f 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com @@ -582,7 +582,7 @@ class AppConfig(GlobalConfig): logger.info("") logger.info("===================================") - logger.info("AUTO_MAA 后端应用程序") + logger.info("AUTO-MAS 后端应用程序") logger.info(f"版本号: {self.version()}") logger.info(f"工作目录: {Path.cwd()}") logger.info("===================================") @@ -1055,7 +1055,7 @@ class AppConfig(GlobalConfig): logger.success(f"{script_id} 配置导出成功") async def import_script_from_web(self, script_id: str, url: str): - """从「AUTO_MAA 配置分享中心」导入配置""" + """从「AUTO-MAS 配置分享中心」导入配置""" logger.info(f"从网络加载脚本配置: {script_id} - {url}") uid = uuid.UUID(script_id) @@ -1071,9 +1071,9 @@ class AppConfig(GlobalConfig): if response.status_code == 200: data = response.json() else: - logger.warning(f"无法从 AUTO_MAA 服务器获取配置内容: {response.text}") + logger.warning(f"无法从 AUTO-MAS 服务器获取配置内容: {response.text}") raise ConnectionError( - f"无法从 AUTO_MAA 服务器获取配置内容: {response.status_code}" + f"无法从 AUTO-MAS 服务器获取配置内容: {response.status_code}" ) await self.ScriptConfig[uid].load(data) @@ -1084,7 +1084,7 @@ class AppConfig(GlobalConfig): async def upload_script_to_web( self, script_id: str, config_name: str, author: str, description: str ): - """上传配置到「AUTO_MAA 配置分享中心」""" + """上传配置到「AUTO-MAS 配置分享中心」""" logger.info(f"上传配置到网络: {script_id} - {config_name} - {author}") @@ -1135,9 +1135,9 @@ class AppConfig(GlobalConfig): if response.status_code == 200: logger.success("配置上传成功") else: - logger.error(f"无法上传配置到 AUTO_MAA 服务器: {response.text}") + logger.error(f"无法上传配置到 AUTO-MAS 服务器: {response.text}") raise ConnectionError( - f"无法上传配置到 AUTO_MAA 服务器: {response.status_code} - {response.text}" + f"无法上传配置到 AUTO-MAS 服务器: {response.status_code} - {response.text}" ) async def get_user( @@ -1830,7 +1830,7 @@ class AppConfig(GlobalConfig): logger.info("一小时内已进行过一次检查, 直接使用缓存的公告信息") return False, local_notice.get("notice_dict", {}) - logger.info(f"开始从 AUTO_MAA 服务器获取公告信息") + logger.info(f"开始从 AUTO-MAS 服务器获取公告信息") try: response = requests.get( @@ -1841,10 +1841,10 @@ class AppConfig(GlobalConfig): if response.status_code == 200: remote_notice = response.json() else: - logger.warning(f"无法从 AUTO_MAA 服务器获取公告信息:{response.text}") + logger.warning(f"无法从 AUTO-MAS 服务器获取公告信息:{response.text}") remote_notice = None except Exception as e: - logger.warning(f"无法从 AUTO_MAA 服务器获取公告信息: {e}") + logger.warning(f"无法从 AUTO-MAS 服务器获取公告信息: {e}") remote_notice = None if remote_notice is None: @@ -1874,7 +1874,7 @@ class AppConfig(GlobalConfig): return self.get("Data", "IfShowNotice"), remote_notice.get("notice_dict", {}) async def get_web_config(self): - """获取「AUTO_MAA 配置分享中心」配置""" + """获取「AUTO-MAS 配置分享中心」配置""" local_web_config = json.loads(self.get("Data", "WebConfig")) if datetime.now() - timedelta(hours=1) < datetime.strptime( @@ -1883,7 +1883,7 @@ class AppConfig(GlobalConfig): logger.info("一小时内已进行过一次检查, 直接使用缓存的配置分享中心信息") return local_web_config - logger.info(f"开始从 AUTO_MAA 服务器获取配置分享中心信息") + logger.info(f"开始从 AUTO-MAS 服务器获取配置分享中心信息") try: response = requests.get( @@ -1895,11 +1895,11 @@ class AppConfig(GlobalConfig): remote_web_config = response.json() else: logger.warning( - f"无法从 AUTO_MAA 服务器获取配置分享中心信息:{response.text}" + f"无法从 AUTO-MAS 服务器获取配置分享中心信息:{response.text}" ) remote_web_config = None except Exception as e: - logger.warning(f"无法从 AUTO_MAA 服务器获取配置分享中心信息: {e}") + logger.warning(f"无法从 AUTO-MAS 服务器获取配置分享中心信息: {e}") remote_web_config = None if remote_web_config is None: diff --git a/app/core/task_manager.py b/app/core/task_manager.py index e69a560..3b6d81a 100644 --- a/app/core/task_manager.py +++ b/app/core/task_manager.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/core/timer.py b/app/core/timer.py index 3995f8c..975a7db 100644 --- a/app/core/timer.py +++ b/app/core/timer.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/models/ConfigBase.py b/app/models/ConfigBase.py index 2bd977b..d3770ed 100644 --- a/app/models/ConfigBase.py +++ b/app/models/ConfigBase.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/models/__init__.py b/app/models/__init__.py index 73060c4..9b7b7f6 100644 --- a/app/models/__init__.py +++ b/app/models/__init__.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/models/schema.py b/app/models/schema.py index d4f3d75..0c3543a 100644 --- a/app/models/schema.py +++ b/app/models/schema.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/services/__init__.py b/app/services/__init__.py index 33c156a..c846cac 100644 --- a/app/services/__init__.py +++ b/app/services/__init__.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/services/matomo.py b/app/services/matomo.py index 701f5b1..266c83c 100644 --- a/app/services/matomo.py +++ b/app/services/matomo.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/services/notification.py b/app/services/notification.py index eae77f3..146eb0d 100644 --- a/app/services/notification.py +++ b/app/services/notification.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com @@ -60,7 +60,7 @@ class Notification: notification.notify( title=title, message=message, - app_name="AUTO_MAA", + app_name="AUTO-MAS", app_icon=(Path.cwd() / "res/icons/AUTO-MAS.ico").as_posix(), timeout=t, ticker=ticker, @@ -111,12 +111,12 @@ class Notification: message = MIMEMultipart("alternative") message["From"] = formataddr( ( - Header("AUTO_MAA通知服务", "utf-8").encode(), + Header("AUTO-MAS通知服务", "utf-8").encode(), Config.get("Notify", "FromAddress"), ) ) # 发件人显示的名字 message["To"] = formataddr( - (Header("AUTO_MAA用户", "utf-8").encode(), to_address) + (Header("AUTO-MAS用户", "utf-8").encode(), to_address) ) # 收件人显示的名字 message["Subject"] = str(Header(title, "utf-8")) @@ -242,7 +242,7 @@ class Notification: # 发送系统通知 await self.push_plyer( "测试通知", - "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容, 说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！", + "这是 AUTO-MAS 外部通知测试信息。如果你看到了这段内容, 说明 AUTO-MAS 的通知功能已经正确配置且可以正常工作！", "测试通知", 3, ) @@ -251,24 +251,24 @@ class Notification: if Config.get("Notify", "IfSendMail"): await self.send_mail( "文本", - "AUTO_MAA测试通知", - "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容, 说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！", + "AUTO-MAS测试通知", + "这是 AUTO-MAS 外部通知测试信息。如果你看到了这段内容, 说明 AUTO-MAS 的通知功能已经正确配置且可以正常工作！", Config.get("Notify", "ToAddress"), ) # 发送Server酱通知 if Config.get("Notify", "IfServerChan"): await self.ServerChanPush( - "AUTO_MAA测试通知", - "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容, 说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！", + "AUTO-MAS测试通知", + "这是 AUTO-MAS 外部通知测试信息。如果你看到了这段内容, 说明 AUTO-MAS 的通知功能已经正确配置且可以正常工作！", Config.get("Notify", "ServerChanKey"), ) # 发送WebHook通知 if Config.get("Notify", "IfCompanyWebHookBot"): await self.WebHookPush( - "AUTO_MAA测试通知", - "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容, 说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！", + "AUTO-MAS测试通知", + "这是 AUTO-MAS 外部通知测试信息。如果你看到了这段内容, 说明 AUTO-MAS 的通知功能已经正确配置且可以正常工作！", Config.get("Notify", "CompanyWebHookBotUrl"), ) await self.CompanyWebHookBotPushImage( diff --git a/app/services/system.py b/app/services/system.py index 707c4d9..0826486 100644 --- a/app/services/system.py +++ b/app/services/system.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com @@ -72,8 +72,8 @@ class _SystemHandler: {current_time} {current_user} - AUTO_MAA自启动服务 - \\AUTO_MAA_AutoStart + AUTO-MAS自启动服务 + \\AUTO-MAS_AutoStart @@ -108,7 +108,7 @@ class _SystemHandler: - "{Path.cwd() / 'AUTO_MAA.exe'}" + "{Path.cwd() / 'AUTO-MAS.exe'}" """ @@ -126,7 +126,7 @@ class _SystemHandler: "schtasks", "/create", "/tn", - "AUTO_MAA_AutoStart", + "AUTO-MAS_AutoStart", "/xml", xml_file, "/f", @@ -139,7 +139,7 @@ class _SystemHandler: if result.returncode == 0: logger.success( - f"程序自启动任务计划已创建: {Path.cwd() / 'AUTO_MAA.exe'}" + f"程序自启动任务计划已创建: {Path.cwd() / 'AUTO-MAS.exe'}" ) else: logger.error(f"程序自启动任务计划创建失败: {result.stderr}") @@ -159,7 +159,7 @@ class _SystemHandler: try: result = subprocess.run( - ["schtasks", "/delete", "/tn", "AUTO_MAA_AutoStart", "/f"], + ["schtasks", "/delete", "/tn", "AUTO-MAS_AutoStart", "/f"], creationflags=subprocess.CREATE_NO_WINDOW, stdin=subprocess.DEVNULL, capture_output=True, @@ -267,7 +267,7 @@ class _SystemHandler: try: result = subprocess.run( - ["schtasks", "/query", "/tn", "AUTO_MAA_AutoStart"], + ["schtasks", "/query", "/tn", "AUTO-MAS_AutoStart"], creationflags=subprocess.CREATE_NO_WINDOW, stdin=subprocess.DEVNULL, capture_output=True, diff --git a/app/services/update.py b/app/services/update.py index 6526c37..e4d7b14 100644 --- a/app/services/update.py +++ b/app/services/update.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com @@ -52,7 +52,7 @@ class _UpdateHandler: logger.info("开始检查更新") response = requests.get( - f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMaaGui¤t_version={current_version}&cdk={Config.get('Update', 'MirrorChyanCDK')}&channel={Config.get('Update', 'UpdateType')}", + f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMasGui¤t_version={current_version}&cdk={Config.get('Update', 'MirrorChyanCDK')}&channel={Config.get('Update', 'UpdateType')}", timeout=10, proxies=Config.get_proxies(), ) @@ -151,13 +151,13 @@ class _UpdateHandler: if Config.get("Update", "Source") == "GitHub": - download_url = f"https://github.com/DLmaster361/AUTO_MAA/releases/download/{self.remote_version}/AUTO_MAA_{self.remote_version}.zip" + download_url = f"https://github.com/AUTO-MAS-Project/AUTO-MAS/releases/download/{self.remote_version}/AUTO-MAS_{self.remote_version}.zip" elif Config.get("Update", "Source") == "MirrorChyan": if self.mirror_chyan_download_url is None: logger.warning("MirrorChyan 未返回下载链接, 使用自建下载站") - download_url = f"https://download.auto-mas.top/d/AUTO_MAA/AUTO_MAA_{self.remote_version}.zip" + download_url = f"https://download.auto-mas.top/d/AUTO-MAS/AUTO-MAS_{self.remote_version}.zip" else: with requests.get( @@ -170,7 +170,7 @@ class _UpdateHandler: if response.status_code == 200: download_url = response.url elif Config.get("Update", "Source") == "AutoSite": - download_url = f"https://download.auto-mas.top/d/AUTO_MAA/AUTO_MAA_{self.remote_version}.zip" + download_url = f"https://download.auto-mas.top/d/AUTO-MAS/AUTO-MAS_{self.remote_version}.zip" else: await Config.send_json( @@ -357,7 +357,7 @@ class _UpdateHandler: logger.info("启动更新程序") self.is_locked = False subprocess.Popen( - [Path.cwd() / "AUTO_MAA-Setup.exe"], + [Path.cwd() / "AUTO-MAS-Setup.exe"], creationflags=subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS | subprocess.CREATE_NO_WINDOW, diff --git a/app/task/MAA.py b/app/task/MAA.py index 8f63cfe..96b603d 100644 --- a/app/task/MAA.py +++ b/app/task/MAA.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com @@ -1908,14 +1908,14 @@ class MaaManager: if Config.get("Notify", "IfServerChan"): await Notify.ServerChanPush( title, - f"{serverchan_message}\n\nAUTO_MAA 敬上", + f"{serverchan_message}\n\nAUTO-MAS 敬上", Config.get("Notify", "ServerChanKey"), ) if Config.get("Notify", "IfCompanyWebHookBot"): await Notify.WebHookPush( title, - f"{message_text}\n\nAUTO_MAA 敬上", + f"{message_text}\n\nAUTO-MAS 敬上", Config.get("Notify", "CompanyWebHookBotUrl"), ) @@ -1962,14 +1962,14 @@ class MaaManager: if Config.get("Notify", "IfServerChan"): await Notify.ServerChanPush( title, - f"{serverchan_message}\n\nAUTO_MAA 敬上", + f"{serverchan_message}\n\nAUTO-MAS 敬上", Config.get("Notify", "ServerChanKey"), ) if Config.get("Notify", "IfCompanyWebHookBot"): await Notify.WebHookPush( title, - f"{message_text}\n\nAUTO_MAA 敬上", + f"{message_text}\n\nAUTO-MAS 敬上", Config.get("Notify", "CompanyWebHookBotUrl"), ) @@ -1995,7 +1995,7 @@ class MaaManager: if self.cur_user_data.get("Notify", "ServerChanKey"): await Notify.ServerChanPush( title, - f"{serverchan_message}\n\nAUTO_MAA 敬上", + f"{serverchan_message}\n\nAUTO-MAS 敬上", self.cur_user_data.get("Notify", "ServerChanKey"), ) else: @@ -2008,7 +2008,7 @@ class MaaManager: if self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"): await Notify.WebHookPush( title, - f"{message_text}\n\nAUTO_MAA 敬上", + f"{message_text}\n\nAUTO-MAS 敬上", self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"), ) else: @@ -2034,14 +2034,14 @@ class MaaManager: if Config.get("Notify", "IfServerChan"): await Notify.ServerChanPush( title, - "好羡慕~\n\nAUTO_MAA 敬上", + "好羡慕~\n\nAUTO-MAS 敬上", Config.get("Notify", "ServerChanKey"), ) if Config.get("Notify", "IfCompanyWebHookBot"): await Notify.WebHookPush( title, - "好羡慕~\n\nAUTO_MAA 敬上", + "好羡慕~\n\nAUTO-MAS 敬上", Config.get("Notify", "CompanyWebHookBotUrl"), ) await Notify.CompanyWebHookBotPushImage( @@ -2072,7 +2072,7 @@ class MaaManager: if self.cur_user_data.get("Notify", "ServerChanKey"): await Notify.ServerChanPush( title, - "好羡慕~\n\nAUTO_MAA 敬上", + "好羡慕~\n\nAUTO-MAS 敬上", self.cur_user_data.get("Notify", "ServerChanKey"), ) else: @@ -2085,7 +2085,7 @@ class MaaManager: if self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"): await Notify.WebHookPush( title, - "好羡慕~\n\nAUTO_MAA 敬上", + "好羡慕~\n\nAUTO-MAS 敬上", self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"), ) await Notify.CompanyWebHookBotPushImage( diff --git a/app/task/__init__.py b/app/task/__init__.py index 9a347ca..62fcf15 100644 --- a/app/task/__init__.py +++ b/app/task/__init__.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/task/general.py b/app/task/general.py index 9010b93..599b184 100644 --- a/app/task/general.py +++ b/app/task/general.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com @@ -986,14 +986,14 @@ class GeneralManager: if Config.get("Notify", "IfServerChan"): await Notify.ServerChanPush( title, - f"{serverchan_message}\n\nAUTO_MAA 敬上", + f"{serverchan_message}\n\nAUTO-MAS 敬上", Config.get("Notify", "ServerChanKey"), ) if Config.get("Notify", "IfCompanyWebHookBot"): await Notify.WebHookPush( title, - f"{message_text}\n\nAUTO_MAA 敬上", + f"{message_text}\n\nAUTO-MAS 敬上", Config.get("Notify", "CompanyWebHookBotUrl"), ) @@ -1023,14 +1023,14 @@ class GeneralManager: if Config.get("Notify", "IfServerChan"): await Notify.ServerChanPush( title, - f"{serverchan_message}\n\nAUTO_MAA 敬上", + f"{serverchan_message}\n\nAUTO-MAS 敬上", Config.get("Notify", "ServerChanKey"), ) if Config.get("Notify", "IfCompanyWebHookBot"): await Notify.WebHookPush( title, - f"{message_text}\n\nAUTO_MAA 敬上", + f"{message_text}\n\nAUTO-MAS 敬上", Config.get("Notify", "CompanyWebHookBotUrl"), ) @@ -1056,7 +1056,7 @@ class GeneralManager: if self.cur_user_data.get("Notify", "ServerChanKey"): await Notify.ServerChanPush( title, - f"{serverchan_message}\n\nAUTO_MAA 敬上", + f"{serverchan_message}\n\nAUTO-MAS 敬上", self.cur_user_data.get("Notify", "ServerChanKey"), ) else: @@ -1069,7 +1069,7 @@ class GeneralManager: if self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"): await Notify.WebHookPush( title, - f"{message_text}\n\nAUTO_MAA 敬上", + f"{message_text}\n\nAUTO-MAS 敬上", self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"), ) else: diff --git a/app/task/skland.py b/app/task/skland.py index 18799c3..ded01fd 100644 --- a/app/task/skland.py +++ b/app/task/skland.py @@ -1,4 +1,4 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 ClozyA @@ -8,20 +8,20 @@ # skland-checkin-ghaction Copyright © 2023 Yanstory # https://github.com/Yanstory/skland-checkin-ghaction -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/utils/ImageUtils.py b/app/utils/ImageUtils.py index 7d49f14..f78ac3c 100644 --- a/app/utils/ImageUtils.py +++ b/app/utils/ImageUtils.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2025 ClozyA -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/utils/ProcessManager.py b/app/utils/ProcessManager.py index 07eff3e..8c3c64f 100644 --- a/app/utils/ProcessManager.py +++ b/app/utils/ProcessManager.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/utils/__init__.py b/app/utils/__init__.py index c471269..c86f947 100644 --- a/app/utils/__init__.py +++ b/app/utils/__init__.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/utils/constants.py b/app/utils/constants.py index 0be6d3e..2877126 100644 --- a/app/utils/constants.py +++ b/app/utils/constants.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 ClozyA -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/utils/logger.py b/app/utils/logger.py index bd541f8..eb6c1af 100644 --- a/app/utils/logger.py +++ b/app/utils/logger.py @@ -1,21 +1,21 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 # Copyright © 2025 MoeSnowyFox -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/app/utils/security.py b/app/utils/security.py index 6dad28a..868396c 100644 --- a/app/utils/security.py +++ b/app/utils/security.py @@ -1,20 +1,20 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# AUTO-MAS: A Multi-Script, Multi-Config Management and Automation Software # Copyright © 2024-2025 DLmaster361 -# This file is part of AUTO_MAA. +# This file is part of AUTO-MAS. -# AUTO_MAA is free software: you can redistribute it and/or modify +# AUTO-MAS is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. -# AUTO_MAA is distributed in the hope that it will be useful, +# AUTO-MAS is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See # the GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . +# along with AUTO-MAS. If not, see . # Contact: DLmaster_361@163.com diff --git a/dev.md b/dev.md deleted file mode 100644 index 24348f2..0000000 --- a/dev.md +++ /dev/null @@ -1,23 +0,0 @@ - -## 创建环境 -```bash -uv venv -``` - -## 安装依赖 -```bash -uv pip install -e . -``` - - -## 添加依赖 -```bash -uv add -``` - -## 删除依赖 -```bash -uv remove -``` - -> 💡 推荐使用uv作为默认包管理器, 支持现代Python项目管理特性 \ No newline at end of file diff --git a/frontend/README.md b/frontend/README.md index 3a23eaa..b0c106c 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -1,4 +1,4 @@ -# AUTO_MAA Frontend +# AUTO-MAS Frontend 基于 Vue 3 + TypeScript + Ant Design Vue + Electron 的桌面应用程序。 diff --git a/frontend/electron/main.ts b/frontend/electron/main.ts index 4af05d3..95298ad 100644 --- a/frontend/electron/main.ts +++ b/frontend/electron/main.ts @@ -203,7 +203,7 @@ function createTray() { ]) tray.setContextMenu(contextMenu) - tray.setToolTip('AUTO_MAA') + tray.setToolTip('AUTO-MAS') // 双击托盘图标显示/隐藏窗口 tray.on('double-click', () => { @@ -545,7 +545,7 @@ ipcMain.handle('download-git', async () => { ipcMain.handle( 'clone-backend', - async (_event, repoUrl = 'https://github.com/DLmaster361/AUTO_MAA.git') => { + async (_event, repoUrl = 'https://github.com/AUTO-MAS-Project/AUTO-MAS.git') => { const appRoot = getAppRoot() return cloneBackend(appRoot, repoUrl) } @@ -553,7 +553,7 @@ ipcMain.handle( ipcMain.handle( 'update-backend', - async (_event, repoUrl = 'https://github.com/DLmaster361/AUTO_MAA.git') => { + async (_event, repoUrl = 'https://github.com/AUTO-MAS-Project/AUTO-MAS.git') => { const appRoot = getAppRoot() return cloneBackend(appRoot, repoUrl) // 使用相同的逻辑，会自动判断是pull还是clone } diff --git a/frontend/electron/services/gitService.ts b/frontend/electron/services/gitService.ts index 5de7f92..92d84fb 100644 --- a/frontend/electron/services/gitService.ts +++ b/frontend/electron/services/gitService.ts @@ -187,7 +187,7 @@ export async function downloadGit(appRoot: string): Promise<{ success: boolean; // 克隆后端代码（替换原有核心逻辑） export async function cloneBackend( appRoot: string, - repoUrl = 'https://github.com/DLmaster361/AUTO_MAA.git' + repoUrl = 'https://github.com/AUTO-MAS-Project/AUTO-MAS.git' ): Promise<{ success: boolean error?: string diff --git a/frontend/index.html b/frontend/index.html index 00c20b5..be451df 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,7 +4,7 @@ - AUTO_MAA + AUTO-MAS
diff --git a/frontend/package.json b/frontend/package.json index 10bf396..1476357 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,8 +18,8 @@ "extraMetadata": { "env": "prod" }, - "appId": "xyz.automaa.frontend", - "productName": "AUTO_MAA", + "appId": "top.auto-mas.frontend", + "productName": "AUTO-MAS", "files": [ "dist/**", "dist-electron/**", @@ -30,8 +30,8 @@ "publish": [ { "provider": "github", - "owner": "DLmaster_361", - "repo": "AUTO_MAA" + "owner": "AUTO-MAS-Project", + "repo": "AUTO-MAS" } ], "extraResources": [ @@ -44,14 +44,14 @@ { "target": "zip", "arch": ["x64"] } ], "icon": "public/AUTO-MAS.ico", - "artifactName": "AUTO_MAA-Setup-${version}-${arch}.${ext}" + "artifactName": "AUTO-MAS-Setup-${version}-${arch}.${ext}" }, "nsis": { "oneClick": false, "perMachine": true, "allowToChangeInstallationDirectory": true, "createDesktopShortcut": true, - "shortcutName": "AUTO_MAA", + "shortcutName": "AUTO-MAS", "differentialPackage": true } }, diff --git a/frontend/src/components/ScriptTable.vue b/frontend/src/components/ScriptTable.vue index 17c383c..7ddb8d7 100644 --- a/frontend/src/components/ScriptTable.vue +++ b/frontend/src/components/ScriptTable.vue @@ -22,7 +22,7 @@ alt="MAA" class="script-logo" /> - +

{{ script.name }}

diff --git a/frontend/src/components/initialization/AutoMode.vue b/frontend/src/components/initialization/AutoMode.vue index 9804fd1..9d03d2c 100644 --- a/frontend/src/components/initialization/AutoMode.vue +++ b/frontend/src/components/initialization/AutoMode.vue @@ -2,7 +2,7 @@
- AUTO_MAA + AUTO-MAS
检测到环境已配置，正在启动后端~~ diff --git a/frontend/src/components/initialization/ManualMode.vue b/frontend/src/components/initialization/ManualMode.vue index c3ec953..876feaa 100644 --- a/frontend/src/components/initialization/ManualMode.vue +++ b/frontend/src/components/initialization/ManualMode.vue @@ -1,9 +1,9 @@