From b272fec78e30d1a10f3ab761684a119193391296 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 19 十一月 2024 17:08:57 +0800
Subject: [PATCH] 解决冲突
---
app/api/user.py | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index 1e2db47..6b6c866 100644
--- a/app/api/user.py
+++ b/app/api/user.py
@@ -1,5 +1,6 @@
from fastapi import APIRouter, Depends
from app.api import Response, pwd_context, get_current_user
+from app.models.app_model import AppRegisterModel
from app.models.base_model import get_db
from app.models.user import PageParameter, UserStatus, UserInfo, LoginData
from app.models.user_model import UserModel
@@ -10,7 +11,7 @@
@user_router.get("/list", response_model=Response)
-async def user_list(current, pageSize, keyword="", current_user: UserModel = Depends(get_current_user),
+async def user_list(current:int, pageSize:int, keyword="", current_user: UserModel = Depends(get_current_user),
db=Depends(get_db)):
return Response(code=200, msg="", data=await get_user_list(db, current, pageSize, keyword,
current_user.permission, current_user.id))
@@ -74,11 +75,8 @@
@user_router.put("/reset_pwd", response_model=Response)
-async def reset_user_pwd(user: UserStatus, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- db_user = db.query(UserModel).filter(UserModel.id == user.userId).first()
- if not db_user:
- return Response(code=200, msg="user does not exist")
- is_edit = await edit_user_pwd(db, user.userId)
+async def reset_user_pwd(user: UserStatus, current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ is_edit = await edit_user_pwd(db, user.userId, current_user.id)
if not is_edit:
return Response(code=500, msg="user pwd reset failure", data={})
return Response(code=200, msg="user pwd reset successfully", data={})
--
Gitblit v1.8.0