mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-22 05:02:57 +00:00
style: 统一代码格式和字符串引号使用
refactor: 优化代码结构和可读性 feat: 添加http_limit模块实现请求限制功能 fix: 修复异步任务中使用time.sleep的问题 chore: 更新依赖项并添加pytest测试框架 docs: 更新项目描述信息 perf: 优化Redis序列化方式使用JSON替代pickle test: 添加测试相关配置和依赖
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import urllib.parse
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Body, Depends, Path, Request, UploadFile
|
||||
@@ -33,7 +32,7 @@ UserRouter = APIRouter(route_class=OperationLogRoute, prefix="/user", tags=["用
|
||||
|
||||
@UserRouter.get("/current/info", summary="查询当前用户信息", description="查询当前用户信息")
|
||||
async def get_current_user_info_controller(
|
||||
auth: Annotated[AuthSchema, Depends(get_current_user)]
|
||||
auth: Annotated[AuthSchema, Depends(get_current_user)],
|
||||
) -> JSONResponse:
|
||||
"""
|
||||
查询当前用户信息
|
||||
@@ -46,14 +45,15 @@ async def get_current_user_info_controller(
|
||||
"""
|
||||
result_dict = await UserService.get_current_user_info_service(auth=auth)
|
||||
log.info("获取当前用户信息成功")
|
||||
return SuccessResponse(data=result_dict, msg='获取当前用户信息成功')
|
||||
return SuccessResponse(data=result_dict, msg="获取当前用户信息成功")
|
||||
|
||||
|
||||
@UserRouter.post("/current/avatar/upload", summary="上传当前用户头像", dependencies=[Depends(get_current_user)])
|
||||
async def user_avatar_upload_controller(
|
||||
file: UploadFile,
|
||||
request: Request
|
||||
) -> JSONResponse:
|
||||
@UserRouter.post(
|
||||
"/current/avatar/upload",
|
||||
summary="上传当前用户头像",
|
||||
dependencies=[Depends(get_current_user)],
|
||||
)
|
||||
async def user_avatar_upload_controller(file: UploadFile, request: Request) -> JSONResponse:
|
||||
"""
|
||||
上传当前用户头像
|
||||
|
||||
@@ -66,13 +66,17 @@ async def user_avatar_upload_controller(
|
||||
"""
|
||||
result_str = await UserService.upload_avatar_service(base_url=str(request.base_url), file=file)
|
||||
log.info(f"上传头像成功: {result_str}")
|
||||
return SuccessResponse(data=result_str, msg='上传头像成功')
|
||||
return SuccessResponse(data=result_str, msg="上传头像成功")
|
||||
|
||||
|
||||
@UserRouter.put("/current/info/update", summary="更新当前用户基本信息", description="更新当前用户基本信息")
|
||||
@UserRouter.put(
|
||||
"/current/info/update",
|
||||
summary="更新当前用户基本信息",
|
||||
description="更新当前用户基本信息",
|
||||
)
|
||||
async def update_current_user_info_controller(
|
||||
data: CurrentUserUpdateSchema,
|
||||
auth: Annotated[AuthSchema, Depends(get_current_user)]
|
||||
auth: Annotated[AuthSchema, Depends(get_current_user)],
|
||||
) -> JSONResponse:
|
||||
"""
|
||||
更新当前用户基本信息
|
||||
@@ -86,13 +90,17 @@ async def update_current_user_info_controller(
|
||||
"""
|
||||
result_dict = await UserService.update_current_user_info_service(data=data, auth=auth)
|
||||
log.info(f"更新当前用户基本信息成功: {result_dict}")
|
||||
return SuccessResponse(data=result_dict, msg='更新当前用户基本信息成功')
|
||||
return SuccessResponse(data=result_dict, msg="更新当前用户基本信息成功")
|
||||
|
||||
|
||||
@UserRouter.put("/current/password/change", summary="修改当前用户密码", description="修改当前用户密码")
|
||||
@UserRouter.put(
|
||||
"/current/password/change",
|
||||
summary="修改当前用户密码",
|
||||
description="修改当前用户密码",
|
||||
)
|
||||
async def change_current_user_password_controller(
|
||||
data: UserChangePasswordSchema,
|
||||
auth: Annotated[AuthSchema, Depends(get_current_user)]
|
||||
auth: Annotated[AuthSchema, Depends(get_current_user)],
|
||||
) -> JSONResponse:
|
||||
"""
|
||||
修改当前用户密码
|
||||
@@ -106,13 +114,13 @@ async def change_current_user_password_controller(
|
||||
"""
|
||||
result_dict = await UserService.change_user_password_service(data=data, auth=auth)
|
||||
log.info(f"修改密码成功: {result_dict}")
|
||||
return SuccessResponse(data=result_dict, msg='修改密码成功, 请重新登录')
|
||||
return SuccessResponse(data=result_dict, msg="修改密码成功, 请重新登录")
|
||||
|
||||
|
||||
@UserRouter.put("/reset/password", summary="重置密码", description="重置密码")
|
||||
async def reset_password_controller(
|
||||
data: ResetPasswordSchema,
|
||||
auth: Annotated[AuthSchema, Depends(get_current_user)]
|
||||
auth: Annotated[AuthSchema, Depends(get_current_user)],
|
||||
) -> JSONResponse:
|
||||
"""
|
||||
重置密码
|
||||
@@ -126,10 +134,10 @@ async def reset_password_controller(
|
||||
"""
|
||||
result_dict = await UserService.reset_user_password_service(data=data, auth=auth)
|
||||
log.info(f"重置密码成功: {result_dict}")
|
||||
return SuccessResponse(data=result_dict, msg='重置密码成功')
|
||||
return SuccessResponse(data=result_dict, msg="重置密码成功")
|
||||
|
||||
|
||||
@UserRouter.post('/register', summary="注册用户", description="注册用户")
|
||||
@UserRouter.post("/register", summary="注册用户", description="注册用户")
|
||||
async def register_user_controller(
|
||||
data: UserRegisterSchema,
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
@@ -147,10 +155,10 @@ async def register_user_controller(
|
||||
auth = AuthSchema(db=db)
|
||||
user_register_result = await UserService.register_user_service(data=data, auth=auth)
|
||||
log.info(f"{data.username} 注册用户成功: {user_register_result}")
|
||||
return SuccessResponse(data=user_register_result, msg='注册用户成功')
|
||||
return SuccessResponse(data=user_register_result, msg="注册用户成功")
|
||||
|
||||
|
||||
@UserRouter.post('/forget/password', summary="忘记密码", description="忘记密码")
|
||||
@UserRouter.post("/forget/password", summary="忘记密码", description="忘记密码")
|
||||
async def forget_password_controller(
|
||||
data: UserForgetPasswordSchema,
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
@@ -168,7 +176,7 @@ async def forget_password_controller(
|
||||
auth = AuthSchema(db=db)
|
||||
user_forget_password_result = await UserService.forget_password_service(data=data, auth=auth)
|
||||
log.info(f"{data.username} 重置密码成功: {user_forget_password_result}")
|
||||
return SuccessResponse(data=user_forget_password_result, msg='重置密码成功')
|
||||
return SuccessResponse(data=user_forget_password_result, msg="重置密码成功")
|
||||
|
||||
|
||||
@UserRouter.get("/list", summary="查询用户", description="查询用户")
|
||||
@@ -188,8 +196,14 @@ async def get_obj_list_controller(
|
||||
返回:
|
||||
- JSONResponse: 分页查询结果JSON响应
|
||||
"""
|
||||
result_dict_list = await UserService.get_user_list_service(search=search, auth=auth, order_by=page.order_by)
|
||||
result_dict = await PaginationService.paginate(data_list=result_dict_list, page_no=page.page_no, page_size=page.page_size)
|
||||
result_dict_list = await UserService.get_user_list_service(
|
||||
search=search, auth=auth, order_by=page.order_by
|
||||
)
|
||||
result_dict = await PaginationService.paginate(
|
||||
data_list=result_dict_list,
|
||||
page_no=page.page_no,
|
||||
page_size=page.page_size,
|
||||
)
|
||||
log.info("查询用户成功")
|
||||
return SuccessResponse(data=result_dict, msg="查询用户成功")
|
||||
|
||||
@@ -211,7 +225,7 @@ async def get_obj_detail_controller(
|
||||
"""
|
||||
result_dict = await UserService.get_detail_by_id_service(id=id, auth=auth)
|
||||
log.info(f"获取用户详情成功 {id}")
|
||||
return SuccessResponse(data=result_dict, msg='获取用户详情成功')
|
||||
return SuccessResponse(data=result_dict, msg="获取用户详情成功")
|
||||
|
||||
|
||||
@UserRouter.post("/create", summary="创建用户", description="创建用户")
|
||||
@@ -280,7 +294,11 @@ async def delete_obj_controller(
|
||||
return SuccessResponse(msg="删除用户成功")
|
||||
|
||||
|
||||
@UserRouter.patch("/available/setting", summary="批量修改用户状态", description="批量修改用户状态")
|
||||
@UserRouter.patch(
|
||||
"/available/setting",
|
||||
summary="批量修改用户状态",
|
||||
description="批量修改用户状态",
|
||||
)
|
||||
async def batch_set_available_obj_controller(
|
||||
data: BatchSetAvailable,
|
||||
auth: Annotated[AuthSchema, Depends(AuthPermission(["module_system:user:patch"]))],
|
||||
@@ -300,7 +318,12 @@ async def batch_set_available_obj_controller(
|
||||
return SuccessResponse(msg="批量修改用户状态成功")
|
||||
|
||||
|
||||
@UserRouter.post('/import/template', summary="获取用户导入模板", description="获取用户导入模板", dependencies=[Depends(AuthPermission(["module_system:user:download"]))])
|
||||
@UserRouter.post(
|
||||
"/import/template",
|
||||
summary="获取用户导入模板",
|
||||
description="获取用户导入模板",
|
||||
dependencies=[Depends(AuthPermission(["module_system:user:download"]))],
|
||||
)
|
||||
async def export_obj_template_controller() -> StreamingResponse:
|
||||
"""
|
||||
获取用户导入模板
|
||||
@@ -309,19 +332,19 @@ async def export_obj_template_controller() -> StreamingResponse:
|
||||
- StreamingResponse: 用户导入模板流响应
|
||||
"""
|
||||
user_import_template_result = await UserService.get_import_template_user_service()
|
||||
log.info('获取用户导入模板成功')
|
||||
log.info("获取用户导入模板成功")
|
||||
|
||||
return StreamResponse(
|
||||
data=bytes2file_response(user_import_template_result),
|
||||
media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||
media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
||||
headers={
|
||||
'Content-Disposition': f'attachment; filename={urllib.parse.quote("用户导入模板.xlsx")}',
|
||||
'Access-Control-Expose-Headers': 'Content-Disposition'
|
||||
}
|
||||
"Content-Disposition": f"attachment; filename={urllib.parse.quote('用户导入模板.xlsx')}",
|
||||
"Access-Control-Expose-Headers": "Content-Disposition",
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
@UserRouter.post('/export', summary="导出用户", description="导出用户")
|
||||
@UserRouter.post("/export", summary="导出用户", description="导出用户")
|
||||
async def export_obj_list_controller(
|
||||
page: Annotated[PaginationQueryParam, Depends()],
|
||||
search: Annotated[UserQueryParam, Depends()],
|
||||
@@ -338,23 +361,23 @@ async def export_obj_list_controller(
|
||||
返回:
|
||||
- StreamingResponse: 用户导出模板流响应
|
||||
"""
|
||||
user_list = await UserService.get_user_list_service(auth=auth, search=search, order_by=page.order_by)
|
||||
user_list = await UserService.get_user_list_service(
|
||||
auth=auth, search=search, order_by=page.order_by
|
||||
)
|
||||
user_export_result = await UserService.export_user_list_service(user_list)
|
||||
log.info('导出用户成功')
|
||||
log.info("导出用户成功")
|
||||
|
||||
return StreamResponse(
|
||||
data=bytes2file_response(user_export_result),
|
||||
media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||
headers={
|
||||
'Content-Disposition': 'attachment; filename=user.xlsx'
|
||||
}
|
||||
media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
||||
headers={"Content-Disposition": "attachment; filename=user.xlsx"},
|
||||
)
|
||||
|
||||
|
||||
@UserRouter.post('/import/data', summary="导入用户", description="导入用户")
|
||||
@UserRouter.post("/import/data", summary="导入用户", description="导入用户")
|
||||
async def import_obj_list_controller(
|
||||
file: UploadFile,
|
||||
auth: Annotated[AuthSchema, Depends(AuthPermission(["module_system:user:import"]))]
|
||||
auth: Annotated[AuthSchema, Depends(AuthPermission(["module_system:user:import"]))],
|
||||
) -> JSONResponse:
|
||||
"""
|
||||
导入用户
|
||||
@@ -366,6 +389,8 @@ async def import_obj_list_controller(
|
||||
返回:
|
||||
- JSONResponse: 导入用户JSON响应
|
||||
"""
|
||||
batch_import_result = await UserService.batch_import_user_service(file=file, auth=auth, update_support=True)
|
||||
batch_import_result = await UserService.batch_import_user_service(
|
||||
file=file, auth=auth, update_support=True
|
||||
)
|
||||
log.info(f"导入用户成功: {batch_import_result}")
|
||||
return SuccessResponse(data=batch_import_result, msg="导入用户成功")
|
||||
|
||||
Reference in New Issue
Block a user