更新架构并修复问题 (#57)

Author: wu-clan

.gitignore

@@ -3,7 +3,6 @@ __pycache__/
 backend/.env
 .venv/
 venv/
-backend/log/
 backend/alembic/versions/
+*.log
 .ruff_cache/
-.pdm-python

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.9.5
+    rev: v0.11.4
     hooks:
       - id: ruff
         args:
@@ -18,15 +18,12 @@ repos:
           - '--unsafe-fixes'
       - id: ruff-format
 
-  - repo: https://github.com/pdm-project/pdm
-    rev: 2.22.3
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.6.14
     hooks:
-      - id: pdm-export
+      - id: uv-lock
+      - id: uv-export
         args:
           - '-o'
           - 'requirements.txt'
-          - '--without-hashes'
-          - '-G'
-          - 'lint'
-        files: ^pdm.lock$
-      - id: pdm-lock-check
+          - '--no-hashes'

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 xiaowu
+Copyright (c) 2025 wu-clan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

backend/alembic/env.py

@@ -16,8 +16,8 @@
 
 from backend.core import path_conf
 
-if not os.path.exists(path_conf.ALEMBIC_VERSIONS_DIR):
-    os.makedirs(path_conf.ALEMBIC_VERSIONS_DIR)
+if not os.path.exists(path_conf.ALEMBIC_VERSION_DIR):
+    os.makedirs(path_conf.ALEMBIC_VERSION_DIR)
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -30,10 +30,10 @@
 # add your model's MetaData object here
 # for 'autogenerate' support
 # https://alembic.sqlalchemy.org/en/latest/autogenerate.html#autogenerating-multiple-metadata-collections
-from backend.app.admin.model import MappedBase as AdminModel
+from backend.app.admin.model import MappedBase
 
 target_metadata = [
-    AdminModel.metadata,
+    MappedBase.metadata,
 ]
 
 # other values from the config, defined by the needs of env.py,

backend/app/admin/api/v1/auth/auth.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+
 from fastapi import APIRouter, Depends, Request
 from fastapi.security import OAuth2PasswordRequestForm
 
 from backend.app.admin.service.auth_service import auth_service
 from backend.common.security.jwt import DependsJwtAuth
 from backend.common.response.response_schema import response_base, ResponseModel, ResponseSchemaModel
 from backend.app.admin.schema.token import GetSwaggerToken, GetLoginToken
-from backend.app.admin.schema.user import Auth2
+from backend.app.admin.schema.user import AuthLoginParam
 
 router = APIRouter()
 
@@ -19,7 +20,7 @@ async def swagger_login(form_data: OAuth2PasswordRequestForm = Depends()) -> Get
 
 
 @router.post('/login', summary='验证码登录')
-async def user_login(request: Request, obj: Auth2) -> ResponseSchemaModel[GetLoginToken]:
+async def user_login(request: Request, obj: AuthLoginParam) -> ResponseSchemaModel[GetLoginToken]:
     data = await auth_service.login(request=request, obj=obj)
     return response_base.success(data=data)
 

backend/app/admin/api/v1/user.py

@@ -8,15 +8,20 @@
 from backend.common.pagination import paging_data, DependsPagination, PageData
 from backend.common.response.response_schema import response_base, ResponseModel, ResponseSchemaModel
 from backend.database.db import CurrentSession
-from backend.app.admin.schema.user import CreateUser, GetUserInfo, ResetPassword, UpdateUser, Avatar
+from backend.app.admin.schema.user import (
+    RegisterUserParam,
+    GetUserInfoDetail,
+    ResetPassword,
+    UpdateUserParam,
+    AvatarParam,
+)
 from backend.app.admin.service.user_service import UserService
-from backend.utils.serializers import select_as_dict
 
 router = APIRouter()
 
 
 @router.post('/register', summary='用户注册')
-async def user_register(obj: CreateUser) -> ResponseModel:
+async def user_register(obj: RegisterUserParam) -> ResponseModel:
     await UserService.register(obj=obj)
     return response_base.success()
 
@@ -30,22 +35,21 @@ async def password_reset(obj: ResetPassword) -> ResponseModel:
 
 
 @router.get('/{username}', summary='查看用户信息', dependencies=[DependsJwtAuth])
-async def get_user(username: str) -> ResponseSchemaModel[GetUserInfo]:
-    current_user = await UserService.get_userinfo(username=username)
-    data = GetUserInfo(**select_as_dict(current_user))
+async def get_user(username: str) -> ResponseSchemaModel[GetUserInfoDetail]:
+    data = await UserService.get_userinfo(username=username)
     return response_base.success(data=data)
 
 
 @router.put('/{username}', summary='更新用户信息', dependencies=[DependsJwtAuth])
-async def update_userinfo(username: str, obj: UpdateUser) -> ResponseModel:
+async def update_userinfo(username: str, obj: UpdateUserParam) -> ResponseModel:
     count = await UserService.update(username=username, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
 
 
 @router.put('/{username}/avatar', summary='更新头像', dependencies=[DependsJwtAuth])
-async def update_avatar(username: str, avatar: Avatar) -> ResponseModel:
+async def update_avatar(username: str, avatar: AvatarParam) -> ResponseModel:
     count = await UserService.update_avatar(username=username, avatar=avatar)
     if count > 0:
         return response_base.success()
@@ -65,7 +69,7 @@ async def get_all_users(
     username: Annotated[str | None, Query()] = None,
     phone: Annotated[str | None, Query()] = None,
     status: Annotated[int | None, Query()] = None,
-) -> ResponseSchemaModel[PageData[GetUserInfo]]:
+) -> ResponseSchemaModel[PageData[GetUserInfoDetail]]:
     user_select = await UserService.get_select(username=username, phone=phone, status=status)
     page_data = await paging_data(db, user_select)
     return response_base.success(data=page_data)

backend/app/admin/crud/crud_user.py

@@ -9,7 +9,7 @@
 from sqlalchemy_crud_plus import CRUDPlus
 
 from backend.app.admin.model import User
-from backend.app.admin.schema.user import CreateUser, UpdateUser, Avatar
+from backend.app.admin.schema.user import RegisterUserParam, UpdateUserParam, AvatarParam
 from backend.common.security.jwt import get_hash_password
 
 
@@ -40,7 +40,7 @@ async def update_login_time(self, db: AsyncSession, username: str, login_time: d
         )
         return user.rowcount
 
-    async def create(self, db: AsyncSession, obj: CreateUser) -> None:
+    async def create(self, db: AsyncSession, obj: RegisterUserParam) -> None:
         """
         创建用户
 
@@ -55,7 +55,7 @@ async def create(self, db: AsyncSession, obj: CreateUser) -> None:
         new_user = self.model(**dict_obj)
         db.add(new_user)
 
-    async def update_userinfo(self, db: AsyncSession, input_user: int, obj: UpdateUser) -> int:
+    async def update_userinfo(self, db: AsyncSession, input_user: int, obj: UpdateUserParam) -> int:
         """
         更新用户信息
 
@@ -66,7 +66,7 @@ async def update_userinfo(self, db: AsyncSession, input_user: int, obj: UpdateUs
         """
         return await self.update_model(db, input_user, obj)
 
-    async def update_avatar(self, db: AsyncSession, input_user: int, avatar: Avatar) -> int:
+    async def update_avatar(self, db: AsyncSession, input_user: int, avatar: AvatarParam) -> int:
         """
         更新用户头像
 
@@ -118,15 +118,18 @@ async def get_list(self, username: str = None, phone: str = None, status: int =
         :return:
         """
         stmt = select(self.model).order_by(desc(self.model.join_time))
-        where_list = []
+
+        filters = []
         if username:
-            where_list.append(self.model.username.like(f'%{username}%'))
+            filters.append(self.model.username.like(f'%{username}%'))
         if phone:
-            where_list.append(self.model.phone.like(f'%{phone}%'))
+            filters.append(self.model.phone.like(f'%{phone}%'))
         if status is not None:
-            where_list.append(self.model.status == status)
-        if where_list:
-            stmt = stmt.where(and_(*where_list))
+            filters.append(self.model.status == status)
+
+        if filters:
+            stmt = stmt.where(and_(*filters))
+
         return stmt
 
 

backend/app/admin/schema/token.py

@@ -2,13 +2,13 @@
 # -*- coding: utf-8 -*-
 
 from backend.common.schema import SchemaBase
-from backend.app.admin.schema.user import GetUserInfo
+from backend.app.admin.schema.user import GetUserInfoDetail
 
 
 class GetSwaggerToken(SchemaBase):
     access_token: str
     token_type: str = 'Bearer'
-    user: GetUserInfo
+    user: GetUserInfoDetail
 
 
 class GetLoginToken(GetSwaggerToken):

backend/app/admin/schema/user.py

@@ -1,49 +1,49 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import datetime
+from datetime import datetime
 
-from pydantic import Field, EmailStr, ConfigDict, UUID4, HttpUrl
+from pydantic import Field, EmailStr, ConfigDict, HttpUrl
 
 from backend.common.schema import SchemaBase, CustomPhoneNumber
 
 
-class Auth(SchemaBase):
-    username: str
-    password: str
+class AuthSchemaBase(SchemaBase):
+    username: str = Field(description='用户名')
+    password: str = Field(description='密码')
 
 
-class Auth2(Auth):
-    captcha: str
+class AuthLoginParam(AuthSchemaBase):
+    captcha: str = Field(description='验证码')
 
 
-class CreateUser(Auth):
-    email: EmailStr = Field(examples=['user@example.com'])
+class RegisterUserParam(AuthSchemaBase):
+    email: EmailStr = Field(examples=['user@example.com'], description='邮箱')
 
 
-class UpdateUser(SchemaBase):
-    username: str
-    email: EmailStr = Field(examples=['user@example.com'])
-    phone: CustomPhoneNumber | None = None
+class UpdateUserParam(SchemaBase):
+    username: str = Field(description='用户名')
+    email: EmailStr = Field(examples=['user@example.com'], description='邮箱')
+    phone: CustomPhoneNumber | None = Field(None, description='手机号')
 
 
-class Avatar(SchemaBase):
+class AvatarParam(SchemaBase):
     url: HttpUrl = Field(..., description='头像 http 地址')
 
 
-class GetUserInfo(UpdateUser):
+class GetUserInfoDetail(UpdateUserParam):
     model_config = ConfigDict(from_attributes=True)
 
-    id: int
-    uuid: UUID4
-    status: int
-    is_superuser: bool
-    avatar: str | None = None
-    join_time: datetime.datetime
-    last_login_time: datetime.datetime | None = None
+    id: int = Field(description='用户 ID')
+    uuid: str = Field(description='用户 UUID')
+    avatar: str | None = Field(None, description='头像')
+    status: int = Field(description='状态')
+    is_superuser: bool = Field(description='是否超级管理员')
+    join_time: datetime = Field(description='加入时间')
+    last_login_time: datetime | None = Field(None, description='最后登录时间')
 
 
 class ResetPassword(SchemaBase):
-    username: str
-    old_password: str
-    new_password: str
-    confirm_password: str
+    username: str = Field(description='用户名')
+    old_password: str = Field(description='旧密码')
+    new_password: str = Field(description='新密码')
+    confirm_password: str = Field(description='确认密码')

backend/app/admin/service/auth_service.py

@@ -2,11 +2,12 @@
 # -*- coding: utf-8 -*-
 from fastapi import Request
 from fastapi.security import OAuth2PasswordRequestForm
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_user import user_dao
 from backend.app.admin.model import User
 from backend.app.admin.schema.token import GetLoginToken
-from backend.app.admin.schema.user import Auth2
+from backend.app.admin.schema.user import AuthLoginParam
 from backend.common.exception import errors
 from backend.common.response.response_code import CustomErrorCode
 from backend.common.security.jwt import password_verify, create_access_token
@@ -18,27 +19,26 @@
 
 class AuthService:
     @staticmethod
-    async def user_verify(username: str, password: str) -> User:
-        async with async_db_session() as db:
-            user = await user_dao.get_by_username(db, username)
-            if not user:
-                raise errors.NotFoundError(msg='用户名或密码有误')
-            elif not password_verify(password, user.password):
-                raise errors.AuthorizationError(msg='用户名或密码有误')
-            elif not user.status:
-                raise errors.AuthorizationError(msg='用户已被锁定, 请联系统管理员')
-            return user
+    async def user_verify(db: AsyncSession, username: str, password: str) -> User:
+        user = await user_dao.get_by_username(db, username)
+        if not user:
+            raise errors.NotFoundError(msg='用户名或密码有误')
+        elif not password_verify(password, user.password):
+            raise errors.AuthorizationError(msg='用户名或密码有误')
+        elif not user.status:
+            raise errors.AuthorizationError(msg='用户已被锁定, 请联系统管理员')
+        return user
 
     async def swagger_login(self, *, form_data: OAuth2PasswordRequestForm) -> tuple[str, User]:
         async with async_db_session() as db:
-            user = await self.user_verify(form_data.username, form_data.password)
+            user = await self.user_verify(db, form_data.username, form_data.password)
             await user_dao.update_login_time(db, user.username, login_time=timezone.now())
             token = create_access_token(str(user.id))
             return token, user
 
-    async def login(self, *, request: Request, obj: Auth2) -> GetLoginToken:
+    async def login(self, *, request: Request, obj: AuthLoginParam) -> GetLoginToken:
         async with async_db_session() as db:
-            user = await self.user_verify(obj.username, obj.password)
+            user = await self.user_verify(db, obj.username, obj.password)
             try:
                 captcha_uuid = request.app.state.captcha_uuid
                 redis_code = await redis_client.get(f'{settings.CAPTCHA_LOGIN_REDIS_PREFIX}:{captcha_uuid}')