mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-10-07 02:01:37 +00:00
refactor: 完成项目大规模重构与功能优化
这是一次综合性的项目迭代,包含以下核心变更:
1. **目录与模块重构**
- 调整工作流节点类型模块目录结构,迁移节点类型相关代码
- 重命名platform模块为system模块,更新插件配置信息
- 重构代码生成模块导入路径
2. **数据库与CRUD优化**
- 统一所有CRUD类构造函数,新增数据库会话参数
- 修复权限过滤器数据库会话使用问题
- 更新模板生成器的CRUD代码模板
3. **认证与安全改进**
- 重构JWT密钥配置,移除默认密钥强制要求环境变量
- 重命名密码工具类,统一密码加密校验逻辑
- 优化OAuth认证流程,修复匿名认证使用问题
4. **前端与静态资源**
- 重构前端挂载逻辑,增加目录存在性校验
- 使用标准StaticFiles替换自定义前端挂载实现
5. **工具类与依赖更新**
- 修复导入工具的表名重复检测逻辑
- 优化限流回调代码,移除冗余依赖
- 更新用户、租户等模块的响应模型字段
6. **数据与配置修正**
- 修复系统版本数据字段命名不统一问题
- 简化枚举类校验逻辑,移除冗余注释
- 修复测试用例中的密码工具类导入错误
This commit is contained in:
@@ -1,13 +1,14 @@
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Body, Path, Query, Security, status
|
||||
from fastapi import APIRouter, Body, Depends, Path, Query, Security, status
|
||||
from fastapi.responses import JSONResponse
|
||||
from fastapi_cache import FastAPICache
|
||||
from fastapi_cache.decorator import cache
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.common.response import ResponseSchema, SuccessResponse
|
||||
from app.core.base_schema import AuthSchema, BatchSetAvailable, PageResultSchema, PaginationQueryParam
|
||||
from app.core.dependencies import AuthPermission
|
||||
from app.core.dependencies import AuthPermission, db_getter
|
||||
from app.core.router_class import OperationLogRoute
|
||||
|
||||
from .schema import PackageCreateSchema, PackageMenuSetSchema, PackageOutSchema, PackageQueryParam, PackageUpdateSchema
|
||||
@@ -21,8 +22,9 @@ _PKG_NS = "package"
|
||||
@PackageRouter.get("/options", summary="获取套餐下拉选项", response_model=ResponseSchema[list[dict[str, int | str]]])
|
||||
async def get_package_options_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:query"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
) -> JSONResponse:
|
||||
options = await PackageService(auth).get_options()
|
||||
options = await PackageService(auth, db).get_options()
|
||||
return SuccessResponse(data=options, msg="获取套餐选项成功")
|
||||
|
||||
|
||||
@@ -30,19 +32,21 @@ async def get_package_options_controller(
|
||||
@cache(expire=300, namespace=_PKG_NS)
|
||||
async def get_obj_detail_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:query"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
id: Annotated[int, Path(description="套餐ID", ge=1)],
|
||||
) -> JSONResponse:
|
||||
result_dict = await PackageService(auth).detail(id=id)
|
||||
result_dict = await PackageService(auth, db).detail(id=id)
|
||||
return SuccessResponse(data=result_dict, msg="获取套餐详情成功")
|
||||
|
||||
|
||||
@PackageRouter.get("/list", summary="获取套餐列表", response_model=ResponseSchema[PageResultSchema[PackageOutSchema]])
|
||||
async def get_obj_list_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:query"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
page: Annotated[PaginationQueryParam, Query(description="分页参数")],
|
||||
search: Annotated[PackageQueryParam, Query(description="查询参数")],
|
||||
) -> JSONResponse:
|
||||
result_dict = await PackageService(auth).page(
|
||||
result_dict = await PackageService(auth, db).page(
|
||||
page_no=page.page_no,
|
||||
page_size=page.page_size,
|
||||
search=search,
|
||||
@@ -54,9 +58,10 @@ async def get_obj_list_controller(
|
||||
@PackageRouter.post("/create", status_code=status.HTTP_201_CREATED, summary="创建套餐", response_model=ResponseSchema[PackageOutSchema])
|
||||
async def create_obj_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:create"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
data: Annotated[PackageCreateSchema, Body(description="套餐信息")],
|
||||
) -> JSONResponse:
|
||||
result_dict = await PackageService(auth).create(data=data)
|
||||
result_dict = await PackageService(auth, db).create(data=data)
|
||||
await FastAPICache.clear(namespace=_PKG_NS)
|
||||
return SuccessResponse(data=result_dict, msg="创建成功")
|
||||
|
||||
@@ -64,10 +69,11 @@ async def create_obj_controller(
|
||||
@PackageRouter.put("/update/{id}", summary="更新套餐", response_model=ResponseSchema[PackageOutSchema])
|
||||
async def update_obj_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:update"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
id: Annotated[int, Path(description="套餐ID", ge=1)],
|
||||
data: Annotated[PackageUpdateSchema, Body(description="套餐信息")],
|
||||
) -> JSONResponse:
|
||||
result_dict = await PackageService(auth).update(id=id, data=data)
|
||||
result_dict = await PackageService(auth, db).update(id=id, data=data)
|
||||
await FastAPICache.clear(namespace=_PKG_NS)
|
||||
return SuccessResponse(data=result_dict, msg="更新成功")
|
||||
|
||||
@@ -75,9 +81,10 @@ async def update_obj_controller(
|
||||
@PackageRouter.delete("/delete", summary="删除套餐", response_model=ResponseSchema)
|
||||
async def delete_obj_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:delete"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
ids: Annotated[list[int], Body(description="ID列表")],
|
||||
) -> JSONResponse:
|
||||
await PackageService(auth).delete(ids=ids)
|
||||
await PackageService(auth, db).delete(ids=ids)
|
||||
await FastAPICache.clear(namespace=_PKG_NS)
|
||||
return SuccessResponse(msg="删除成功")
|
||||
|
||||
@@ -85,10 +92,11 @@ async def delete_obj_controller(
|
||||
@PackageRouter.patch("/status/batch", summary="批量修改状态", response_model=ResponseSchema)
|
||||
async def set_available_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:update"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
data: Annotated[BatchSetAvailable, Body(description="状态设置")],
|
||||
) -> JSONResponse:
|
||||
for id in data.ids:
|
||||
await PackageService(auth).update(id=id, data=PackageUpdateSchema(status=data.status))
|
||||
await PackageService(auth, db).update(id=id, data=PackageUpdateSchema(status=data.status))
|
||||
await FastAPICache.clear(namespace=_PKG_NS)
|
||||
return SuccessResponse(msg="状态设置成功")
|
||||
|
||||
@@ -96,17 +104,19 @@ async def set_available_controller(
|
||||
@PackageRouter.get("/menus/{package_id}", summary="获取套餐菜单", response_model=ResponseSchema[list[int]])
|
||||
async def get_menus_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:query"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
package_id: Annotated[int, Path(description="套餐ID", ge=1)],
|
||||
) -> JSONResponse:
|
||||
result = await PackageService(auth).get_menus(package_id=package_id)
|
||||
result = await PackageService(auth, db).get_menus(package_id=package_id)
|
||||
return SuccessResponse(data=result, msg="获取成功")
|
||||
|
||||
|
||||
@PackageRouter.post("/menus/{package_id}/set", summary="设置套餐菜单", response_model=ResponseSchema)
|
||||
async def set_menus_controller(
|
||||
auth: Annotated[AuthSchema, Security(AuthPermission(["module_package:package:update"]))],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
package_id: Annotated[int, Path(description="套餐ID", ge=1)],
|
||||
data: Annotated[PackageMenuSetSchema, Body(description="菜单列表")],
|
||||
) -> JSONResponse:
|
||||
await PackageService(auth).set_menus(package_id=package_id, data=data)
|
||||
await PackageService(auth, db).set_menus(package_id=package_id, data=data)
|
||||
return SuccessResponse(msg="设置成功")
|
||||
|
||||
Reference in New Issue
Block a user