mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-10-13 04:39:41 +00:00
style: 统一代码格式和字符串引号使用
refactor: 优化代码结构和可读性 feat: 添加http_limit模块实现请求限制功能 fix: 修复异步任务中使用time.sleep的问题 chore: 更新依赖项并添加pytest测试框架 docs: 更新项目描述信息 perf: 优化Redis序列化方式使用JSON替代pickle test: 添加测试相关配置和依赖
This commit is contained in:
@@ -1,7 +1,14 @@
|
||||
from pathlib import Path
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, BackgroundTasks, Body, Depends, Request, UploadFile
|
||||
from fastapi import (
|
||||
APIRouter,
|
||||
BackgroundTasks,
|
||||
Body,
|
||||
Depends,
|
||||
Request,
|
||||
UploadFile,
|
||||
)
|
||||
from fastapi.responses import FileResponse, JSONResponse
|
||||
|
||||
from app.common.response import SuccessResponse, UploadFileResponse
|
||||
@@ -15,7 +22,12 @@ from .service import FileService
|
||||
FileRouter = APIRouter(route_class=OperationLogRoute, prefix="/file", tags=["文件管理"])
|
||||
|
||||
|
||||
@FileRouter.post("/upload", summary="上传文件", description="上传文件", dependencies=[Depends(AuthPermission(["module_common:file:upload"]))])
|
||||
@FileRouter.post(
|
||||
"/upload",
|
||||
summary="上传文件",
|
||||
description="上传文件",
|
||||
dependencies=[Depends(AuthPermission(["module_common:file:upload"]))],
|
||||
)
|
||||
async def upload_controller(
|
||||
file: UploadFile,
|
||||
request: Request,
|
||||
@@ -35,7 +47,12 @@ async def upload_controller(
|
||||
return SuccessResponse(data=result_dict, msg="上传文件成功")
|
||||
|
||||
|
||||
@FileRouter.post("/download", summary="下载文件", description="下载文件", dependencies=[Depends(AuthPermission(["module_common:file:download"]))])
|
||||
@FileRouter.post(
|
||||
"/download",
|
||||
summary="下载文件",
|
||||
description="下载文件",
|
||||
dependencies=[Depends(AuthPermission(["module_common:file:download"]))],
|
||||
)
|
||||
async def download_controller(
|
||||
background_tasks: BackgroundTasks,
|
||||
file_path: Annotated[str, Body(description="文件路径")],
|
||||
|
||||
@@ -5,51 +5,51 @@ from pydantic.alias_generators import to_camel
|
||||
class ImportFieldModel(BaseModel):
|
||||
model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
|
||||
|
||||
base_column: str | None = Field(description='数据库字段名', default=None)
|
||||
excel_column: str | None = Field(description='excel字段名', default=None)
|
||||
default_value: str | None = Field(description='默认值', default=None)
|
||||
is_required: bool | None = Field(description='是否必传', default=None)
|
||||
selected: bool | None = Field(description='是否勾选', default=None)
|
||||
base_column: str | None = Field(description="数据库字段名", default=None)
|
||||
excel_column: str | None = Field(description="excel字段名", default=None)
|
||||
default_value: str | None = Field(description="默认值", default=None)
|
||||
is_required: bool | None = Field(description="是否必传", default=None)
|
||||
selected: bool | None = Field(description="是否勾选", default=None)
|
||||
|
||||
@model_validator(mode='before')
|
||||
@model_validator(mode="before")
|
||||
@classmethod
|
||||
def _normalize(cls, data):
|
||||
if isinstance(data, dict):
|
||||
for key in ('base_column', 'excel_column', 'default_value'):
|
||||
for key in ("base_column", "excel_column", "default_value"):
|
||||
val = data.get(key)
|
||||
if isinstance(val, str):
|
||||
val = val.strip()
|
||||
if val == '':
|
||||
if val == "":
|
||||
val = None
|
||||
data[key] = val
|
||||
# is_required 兼容转换
|
||||
val = data.get('is_required')
|
||||
val = data.get("is_required")
|
||||
if isinstance(val, str):
|
||||
lowered = val.strip().lower()
|
||||
if lowered in {'true', '1', 'y', 'yes'}:
|
||||
data['is_required'] = True
|
||||
elif lowered in {'false', '0', 'n', 'no'}:
|
||||
data['is_required'] = False
|
||||
if lowered in {"true", "1", "y", "yes"}:
|
||||
data["is_required"] = True
|
||||
elif lowered in {"false", "0", "n", "no"}:
|
||||
data["is_required"] = False
|
||||
return data
|
||||
|
||||
@model_validator(mode='after')
|
||||
@model_validator(mode="after")
|
||||
def _validate(self):
|
||||
if self.selected and not (self.base_column and self.base_column.strip()):
|
||||
raise ValueError('选中字段必须提供数据库字段名')
|
||||
raise ValueError("选中字段必须提供数据库字段名")
|
||||
if self.is_required and not (self.excel_column and self.excel_column.strip()):
|
||||
raise ValueError('必传字段必须提供excel字段名')
|
||||
raise ValueError("必传字段必须提供excel字段名")
|
||||
return self
|
||||
|
||||
|
||||
class ImportModel(BaseModel):
|
||||
model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
|
||||
|
||||
table_name: str | None = Field(description='表名', default=None)
|
||||
sheet_name: str | None = Field(description='Sheet名', default=None)
|
||||
filed_info: list[ImportFieldModel] | None = Field(description='字段关联表', default=None)
|
||||
file_name: str | None = Field(description='文件名', default=None)
|
||||
table_name: str | None = Field(description="表名", default=None)
|
||||
sheet_name: str | None = Field(description="Sheet名", default=None)
|
||||
filed_info: list[ImportFieldModel] | None = Field(description="字段关联表", default=None)
|
||||
file_name: str | None = Field(description="文件名", default=None)
|
||||
|
||||
@model_validator(mode='after')
|
||||
@model_validator(mode="after")
|
||||
def _validate(self):
|
||||
# excel_column 不重复(忽略 None)
|
||||
if self.filed_info:
|
||||
@@ -58,6 +58,6 @@ class ImportModel(BaseModel):
|
||||
if f.excel_column:
|
||||
key = f.excel_column.strip()
|
||||
if key in seen:
|
||||
raise ValueError('excel字段名存在重复')
|
||||
raise ValueError("excel字段名存在重复")
|
||||
seen.add(key)
|
||||
return self
|
||||
|
||||
@@ -11,7 +11,9 @@ class FileService:
|
||||
"""
|
||||
|
||||
@classmethod
|
||||
async def upload_service(cls, base_url: str, file: UploadFile, upload_type: str = 'local') -> dict:
|
||||
async def upload_service(
|
||||
cls, base_url: str, file: UploadFile, upload_type: str = "local"
|
||||
) -> dict:
|
||||
"""
|
||||
上传文件。
|
||||
|
||||
@@ -26,18 +28,18 @@ class FileService:
|
||||
异常:
|
||||
- CustomException: 当未选择文件或上传类型错误时抛出。
|
||||
"""
|
||||
if not file:
|
||||
raise CustomException(msg="请选择要上传的文件")
|
||||
if upload_type == 'local':
|
||||
filename, filepath, file_url = await UploadUtil.upload_file(file=file, base_url=base_url)
|
||||
if upload_type == "local":
|
||||
filename, filepath, file_url = await UploadUtil.upload_file(
|
||||
file=file, base_url=base_url
|
||||
)
|
||||
else:
|
||||
raise CustomException(msg="上传类型错误")
|
||||
|
||||
return UploadResponseSchema(
|
||||
file_path=f'{filepath}',
|
||||
file_path=f"{filepath}",
|
||||
file_name=filename,
|
||||
origin_name=file.filename,
|
||||
file_url=f'{file_url}',
|
||||
file_url=f"{file_url}",
|
||||
).model_dump()
|
||||
|
||||
@classmethod
|
||||
|
||||
Reference in New Issue
Block a user