From 6317fe5a3847e82f8d7912e9a15ede6c798bb4c7 Mon Sep 17 00:00:00 2001
From: Windpicker-owo <3431391539@qq.com>
Date: Sat, 1 Nov 2025 14:29:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B8=85=E7=90=86=E6=97=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=87=E4=BB=B6=E5=B9=B6=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=AF=BC=E5=85=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将6个旧数据库文件移动到 old/ 目录归档
  * sqlalchemy_models.py
  * sqlalchemy_database_api.py
  * database.py
  * db_migration.py
  * db_batch_scheduler.py
  * sqlalchemy_init.py
- 更新剩余2个文件的导入路径
  * src/schedule/database.py
  * src/plugins/built_in/napcat_adapter_plugin/src/database.py
- 数据库重构基本完成，系统使用新的6层架构
---
 src/common/database/{ => old}/database.py                  | 0
 src/common/database/{ => old}/db_batch_scheduler.py        | 0
 src/common/database/{ => old}/db_migration.py              | 0
 src/common/database/{ => old}/sqlalchemy_database_api.py   | 0
 src/common/database/{ => old}/sqlalchemy_init.py           | 0
 src/common/database/{ => old}/sqlalchemy_models.py         | 0
 src/plugins/built_in/napcat_adapter_plugin/src/database.py | 3 ++-
 src/schedule/database.py                                   | 3 ++-
 8 files changed, 4 insertions(+), 2 deletions(-)
 rename src/common/database/{ => old}/database.py (100%)
 rename src/common/database/{ => old}/db_batch_scheduler.py (100%)
 rename src/common/database/{ => old}/db_migration.py (100%)
 rename src/common/database/{ => old}/sqlalchemy_database_api.py (100%)
 rename src/common/database/{ => old}/sqlalchemy_init.py (100%)
 rename src/common/database/{ => old}/sqlalchemy_models.py (100%)

diff --git a/src/common/database/database.py b/src/common/database/old/database.py
similarity index 100%
rename from src/common/database/database.py
rename to src/common/database/old/database.py
diff --git a/src/common/database/db_batch_scheduler.py b/src/common/database/old/db_batch_scheduler.py
similarity index 100%
rename from src/common/database/db_batch_scheduler.py
rename to src/common/database/old/db_batch_scheduler.py
diff --git a/src/common/database/db_migration.py b/src/common/database/old/db_migration.py
similarity index 100%
rename from src/common/database/db_migration.py
rename to src/common/database/old/db_migration.py
diff --git a/src/common/database/sqlalchemy_database_api.py b/src/common/database/old/sqlalchemy_database_api.py
similarity index 100%
rename from src/common/database/sqlalchemy_database_api.py
rename to src/common/database/old/sqlalchemy_database_api.py
diff --git a/src/common/database/sqlalchemy_init.py b/src/common/database/old/sqlalchemy_init.py
similarity index 100%
rename from src/common/database/sqlalchemy_init.py
rename to src/common/database/old/sqlalchemy_init.py
diff --git a/src/common/database/sqlalchemy_models.py b/src/common/database/old/sqlalchemy_models.py
similarity index 100%
rename from src/common/database/sqlalchemy_models.py
rename to src/common/database/old/sqlalchemy_models.py
diff --git a/src/plugins/built_in/napcat_adapter_plugin/src/database.py b/src/plugins/built_in/napcat_adapter_plugin/src/database.py
index 652f7100a..d3cc7e116 100644
--- a/src/plugins/built_in/napcat_adapter_plugin/src/database.py
+++ b/src/plugins/built_in/napcat_adapter_plugin/src/database.py
@@ -18,7 +18,8 @@ from typing import List, Optional, Sequence
 from sqlalchemy import BigInteger, Column, Index, Integer, UniqueConstraint, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.common.database.sqlalchemy_models import Base, get_db_session
+from src.common.database.core.models import Base
+from src.common.database.core import get_db_session
 from src.common.logger import get_logger
 
 logger = get_logger("napcat_adapter")
diff --git a/src/schedule/database.py b/src/schedule/database.py
index 72c017c82..ef281976c 100644
--- a/src/schedule/database.py
+++ b/src/schedule/database.py
@@ -3,7 +3,8 @@
 
 from sqlalchemy import delete, func, select, update
 
-from src.common.database.sqlalchemy_models import MonthlyPlan, get_db_session
+from src.common.database.core.models import MonthlyPlan
+from src.common.database.core import get_db_session
 from src.common.logger import get_logger
 from src.config.config import global_config