创建全新模块化架构

.github/workflows/python-app.yml

@@ -22,7 +22,7 @@ name: Build AUTO_MAA
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "Dev" ]
     paths-ignore:
       - '**.md'
       - 'LICENSE'
@@ -72,6 +72,7 @@ jobs:
       - name: Built with pyinstaller
         id: built_with_pyinstaller
         run: |
+          copy app\utils\package.py .\
           python package.py
       - name: Read version
         id: read_version
@@ -83,12 +84,12 @@ jobs:
       - name: Create Zip
         id: create_zip
         run: |
-          move gui\ico\AUTO_MAA_Updater.ico .\
-          Compress-Archive -Path gui,res,AUTO_MAA.py,Updater.py,package.py,dist/AUTO_MAA.exe,requirements.txt,README.md,LICENSE -DestinationPath AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
-          del gui\ui\main.ui
-          del gui\ico\AUTO_MAA.ico
-          move AUTO_MAA_Updater.ico gui\ico
-          Compress-Archive -Path gui,dist/Updater.exe -DestinationPath Updater_${{ env.updater_version }}.zip
+          move resources\icons\AUTO_MAA_Updater.ico .\
+          Compress-Archive -Path app,resources,main.py,AUTO_MAA.exe,requirements.txt,README.md,LICENSE -DestinationPath AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
+          del resources\gui\main.ui
+          del resources\icons\AUTO_MAA.ico
+          move AUTO_MAA_Updater.ico resources\icons
+          Compress-Archive -Path Updater.exe -DestinationPath Updater_${{ env.updater_version }}.zip
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:

README.md

@@ -2,7 +2,7 @@
 
 MAA多账号管理与自动化软件
 
-!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/AUTO_MAA.png "软件图标")
+!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/AUTO_MAA.png "软件图标")
 
 ---
 
@@ -119,7 +119,7 @@ MAA多账号管理与自动化软件
   - 配置自己模拟器所在的位置并根据实际情况填写`等待模拟器启动时间`（建议预留10s以防意外）。
   - 如果是模拟器多开用户，还需要填写`附加命令`，具体填写值参见多开模拟器对应快捷方式路径（如`-v 1`）。
 
-![MAA配置](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/MAA配置.png "MAA配置")
+![MAA配置](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/README/MAA配置.png "MAA配置")
 
 #### 设置AUTO_MAA
 
@@ -165,7 +165,7 @@ MAA多账号管理与自动化软件
   - 程序会读取`data/gameid.txt`中的数据，依据此进行关卡号的替换，便于常用关卡的使用。
   - `gameid.txt`会在程序首次运行时生成，其中将预置一些常用资源本的替换方案。
 
-![gameid](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/gameid.png "gameid")
+![gameid](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/README/gameid.png "gameid")
 
 ## 运行代理任务
 
@@ -231,4 +231,4 @@ MAA多账号管理与自动化软件
 
 如果喜欢这个项目的话，给作者来杯咖啡吧！
 
-![payid](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/payid.png "payid")
+![payid](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/README/payid.png "payid")

app/__init__.py

@@ -0,0 +1,46 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA主程序包
+v4.2
+作者：DLmaster_361
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .config import AppConfig
+from .models import MaaManager
+from .services import Notification, CryptoHandler
+from .ui import AUTO_MAA
+from .utils import Updater, version_text
+
+__all__ = [
+    "AppConfig",
+    "MaaManager",
+    "Notification",
+    "CryptoHandler",
+    "AUTO_MAA",
+    "Updater",
+    "version_text",
+]

app/config.py

@@ -0,0 +1,248 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA配置管理
+v4.2
+作者：DLmaster_361
+"""
+
+import sqlite3
+import json
+import os
+import sys
+from typing import Dict, Union
+
+
+class AppConfig:
+
+    def __init__(self) -> None:
+
+        self.app_path = os.path.normpath(
+            os.path.dirname(os.path.realpath(sys.argv[0]))
+        )  # 获取软件自身的路径
+        self.app_path_sys = os.path.realpath(sys.argv[0])  # 获取软件自身的路径
+        self.app_name = os.path.basename(self.app_path)  # 获取软件自身的名称
+
+        self.database_path = os.path.normpath(f"{self.app_path}/data/data.db")
+        self.config_path = os.path.normpath(f"{self.app_path}/config/gui.json")
+        self.key_path = os.path.normpath(f"{self.app_path}/data/key")
+        self.gameid_path = os.path.normpath(f"{self.app_path}/data/gameid.txt")
+        self.version_path = os.path.normpath(f"{self.app_path}/resources/version.json")
+
+        # 检查文件完整性
+        self.initialize()
+        self.check_config()
+        self.check_database()
+
+    def initialize(self) -> None:
+        """初始化程序的配置文件"""
+
+        # 检查目录
+        os.makedirs(os.path.normpath(f"{self.app_path}/data"), exist_ok=True)
+        os.makedirs(os.path.normpath(f"{self.app_path}/config"), exist_ok=True)
+        os.makedirs(
+            os.path.normpath(f"{self.app_path}/data/MAAconfig/simple"), exist_ok=True
+        )
+        os.makedirs(
+            os.path.normpath(f"{self.app_path}/data/MAAconfig/beta"), exist_ok=True
+        )
+        os.makedirs(
+            os.path.normpath(f"{self.app_path}/data/MAAconfig/Default"), exist_ok=True
+        )
+
+        # 生成版本信息文件
+        if not os.path.exists(self.version_path):
+            version = {
+                "main_version": "0.0.0.0",
+                "updater_version": "0.0.0.0",
+            }
+            with open(self.version_path, "w", encoding="utf-8") as f:
+                json.dump(version, f, indent=4)
+
+        # 生成配置文件
+        if not os.path.exists(self.config_path):
+            config = {"Default": {}}
+            with open(self.config_path, "w", encoding="utf-8") as f:
+                json.dump(config, f, indent=4)
+
+        # 生成预设gameid替换方案文件
+        if not os.path.exists(self.gameid_path):
+            with open(self.gameid_path, "w", encoding="utf-8") as f:
+                print(
+                    "龙门币：CE-6\n技能：CA-5\n红票：AP-5\n经验：LS-6\n剿灭模式：Annihilation",
+                    file=f,
+                )
+
+    def check_config(self) -> None:
+        """检查配置文件字段完整性并补全"""
+
+        config_list = [
+            ["TimeSet.set1", "False"],
+            ["TimeSet.run1", "00:00"],
+            ["TimeSet.set2", "False"],
+            ["TimeSet.run2", "00:00"],
+            ["TimeSet.set3", "False"],
+            ["TimeSet.run3", "00:00"],
+            ["TimeSet.set4", "False"],
+            ["TimeSet.run4", "00:00"],
+            ["TimeSet.set5", "False"],
+            ["TimeSet.run5", "00:00"],
+            ["TimeSet.set6", "False"],
+            ["TimeSet.run6", "00:00"],
+            ["TimeSet.set7", "False"],
+            ["TimeSet.run7", "00:00"],
+            ["TimeSet.set8", "False"],
+            ["TimeSet.run8", "00:00"],
+            ["TimeSet.set9", "False"],
+            ["TimeSet.run9", "00:00"],
+            ["TimeSet.set10", "False"],
+            ["TimeSet.run10", "00:00"],
+            ["MaaSet.path", ""],
+            ["TimeLimit.routine", 10],
+            ["TimeLimit.annihilation", 40],
+            ["TimesLimit.run", 3],
+            ["SelfSet.IfSelfStart", "False"],
+            ["SelfSet.IfSleep", "False"],
+            ["SelfSet.IfProxyDirectly", "False"],
+            ["SelfSet.IfSendMail", "False"],
+            ["SelfSet.MailAddress", ""],
+            ["SelfSet.IfSendMail.OnlyError", "False"],
+            ["SelfSet.IfSilence", "False"],
+            ["SelfSet.BossKey", ""],
+            ["SelfSet.IfToTray", "False"],
+            ["SelfSet.UIsize", "1200x700"],
+            ["SelfSet.UIlocation", "100x100"],
+            ["SelfSet.UImaximized", "False"],
+            ["SelfSet.MainIndex", 2],
+        ]
+
+        # 导入配置文件
+        with open(self.config_path, "r", encoding="utf-8") as f:
+            config = json.load(f)
+
+        # 检查并补充缺失的字段
+        for i in range(len(config_list)):
+            if not config_list[i][0] in config["Default"]:
+                config["Default"][config_list[i][0]] = config_list[i][1]
+
+        # 初始化配置信息
+        self.content: Dict[str, Dict[str, Union[str, int]]] = config
+
+        # 导出配置文件
+        self.save_config()
+
+    def check_database(self) -> None:
+        """检查用户数据库文件并处理数据库版本更新"""
+
+        # 生成用户数据库
+        if not os.path.exists(self.database_path):
+            db = sqlite3.connect(self.database_path)
+            cur = db.cursor()
+            cur.execute(
+                "CREATE TABLE adminx(admin text,id text,server text,day int,status text,last date,game text,game_1 text,game_2 text,routine text,annihilation text,infrastructure text,password byte,notes text,numb int,mode text,uid int)"
+            )
+            cur.execute("CREATE TABLE version(v text)")
+            cur.execute("INSERT INTO version VALUES(?)", ("v1.3",))
+            db.commit()
+            cur.close()
+            db.close()
+
+        # 数据库版本更新
+        db = sqlite3.connect(self.database_path)
+        cur = db.cursor()
+        cur.execute("SELECT * FROM version WHERE True")
+        version = cur.fetchall()
+        # v1.0-->v1.1
+        if version[0][0] == "v1.0":
+            cur.execute("SELECT * FROM adminx WHERE True")
+            data = cur.fetchall()
+            cur.execute("DROP TABLE IF EXISTS adminx")
+            cur.execute(
+                "CREATE TABLE adminx(admin text,id text,server text,day int,status text,last date,game text,game_1 text,game_2 text,routines text,annihilation text,infrastructure text,password byte,notes text,numb int,mode text,uid int)"
+            )
+            for i in range(len(data)):
+                cur.execute(
+                    "INSERT INTO adminx VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                    (
+                        data[i][0],  # 0 0 0
+                        data[i][1],  # 1 1 -
+                        "Official",  # 2 2 -
+                        data[i][2],  # 3 3 1
+                        data[i][3],  # 4 4 2
+                        data[i][4],  # 5 5 3
+                        data[i][5],  # 6 6 -
+                        data[i][6],  # 7 7 -
+                        data[i][7],  # 8 8 -
+                        "y",  # 9 - 4
+                        data[i][8],  # 10 9 5
+                        data[i][9],  # 11 10 -
+                        data[i][10],  # 12 11 6
+                        data[i][11],  # 13 12 7
+                        data[i][12],  # 14 - -
+                        "simple",  # 15 - -
+                        data[i][13],  # 16 - -
+                    ),
+                )
+            cur.execute("DELETE FROM version WHERE v = ?", ("v1.0",))
+            cur.execute("INSERT INTO version VALUES(?)", ("v1.1",))
+            db.commit()
+        # v1.1-->v1.2
+        if version[0][0] == "v1.1":
+            cur.execute("SELECT * FROM adminx WHERE True")
+            data = cur.fetchall()
+            for i in range(len(data)):
+                cur.execute(
+                    "UPDATE adminx SET infrastructure = 'n' WHERE mode = ? AND uid = ?",
+                    (
+                        data[i][15],
+                        data[i][16],
+                    ),
+                )
+            cur.execute("DELETE FROM version WHERE v = ?", ("v1.1",))
+            cur.execute("INSERT INTO version VALUES(?)", ("v1.2",))
+            db.commit()
+        # v1.2-->v1.3
+        if version[0][0] == "v1.2":
+            cur.execute("ALTER TABLE adminx RENAME COLUMN routines TO routine")
+            cur.execute("DELETE FROM version WHERE v = ?", ("v1.2",))
+            cur.execute("INSERT INTO version VALUES(?)", ("v1.3",))
+            db.commit()
+        cur.close()
+        db.close()
+
+    def open_database(self) -> None:
+        """打开数据库"""
+
+        self.db = sqlite3.connect(self.database_path)
+        self.cur = self.db.cursor()
+
+    def close_database(self) -> None:
+        """关闭数据库"""
+
+        self.cur.close()
+        self.db.close()
+
+    def save_config(self) -> None:
+        """保存配置文件"""
+
+        with open(self.config_path, "w", encoding="utf-8") as f:
+            json.dump(self.content, f, indent=4)

app/models/__init__.py

@@ -0,0 +1,34 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA模组包
+v4.2
+作者：DLmaster_361
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .MAA import MaaManager
+
+__all__ = ["MaaManager"]

app/services/__init__.py

@@ -0,0 +1,35 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA服务包
+v4.2
+作者：DLmaster_361
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .notification import Notification
+from .security import CryptoHandler
+
+__all__ = ["Notification", "CryptoHandler"]

app/services/notification.py

@@ -0,0 +1,97 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA通知服务
+v4.2
+作者：DLmaster_361
+"""
+
+from plyer import notification
+import smtplib
+from email.mime.text import MIMEText
+from email.header import Header
+from email.utils import formataddr
+import os
+
+from app import AppConfig
+
+
+class Notification:
+
+    def __init__(self, config: AppConfig):
+
+        self.config = config
+
+    def push_notification(self, title, message, ticker, t):
+        """推送系统通知"""
+
+        notification.notify(
+            title=title,
+            message=message,
+            app_name="AUTO_MAA",
+            app_icon=os.path.normpath(
+                f"{self.config.app_path}/resources/icons/AUTO_MAA.ico"
+            ),
+            timeout=t,
+            ticker=ticker,
+            toast=True,
+        )
+
+        return True
+
+    def send_mail(self, title, content):
+        """使用官方专用邮箱推送邮件通知"""
+
+        # 声明：此邮箱为AUTO_MAA项目组资产，未经授权不得私自使用
+        # 注意：此声明注释只有使用者更换发信邮箱时才能删除，本条规则优先级高于GPLv3
+
+        # 第三方 SMTP 服务配置
+        mail_host = "smtp.163.com"  # 设置服务器
+        mail_sender = "AUTO_MAA_server@163.com"  # 用户名
+        mail_key = "SYrq87nDLD4RNB5T"  # 授权码 24/11/15
+
+        # 定义邮件正文
+        message = MIMEText(content, "plain", "utf-8")
+        message["From"] = formataddr(
+            (Header("AUTO_MAA通知服务", "utf-8").encode(), "AUTO_MAA_server@163.com")
+        )  # 发件人显示的名字
+        message["To"] = formataddr(
+            (
+                Header("AUTO_MAA用户", "utf-8").encode(),
+                self.config.content["Default"]["SelfSet.MailAddress"],
+            )
+        )  # 收件人显示的名字
+        message["Subject"] = Header(title, "utf-8")
+
+        try:
+            smtpObj = smtplib.SMTP_SSL(mail_host, 465)  # 465为SMTP_SSL默认端口
+            smtpObj.login(mail_sender, mail_key)
+            smtpObj.sendmail(
+                mail_sender,
+                self.config.content["Default"]["SelfSet.MailAddress"],
+                message.as_string(),
+            )
+            return True
+        except smtplib.SMTPException as e:
+            return f"发送邮件时出错：\n{e}"
+        finally:
+            smtpObj.quit()

app/services/security.py

@@ -0,0 +1,183 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA主程序
+v4.2
+作者：DLmaster_361
+"""
+
+import os
+import hashlib
+import random
+import secrets
+from Crypto.Cipher import AES
+from Crypto.PublicKey import RSA
+from Crypto.Cipher import PKCS1_OAEP
+from Crypto.Util.Padding import pad, unpad
+
+from app import AppConfig
+
+
+class CryptoHandler:
+
+    def __init__(self, config: AppConfig):
+
+        self.config = config
+
+    def get_PASSWORD(self, PASSWORD: str) -> None:
+        """配置管理密钥"""
+
+        # 生成目录
+        os.makedirs(os.path.normpath(f"{self.config.app_path}/data/key"), exist_ok=True)
+
+        # 生成RSA密钥对
+        key = RSA.generate(2048)
+        public_key_local = key.publickey()
+        private_key = key
+        # 保存RSA公钥
+        with open(
+            os.path.normpath(f"{self.config.app_path}/data/key/public_key.pem"), "wb"
+        ) as f:
+            f.write(public_key_local.exportKey())
+        # 生成密钥转换与校验随机盐
+        PASSWORD_salt = secrets.token_hex(random.randint(32, 1024))
+        with open(
+            os.path.normpath(f"{self.config.app_path}/data/key/PASSWORDsalt.txt"),
+            "w",
+            encoding="utf-8",
+        ) as f:
+            print(PASSWORD_salt, file=f)
+        verify_salt = secrets.token_hex(random.randint(32, 1024))
+        with open(
+            os.path.normpath(f"{self.config.app_path}/data/key/verifysalt.txt"),
+            "w",
+            encoding="utf-8",
+        ) as f:
+            print(verify_salt, file=f)
+        # 将管理密钥转化为AES-256密钥
+        AES_password = hashlib.sha256(
+            (PASSWORD + PASSWORD_salt).encode("utf-8")
+        ).digest()
+        # 生成AES-256密钥校验哈希值并保存
+        AES_password_verify = hashlib.sha256(
+            AES_password + verify_salt.encode("utf-8")
+        ).digest()
+        with open(
+            os.path.normpath(
+                f"{self.config.app_path}/data/key/AES_password_verify.bin"
+            ),
+            "wb",
+        ) as f:
+            f.write(AES_password_verify)
+        # AES-256加密RSA私钥并保存密文
+        AES_key = AES.new(AES_password, AES.MODE_ECB)
+        private_key_local = AES_key.encrypt(pad(private_key.exportKey(), 32))
+        with open(
+            os.path.normpath(f"{self.config.app_path}/data/key/private_key.bin"), "wb"
+        ) as f:
+            f.write(private_key_local)
+
+    def encryptx(self, note: str) -> bytes:
+        """加密数据"""
+
+        # 读取RSA公钥
+        with open(
+            os.path.normpath(f"{self.config.app_path}/data/key/public_key.pem"), "rb"
+        ) as f:
+            public_key_local = RSA.import_key(f.read())
+        # 使用RSA公钥对数据进行加密
+        cipher = PKCS1_OAEP.new(public_key_local)
+        encrypted = cipher.encrypt(note.encode("utf-8"))
+        return encrypted
+
+    def decryptx(self, note: bytes, PASSWORD: str) -> str:
+        """解密数据"""
+
+        # 读入RSA私钥密文、盐与校验哈希值
+        with open(
+            os.path.normpath(f"{self.config.app_path}/data/key/private_key.bin"), "rb"
+        ) as f:
+            private_key_local = f.read().strip()
+        with open(
+            os.path.normpath(f"{self.config.app_path}/data/key/PASSWORDsalt.txt"),
+            "r",
+            encoding="utf-8",
+        ) as f:
+            PASSWORD_salt = f.read().strip()
+        with open(
+            os.path.normpath(f"{self.config.app_path}/data/key/verifysalt.txt"),
+            "r",
+            encoding="utf-8",
+        ) as f:
+            verify_salt = f.read().strip()
+        with open(
+            os.path.normpath(
+                f"{self.config.app_path}/data/key/AES_password_verify.bin"
+            ),
+            "rb",
+        ) as f:
+            AES_password_verify = f.read().strip()
+        # 将管理密钥转化为AES-256密钥并验证
+        AES_password = hashlib.sha256(
+            (PASSWORD + PASSWORD_salt).encode("utf-8")
+        ).digest()
+        AES_password_SHA = hashlib.sha256(
+            AES_password + verify_salt.encode("utf-8")
+        ).digest()
+        if AES_password_SHA != AES_password_verify:
+            return "管理密钥错误"
+        else:
+            # AES解密RSA私钥
+            AES_key = AES.new(AES_password, AES.MODE_ECB)
+            private_key_pem = unpad(AES_key.decrypt(private_key_local), 32)
+            private_key = RSA.import_key(private_key_pem)
+            # 使用RSA私钥解密数据
+            decrypter = PKCS1_OAEP.new(private_key)
+            note = decrypter.decrypt(note)
+            return note.decode("utf-8")
+
+    def change_PASSWORD(self, data: list, PASSWORD_old: str, PASSWORD_new: str) -> None:
+        """修改管理密钥"""
+
+        # 使用旧管理密钥解密
+        new_data = []
+        for i in range(len(data)):
+            new_data.append(self.decryptx(data[i][12], PASSWORD_old))
+        # 使用新管理密钥重新加密
+        self.get_PASSWORD(PASSWORD_new)
+        for i in range(len(data)):
+            self.config.cur.execute(
+                "UPDATE adminx SET password = ? WHERE mode = ? AND uid = ?",
+                (
+                    self.encryptx(new_data[i]),
+                    data[i][15],
+                    data[i][16],
+                ),
+            )
+            self.config.db.commit(),
+            new_data[i] = None
+        del new_data
+
+    def check_PASSWORD(self, PASSWORD: str) -> bool:
+        """验证管理密钥"""
+
+        return bool(self.decryptx(self.encryptx(""), PASSWORD) != "管理密钥错误")

app/ui/__init__.py

@@ -0,0 +1,34 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA图形化界面包
+v4.2
+作者：DLmaster_361
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .gui import AUTO_MAA
+
+__all__ = ["AUTO_MAA"]

app/utils/Updater.py

@@ -43,7 +43,7 @@ from PySide6.QtWidgets import (
 from PySide6.QtGui import QIcon
 from PySide6.QtCore import QObject, QThread, Signal
 
-from package import version_text
+from .version import version_text
 
 
 class UpdateProcess(QThread):
@@ -52,7 +52,9 @@ class UpdateProcess(QThread):
     progress = Signal(int, int, int)
     accomplish = Signal()
 
-    def __init__(self, app_path, name, main_version, updater_version):
+    def __init__(
+        self, app_path: str, name: str, main_version: list, updater_version: list
+    ) -> None:
         super(UpdateProcess, self).__init__()
 
         self.app_path = app_path
@@ -62,9 +64,9 @@ class UpdateProcess(QThread):
         self.download_path = os.path.normpath(
             f"{app_path}/AUTO_MAA_Update.zip"
         )  #  临时下载文件的路径
-        self.version_path = os.path.normpath(f"{app_path}/res/version.json")
+        self.version_path = os.path.normpath(f"{app_path}/resources/version.json")
 
-    def run(self):
+    def run(self) -> None:
 
         # 清理可能存在的临时文件
         try:
@@ -190,14 +192,14 @@ class UpdateProcess(QThread):
 
         self.accomplish.emit()
 
-    def get_download_url(self):
+    def get_download_url(self) -> list:
         """获取下载链接"""
 
         try_num = 3
         for i in range(try_num):
             try:
                 response = requests.get(
-                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/res/version.json"
+                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/version.json"
                 )
                 if response.status_code != 200:
                     self.info.emit(
@@ -249,14 +251,16 @@ class UpdateProcess(QThread):
 
 class Updater(QObject):
 
-    def __init__(self, app_path, name, download_url, version):
+    def __init__(
+        self, app_path: str, name: str, main_version: list, updater_version: list
+    ) -> None:
         super().__init__()
 
         self.ui = QDialog()
         self.ui.setWindowTitle("AUTO_MAA更新器")
         self.ui.resize(700, 70)
         self.ui.setWindowIcon(
-            QIcon(os.path.normpath(f"{app_path}/gui/ico/AUTO_MAA_Updater.ico"))
+            QIcon(os.path.normpath(f"{app_path}/resources/icons/AUTO_MAA_Updater.ico"))
         )
 
         # 创建垂直布局
@@ -269,26 +273,30 @@ class Updater(QObject):
         self.progress.setRange(0, 0)
         self.Layout_v.addWidget(self.progress)
 
-        self.update_process = UpdateProcess(app_path, name, download_url, version)
+        self.update_process = UpdateProcess(
+            app_path, name, main_version, updater_version
+        )
 
         self.update_process.info.connect(self.update_info)
         self.update_process.progress.connect(self.update_progress)
 
         self.update_process.start()
 
-    def update_info(self, text):
+    def update_info(self, text: str) -> None:
         self.info.setText(text)
 
-    def update_progress(self, begin, end, current):
+    def update_progress(self, begin: int, end: int, current: int) -> None:
         self.progress.setRange(begin, end)
         self.progress.setValue(current)
 
 
 class AUTO_MAA_Updater(QApplication):
-    def __init__(self, app_path, name, download_url, version):
+    def __init__(
+        self, app_path: str, name: str, main_version: list, updater_version: list
+    ) -> None:
         super().__init__()
 
-        self.main = Updater(app_path, name, download_url, version)
+        self.main = Updater(app_path, name, main_version, updater_version)
         self.main.ui.show()
 
 
@@ -298,9 +306,11 @@ if __name__ == "__main__":
     app_path = os.path.normpath(os.path.dirname(os.path.realpath(sys.argv[0])))
 
     # 从本地版本信息文件获取当前版本信息
-    if os.path.exists(os.path.normpath(f"{app_path}/res/version.json")):
+    if os.path.exists(os.path.normpath(f"{app_path}/resources/version.json")):
         with open(
-            os.path.normpath(f"{app_path}/res/version.json"), "r", encoding="utf-8"
+            os.path.normpath(f"{app_path}/resources/version.json"),
+            "r",
+            encoding="utf-8",
         ) as f:
             version_current = json.load(f)
         main_version_current = list(
@@ -313,7 +323,7 @@ if __name__ == "__main__":
     for _ in range(3):
         try:
             response = requests.get(
-                "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/res/version.json"
+                "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/resources/version.json"
             )
             version_remote = response.json()
             main_version_remote = list(
@@ -332,6 +342,6 @@ if __name__ == "__main__":
             app_path,
             "AUTO_MAA主程序",
             main_version_remote,
-            "",
+            [],
         )
         sys.exit(app.exec())

app/utils/__init__.py

@@ -0,0 +1,35 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA工具包
+v4.2
+作者：DLmaster_361
+"""
+
+__version__ = "4.2.0"
+__author__ = "DLmaster361 <DLmaster_361@163.com>"
+__license__ = "GPL-3.0 license"
+
+from .Updater import Updater
+from .version import version_text
+
+__all__ = ["Updater", "version_text"]

app/utils/package.py

@@ -0,0 +1,79 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA打包程序
+v4.2
+作者：DLmaster_361
+"""
+
+import json
+import subprocess
+
+from app import version_text
+
+
+if __name__ == "__main__":
+
+    with open("resources/version.json", "r", encoding="utf-8") as f:
+        version = json.load(f)
+
+    main_version_numb = list(map(int, version["main_version"].split(".")))
+    updater_version_numb = list(map(int, version["updater_version"].split(".")))
+
+    result = subprocess.run(
+        f"powershell -Command nuitka --standalone --onefile --mingw64"
+        f" --enable-plugins=pyside6 --windows-console-mode=disable"
+        f" --windows-icon-from-ico=resources\\icons\\AUTO_MAA.ico"
+        f" --company-name='AUTO_MAA Team' --product-name=AUTO_MAA"
+        f" --file-version={version["main_version"]}"
+        f" --product-version={version["main_version"]}"
+        f" --file-description='AUTO_MAA Component'"
+        f" --copyright='Copyright © 2024 DLmaster361'"
+        f" --assume-yes-for-downloads --show-progress"
+        f" --output-filename=AUTO_MAA --remove-output"
+        f" main.py",
+        shell=True,
+        capture_output=True,
+        text=True,
+    )
+    result = subprocess.run(
+        f"powershell -Command nuitka --standalone --onefile --mingw64"
+        f" --enable-plugins=pyside6 --windows-console-mode=disable"
+        f" --windows-icon-from-ico=resources\\icons\\AUTO_MAA_Updater.ico"
+        f" --company-name='AUTO_MAA Team' --product-name=AUTO_MAA"
+        f" --file-version={version["updater_version"]}"
+        f" --product-version={version["updater_version"]}"
+        f" --file-description='AUTO_MAA Component'"
+        f" --copyright='Copyright © 2024 DLmaster361'"
+        f" --assume-yes-for-downloads --show-progress"
+        f" --output-filename=Updater --remove-output"
+        f" app\\utils\\Updater.py",
+        shell=True,
+        capture_output=True,
+        text=True,
+    )
+
+    with open("update_info.txt", "w", encoding="utf-8") as f:
+        print(
+            f"{version_text(main_version_numb)}\n{version_text(updater_version_numb)}{version["announcement"]}",
+            file=f,
+        )

app/utils/version.py

@@ -0,0 +1,38 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA版本号工具
+v4.2
+作者：DLmaster_361
+"""
+
+
+def version_text(version_numb: list) -> str:
+    """将版本号列表转为可读的文本信息"""
+
+    if version_numb[3] == 0:
+        version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}"
+    else:
+        version = (
+            f"v{'.'.join(str(_) for _ in version_numb[0:3])}-beta.{version_numb[3]}"
+        )
+    return version

main.py

@@ -0,0 +1,41 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA 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,
+#   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 <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
+"""
+AUTO_MAA
+AUTO_MAA主程序
+v4.2
+作者：DLmaster_361
+"""
+
+from PySide6.QtWidgets import QApplication
+import sys
+
+from app import AppConfig, Notification, CryptoHandler, AUTO_MAA
+
+if __name__ == "__main__":
+
+    config = AppConfig()
+    notify = Notification(config)
+    crypto = CryptoHandler(config)
+
+    application = QApplication(sys.argv)
+    window = AUTO_MAA(config=config, notify=notify, crypto=crypto)
+    sys.exit(application.exec())

package.py

@@ -1,68 +0,0 @@
-#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
-#   Copyright © <2024> <DLmaster361>
-
-#   This file is part of AUTO_MAA.
-
-#   AUTO_MAA 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,
-#   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 <https://www.gnu.org/licenses/>.
-
-#   DLmaster_361@163.com
-
-"""
-AUTO_MAA
-AUTO_MAA打包程序
-v4.1
-作者：DLmaster_361
-"""
-
-import os
-import json
-
-
-def version_text(version_numb):
-    """将版本号列表转为可读的文本信息"""
-    if version_numb[3] == 0:
-        version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}"
-    else:
-        version = f"v{'.'.join(str(_) for _ in version_numb[0:3])}_beta"
-    return version
-
-
-if __name__ == "__main__":
-
-    with open("res/version.json", "r", encoding="utf-8") as f:
-        version = json.load(f)
-
-    main_version_numb = list(map(int, version["main_version"].split(".")))
-    updater_version_numb = list(map(int, version["updater_version"].split(".")))
-
-    main_info = f"# UTF-8\n#\nVSVersionInfo(\n  ffi=FixedFileInfo(\n    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)\n    # Set not needed items to zero 0.\n    filevers=({', '.join(str(_) for _ in main_version_numb)}),\n    prodvers=(0, 0, 0, 0),\n    # Contains a bitmask that specifies the valid bits 'flags'r\n    mask=0x3f,\n    # Contains a bitmask that specifies the Boolean attributes of the file.\n    flags=0x0,\n    # The operating system for which this file was designed.\n    # 0x4 - NT and there is no need to change it.\n    OS=0x4,\n    # The general type of file.\n    # 0x1 - the file is an application.\n    fileType=0x1,\n    # The function of the file.\n    # 0x0 - the function is not defined for this fileType\n    subtype=0x0,\n    # Creation date and time stamp.\n    date=(0, 0)\n    ),\n  kids=[\n    VarFileInfo([VarStruct('Translation', [0, 1200])]), \n    StringFileInfo(\n      [\n      StringTable(\n        '000004b0',\n        [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),\n        StringStruct('CompanyName', 'AUTO_MAA Team'),\n        StringStruct('FileDescription', 'AUTO_MAA Component'),\n        StringStruct('FileVersion', '{version["main_version"]}'),\n        StringStruct('InternalName', 'AUTO_MAA'),\n        StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),\n        StringStruct('OriginalFilename', 'AUTO_MAA.py'),\n        StringStruct('ProductName', 'AUTO_MAA'),\n        StringStruct('ProductVersion', 'v{version["main_version"]}'),\n        StringStruct('Assembly Version', 'v{version["main_version"]}')])\n      ])\n  ]\n)"
-    updater_info = f"# UTF-8\n#\nVSVersionInfo(\n  ffi=FixedFileInfo(\n    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)\n    # Set not needed items to zero 0.\n    filevers=({', '.join(str(_) for _ in updater_version_numb)}),\n    prodvers=(0, 0, 0, 0),\n    # Contains a bitmask that specifies the valid bits 'flags'r\n    mask=0x3f,\n    # Contains a bitmask that specifies the Boolean attributes of the file.\n    flags=0x0,\n    # The operating system for which this file was designed.\n    # 0x4 - NT and there is no need to change it.\n    OS=0x4,\n    # The general type of file.\n    # 0x1 - the file is an application.\n    fileType=0x1,\n    # The function of the file.\n    # 0x0 - the function is not defined for this fileType\n    subtype=0x0,\n    # Creation date and time stamp.\n    date=(0, 0)\n    ),\n  kids=[\n    VarFileInfo([VarStruct('Translation', [0, 1200])]), \n    StringFileInfo(\n      [\n      StringTable(\n        '000004b0',\n        [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),\n        StringStruct('CompanyName', 'AUTO_MAA Team'),\n        StringStruct('FileDescription', 'AUTO_MAA Component'),\n        StringStruct('FileVersion', '{version["updater_version"]}'),\n        StringStruct('InternalName', 'AUTO_MAA_Updater'),\n        StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),\n        StringStruct('OriginalFilename', 'Updater.py'),\n        StringStruct('ProductName', 'AUTO_MAA_Updater'),\n        StringStruct('ProductVersion', 'v{version["updater_version"]}'),\n        StringStruct('Assembly Version', 'v{version["updater_version"]}')])\n      ])\n  ]\n)"
-
-    with open("AUTO_MAA_info.txt", "w", encoding="utf-8") as f:
-        print(main_info, end="", file=f)
-    with open("Updater_info.txt", "w", encoding="utf-8") as f:
-        print(updater_info, end="", file=f)
-
-    os.system(
-        "pyinstaller -F --version-file AUTO_MAA_info.txt -w --icon=gui/ico/AUTO_MAA.ico AUTO_MAA.py --hidden-import plyer.platforms.win.notification"
-    )
-    os.system(
-        "pyinstaller -F --version-file Updater_info.txt -w --icon=gui/ico/AUTO_MAA_Updater.ico Updater.py"
-    )
-
-    with open("update_info.txt", "w", encoding="utf-8") as f:
-        print(
-            f"{version_text(main_version_numb)}\n{version_text(updater_version_numb)}{version["announcement"]}",
-            file=f,
-        )

requirements.txt

@@ -4,5 +4,5 @@ psutil
 pywin32
 pyautogui
 pycryptodome
-pyinstaller
-requests
+requests
+nuitka

res/version.json

@@ -1,7 +1,7 @@
 {
-    "main_version": "4.1.4.0",
-    "updater_version": "1.0.5.2",
-    "announcement": "\n## 新增功能\n- 添加托盘中止当前任务选项\n- 添加邮件仅推送异常信息选项\n- 后台静默代理功能上线\n## 修复BUG\n- 修复深色模式下UI异常 #10\n- 同步MAA`启动MAA后直接最小化`字段修改\n## 程序优化\n- MainTimer逻辑实现优化\n- 修改配置方法优化\n- 代理逻辑优化\n- 更新器添加更多代理地址，更新流程优化，可获取远端代理地址\n- 路径跨平台适配",
+    "main_version": "4.2.0.0",
+    "updater_version": "1.1.0.0",
+    "announcement": "\n# 这是一个中间版本，此版本后更换程序架构方式。\n# 由于更新方法无法通用，您需要在完成更新后再次检查更新以获取最新版本。",
     "proxy_list":[
         "",
         "https://gitproxy.click/",

resources/version.json

@@ -0,0 +1,14 @@
+{
+    "main_version": "4.2.0.0",
+    "updater_version": "1.1.0.0",
+    "announcement": "\n# 这是一个中间版本，此版本后更换程序架构方式。\n# 由于更新方法无法通用，您需要在完成更新后再次检查更新以获取最新版本。",
+    "proxy_list":[
+        "",
+        "https://gitproxy.click/",
+        "https://cdn.moran233.xyz/",
+        "https://gh.llkk.cc/",
+        "https://github.akams.cn/",
+        "https://www.ghproxy.cn/",
+        "https://ghp.ci/"
+    ]
+}