⚒️ 重大重构 LoveACE V2
引入了 mongodb 对数据库进行了一定程度的数据加密 性能改善 代码简化 统一错误模型和响应 使用 apifox 作为文档
This commit is contained in:
14
loveace/database/aac/ticket.py
Normal file
14
loveace/database/aac/ticket.py
Normal file
@@ -0,0 +1,14 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class AACTicket(Base):
|
||||
__tablename__ = "aac_ticket_table"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
userid: Mapped[str] = mapped_column(String(100), unique=True, nullable=False)
|
||||
aac_token: Mapped[str] = mapped_column(String(1024), nullable=False)
|
||||
create_date: Mapped[datetime.datetime] = mapped_column(server_default=func.now())
|
||||
13
loveace/database/auth/login.py
Normal file
13
loveace/database/auth/login.py
Normal file
@@ -0,0 +1,13 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class LoginCoolDown(Base):
|
||||
__tablename__ = "login_cooldown_table"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
userid: Mapped[str] = mapped_column(String(20), unique=True, nullable=False)
|
||||
expire_date: Mapped[datetime.datetime] = mapped_column(nullable=False)
|
||||
20
loveace/database/auth/register.py
Normal file
20
loveace/database/auth/register.py
Normal file
@@ -0,0 +1,20 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class InviteCode(Base):
|
||||
__tablename__ = "invite_code_table"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
code: Mapped[str] = mapped_column(String(100), unique=True, nullable=False)
|
||||
create_date: Mapped[datetime.datetime] = mapped_column(server_default=func.now())
|
||||
|
||||
|
||||
class RegisterCoolDown(Base):
|
||||
__tablename__ = "register_cooldown_table"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
userid: Mapped[str] = mapped_column(String(20), unique=True, nullable=False)
|
||||
expire_date: Mapped[datetime.datetime] = mapped_column(nullable=False)
|
||||
15
loveace/database/auth/token.py
Normal file
15
loveace/database/auth/token.py
Normal file
@@ -0,0 +1,15 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class AuthMEToken(Base):
|
||||
__tablename__ = "auth_me_token_table"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
user_id: Mapped[str] = mapped_column(String(20), nullable=False)
|
||||
token: Mapped[str] = mapped_column(String(256), unique=True, nullable=False)
|
||||
device_id: Mapped[str] = mapped_column(String(256), nullable=False)
|
||||
create_date: Mapped[datetime.datetime] = mapped_column(server_default=func.now())
|
||||
16
loveace/database/auth/user.py
Normal file
16
loveace/database/auth/user.py
Normal file
@@ -0,0 +1,16 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class ACEUser(Base):
|
||||
__tablename__ = "ace_user_table"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
userid: Mapped[str] = mapped_column(String(20), unique=True, nullable=False)
|
||||
password: Mapped[str] = mapped_column(String(2048), nullable=True)
|
||||
ec_password: Mapped[str] = mapped_column(String(2048), nullable=True)
|
||||
create_date: Mapped[datetime.datetime] = mapped_column(server_default=func.now())
|
||||
last_login_date: Mapped[datetime.datetime] = mapped_column(nullable=True)
|
||||
6
loveace/database/base/__init__.py
Normal file
6
loveace/database/base/__init__.py
Normal file
@@ -0,0 +1,6 @@
|
||||
from sqlalchemy.ext.asyncio import AsyncAttrs
|
||||
from sqlalchemy.orm import DeclarativeBase
|
||||
|
||||
|
||||
class Base(AsyncAttrs, DeclarativeBase):
|
||||
pass
|
||||
149
loveace/database/creator.py
Normal file
149
loveace/database/creator.py
Normal file
@@ -0,0 +1,149 @@
|
||||
from typing import AsyncGenerator
|
||||
|
||||
import redis.asyncio as aioredis
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
|
||||
from loveace.config.logger import logger
|
||||
from loveace.config.manager import config_manager
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class DatabaseManager:
|
||||
"""数据库管理器,负责数据库连接和会话管理"""
|
||||
|
||||
def __init__(self):
|
||||
self.engine = None
|
||||
self.async_session_maker = None
|
||||
self._config = None
|
||||
self.redis_client = None
|
||||
self._redis_config = None
|
||||
|
||||
def _get_db_config(self):
|
||||
"""获取数据库配置"""
|
||||
if self._config is None:
|
||||
self._config = config_manager.get_settings().database
|
||||
return self._config
|
||||
|
||||
def _get_redis_config(self):
|
||||
"""获取Redis配置"""
|
||||
if self._redis_config is None:
|
||||
self._redis_config = config_manager.get_settings().redis
|
||||
return self._redis_config
|
||||
|
||||
async def init_db(self) -> bool:
|
||||
"""初始化数据库连接"""
|
||||
db_config = self._get_db_config()
|
||||
|
||||
logger.info("正在初始化数据库连接...")
|
||||
try:
|
||||
self.engine = create_async_engine(
|
||||
db_config.url,
|
||||
echo=db_config.echo,
|
||||
pool_size=db_config.pool_size,
|
||||
max_overflow=db_config.max_overflow,
|
||||
pool_timeout=db_config.pool_timeout,
|
||||
pool_recycle=db_config.pool_recycle,
|
||||
future=True,
|
||||
)
|
||||
|
||||
self.async_session_maker = async_sessionmaker(
|
||||
self.engine, class_=AsyncSession, expire_on_commit=False
|
||||
)
|
||||
|
||||
# 创建所有表
|
||||
async with self.engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
except Exception as e:
|
||||
logger.error(f"数据库连接初始化失败: {e}")
|
||||
logger.error(f"数据库连接URL: {db_config.url}")
|
||||
db_config.url = "****"
|
||||
logger.error(f"数据库连接配置: {db_config}")
|
||||
logger.error("请启动config_tui.py来配置数据库连接")
|
||||
return False
|
||||
logger.info("数据库连接初始化完成")
|
||||
return True
|
||||
|
||||
async def close_db(self):
|
||||
"""关闭数据库连接"""
|
||||
if self.engine:
|
||||
logger.info("正在关闭数据库连接...")
|
||||
await self.engine.dispose()
|
||||
logger.info("数据库连接已关闭")
|
||||
|
||||
async def get_redis_client(self) -> aioredis.Redis:
|
||||
"""获取Redis客户端
|
||||
|
||||
Returns:
|
||||
Redis客户端实例
|
||||
|
||||
Raises:
|
||||
RuntimeError: 如果Redis初始化失败
|
||||
"""
|
||||
if self.redis_client is None:
|
||||
success = await self._init_redis()
|
||||
if not success:
|
||||
raise RuntimeError(
|
||||
"Failed to initialize Redis client. Check logs for details."
|
||||
)
|
||||
return self.redis_client # type: ignore
|
||||
|
||||
async def _init_redis(self) -> bool:
|
||||
"""初始化Redis连接"""
|
||||
redis_config = self._get_redis_config()
|
||||
|
||||
logger.info("正在初始化Redis连接...")
|
||||
try:
|
||||
self.redis_client = aioredis.Redis(
|
||||
host=redis_config.host,
|
||||
port=redis_config.port,
|
||||
db=redis_config.db,
|
||||
password=redis_config.password,
|
||||
encoding=redis_config.encoding,
|
||||
decode_responses=redis_config.decode_responses,
|
||||
max_connections=redis_config.max_connections,
|
||||
socket_keepalive=redis_config.socket_keepalive,
|
||||
)
|
||||
# 测试连接
|
||||
await self.redis_client.ping()
|
||||
logger.info("Redis连接初始化完成")
|
||||
return True
|
||||
except Exception as e:
|
||||
logger.error(f"Redis连接初始化失败: {e}")
|
||||
logger.error(
|
||||
f"Redis配置: host={redis_config.host}, port={redis_config.port}, db={redis_config.db}"
|
||||
)
|
||||
return False
|
||||
|
||||
async def close_redis(self):
|
||||
"""关闭Redis连接"""
|
||||
if self.redis_client:
|
||||
logger.info("正在关闭Redis连接...")
|
||||
await self.redis_client.close()
|
||||
self.redis_client = None
|
||||
logger.info("Redis连接已关闭")
|
||||
|
||||
async def get_session(self) -> AsyncGenerator[AsyncSession, None]:
|
||||
"""获取数据库会话"""
|
||||
if not self.async_session_maker:
|
||||
raise RuntimeError("Database not initialized. Call init_db() first.")
|
||||
|
||||
async with self.async_session_maker() as session:
|
||||
try:
|
||||
yield session
|
||||
finally:
|
||||
await session.close()
|
||||
|
||||
|
||||
# 全局数据库管理器实例
|
||||
db_manager = DatabaseManager()
|
||||
|
||||
|
||||
async def get_db_session() -> AsyncGenerator[AsyncSession, None]:
|
||||
"""获取数据库会话的依赖函数,用于FastAPI路由"""
|
||||
async for session in db_manager.get_session():
|
||||
yield session
|
||||
|
||||
|
||||
async def get_redis_instance() -> aioredis.Redis:
|
||||
"""获取Redis实例的依赖函数,用于FastAPI路由"""
|
||||
return await db_manager.get_redis_client()
|
||||
15
loveace/database/isim/room.py
Normal file
15
loveace/database/isim/room.py
Normal file
@@ -0,0 +1,15 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class RoomBind(Base):
|
||||
__tablename__ = "isim_room_bind_table"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
user_id: Mapped[str] = mapped_column(String(20), nullable=False)
|
||||
roomid: Mapped[str] = mapped_column(String(20), nullable=False)
|
||||
roomtext: Mapped[str] = mapped_column(String(50), nullable=False)
|
||||
create_date: Mapped[datetime.datetime] = mapped_column(server_default=func.now())
|
||||
1
loveace/database/ldjlb/__init__.py
Normal file
1
loveace/database/ldjlb/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# 劳动俱乐部数据库模型
|
||||
14
loveace/database/ldjlb/ticket.py
Normal file
14
loveace/database/ldjlb/ticket.py
Normal file
@@ -0,0 +1,14 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class LDJLBTicket(Base):
|
||||
__tablename__ = "ldjlb_ticket_table"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
userid: Mapped[str] = mapped_column(String(100), unique=True, nullable=False)
|
||||
ldjlb_token: Mapped[str] = mapped_column(String(1024), nullable=False)
|
||||
create_date: Mapped[datetime.datetime] = mapped_column(server_default=func.now())
|
||||
26
loveace/database/profile/flutter_profile.py
Normal file
26
loveace/database/profile/flutter_profile.py
Normal file
@@ -0,0 +1,26 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class FlutterThemeProfile(Base):
|
||||
__tablename__ = "flutter_theme_profile"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
user_id: Mapped[int] = mapped_column(nullable=False, unique=True)
|
||||
dark_mode: Mapped[bool] = mapped_column(nullable=False, default=False)
|
||||
light_mode_opacity: Mapped[float] = mapped_column(nullable=False, default=1.0)
|
||||
light_mode_brightness: Mapped[float] = mapped_column(nullable=False, default=1.0)
|
||||
light_mode_background_url: Mapped[str] = mapped_column(String(300), nullable=True)
|
||||
light_mode_background_md5: Mapped[str] = mapped_column(String(128), nullable=True)
|
||||
light_mode_blur: Mapped[float] = mapped_column(nullable=False, default=0.0)
|
||||
dark_mode_opacity: Mapped[float] = mapped_column(nullable=False, default=1.0)
|
||||
dark_mode_brightness: Mapped[float] = mapped_column(nullable=False, default=1.0)
|
||||
dark_mode_background_url: Mapped[str] = mapped_column(String(300), nullable=True)
|
||||
dark_mode_background_md5: Mapped[str] = mapped_column(String(128), nullable=True)
|
||||
dark_mode_background_blur: Mapped[float] = mapped_column(
|
||||
nullable=False, default=0.0
|
||||
)
|
||||
create_date: Mapped[datetime.datetime] = mapped_column(server_default=func.now())
|
||||
17
loveace/database/profile/user_profile.py
Normal file
17
loveace/database/profile/user_profile.py
Normal file
@@ -0,0 +1,17 @@
|
||||
import datetime
|
||||
|
||||
from sqlalchemy import String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from loveace.database.base import Base
|
||||
|
||||
|
||||
class UserProfile(Base):
|
||||
__tablename__ = "ace_user_profile"
|
||||
id: Mapped[int] = mapped_column(primary_key=True)
|
||||
user_id: Mapped[str] = mapped_column(String(20), nullable=False)
|
||||
nickname: Mapped[str] = mapped_column(String(50), nullable=False)
|
||||
slogan: Mapped[str] = mapped_column(String(100), nullable=True)
|
||||
avatar_url: Mapped[str] = mapped_column(String(200), nullable=True)
|
||||
avatar_md5: Mapped[str] = mapped_column(String(128), nullable=True)
|
||||
create_date: Mapped[datetime.datetime] = mapped_column(server_default=func.now())
|
||||
Reference in New Issue
Block a user