diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 0000000..29fe0ce --- /dev/null +++ b/app/__init__.py @@ -0,0 +1,33 @@ +# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# Copyright © 2024-2025 DLmaster361 +# Copyright © 2025 MoeSnowyFox + +# 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 . + +# Contact: DLmaster_361@163.com + +__version__ = "5.0.0" +__author__ = "DLmaster361 " +__license__ = "GPL-3.0 license" + + +from .api import * +from .core import * +from .models import * +from .services import * +from .utils import * + +__all__ = ["api", "core", "models", "services", "utils"] diff --git a/app/api/dispatch.py b/app/api/dispatch.py index 0f88fbc..8961426 100644 --- a/app/api/dispatch.py +++ b/app/api/dispatch.py @@ -22,8 +22,8 @@ from fastapi import APIRouter, Body -from core import Config -from models.schema import * +from app.core import Config +from app.models.schema import * router = APIRouter(prefix="/api/dispatch", tags=["任务调度"]) diff --git a/app/api/info.py b/app/api/info.py index 44e09fa..e28a4a7 100644 --- a/app/api/info.py +++ b/app/api/info.py @@ -22,8 +22,8 @@ from fastapi import APIRouter, Body -from core import Config -from models.schema import * +from app.core import Config +from app.models.schema import * router = APIRouter(prefix="/api/info", tags=["信息获取"]) diff --git a/app/api/plan.py b/app/api/plan.py index 993ec6b..40420b5 100644 --- a/app/api/plan.py +++ b/app/api/plan.py @@ -22,8 +22,8 @@ from fastapi import APIRouter, Body -from core import Config -from models.schema import * +from app.core import Config +from app.models.schema import * router = APIRouter(prefix="/api/plan", tags=["计划管理"]) diff --git a/app/api/queue.py b/app/api/queue.py index 213e3f2..d3f6dd4 100644 --- a/app/api/queue.py +++ b/app/api/queue.py @@ -22,8 +22,8 @@ from fastapi import APIRouter, Body -from core import Config -from models.schema import * +from app.core import Config +from app.models.schema import * router = APIRouter(prefix="/api/queue", tags=["调度队列管理"]) diff --git a/app/api/scripts.py b/app/api/scripts.py index 182cab3..96d57f8 100644 --- a/app/api/scripts.py +++ b/app/api/scripts.py @@ -22,8 +22,8 @@ from fastapi import APIRouter, Body -from core import Config -from models.schema import * +from app.core import Config +from app.models.schema import * router = APIRouter(prefix="/api/scripts", tags=["脚本管理"]) diff --git a/app/api/setting.py b/app/api/setting.py index c230d23..a38a4a4 100644 --- a/app/api/setting.py +++ b/app/api/setting.py @@ -22,8 +22,8 @@ from fastapi import APIRouter, Body -from core import Config -from models.schema import * +from app.core import Config +from app.models.schema import * router = APIRouter(prefix="/api/setting", tags=["全局设置"]) diff --git a/app/core/config.py b/app/core/config.py index 83bc41a..564ce01 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -35,8 +35,8 @@ from pathlib import Path from typing import Union, Dict, List, Literal, Optional, Any, Tuple, Callable, TypeVar -from utils import get_logger -from models.ConfigBase import * +from app.utils import get_logger +from app.models.ConfigBase import * logger = get_logger("配置管理") diff --git a/app/core/timer.py b/app/core/timer.py index c04b226..a77d3c5 100644 --- a/app/core/timer.py +++ b/app/core/timer.py @@ -22,7 +22,7 @@ import asyncio import keyboard from datetime import datetime -from utils import get_logger +from app.utils import get_logger from .config import Config diff --git a/app/models/ConfigBase.py b/app/models/ConfigBase.py index 6c8d363..e11edaf 100644 --- a/app/models/ConfigBase.py +++ b/app/models/ConfigBase.py @@ -28,7 +28,7 @@ from pathlib import Path from typing import List, Any, Dict, Union -from utils import dpapi_encrypt, dpapi_decrypt +from app.utils import dpapi_encrypt, dpapi_decrypt class ConfigValidator: diff --git a/app/services/__init__.py b/app/services/__init__.py index 546e9e9..b097a0e 100644 --- a/app/services/__init__.py +++ b/app/services/__init__.py @@ -30,8 +30,6 @@ __author__ = "DLmaster361 " __license__ = "GPL-3.0 license" from .notification import Notify -from ..utils.security import Crypto from .system import System -from ..task.skland import skland_sign_in -__all__ = ["Notify", "Crypto", "System", "skland_sign_in"] +__all__ = ["Notify", "System"] diff --git a/app/services/notification.py b/app/services/notification.py index 9ef2f14..828483f 100644 --- a/app/services/notification.py +++ b/app/services/notification.py @@ -30,8 +30,8 @@ from pathlib import Path from plyer import notification -from core import Config -from utils import get_logger, ImageUtils +from app.core import Config +from app.utils import get_logger, ImageUtils logger = get_logger("通知服务") diff --git a/app/services/system.py b/app/services/system.py index a3a00df..9f4f89b 100644 --- a/app/services/system.py +++ b/app/services/system.py @@ -30,8 +30,8 @@ import getpass from datetime import datetime from pathlib import Path -from core import Config -from utils.logger import get_logger +from app.core import Config +from app.utils.logger import get_logger logger = get_logger("系统服务") diff --git a/app/main.py b/main.py similarity index 96% rename from app/main.py rename to main.py index 30a524b..f69ec78 100644 --- a/app/main.py +++ b/main.py @@ -24,7 +24,7 @@ import os import sys import ctypes -from utils import get_logger +from app.utils import get_logger logger = get_logger("主程序") @@ -50,7 +50,7 @@ def main(): @asynccontextmanager async def lifespan(app: FastAPI): - from core import Config, MainTimer + from app.core import Config, MainTimer await Config.init_config() main_timer = asyncio.create_task(MainTimer.second_task()) @@ -67,7 +67,7 @@ def main(): logger.info("----------------END----------------") from fastapi.middleware.cors import CORSMiddleware - from api import ( + from app.api import ( info_router, scripts_router, plan_router,