From cdb5f8bf45f117831959291c89e0694606ebb479 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 04 十二月 2024 17:28:58 +0800
Subject: [PATCH] 增加公开api
---
app/api/user.py | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index 4390296..e9d34b3 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.public_api_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,8 +11,10 @@
@user_router.get("/list", response_model=Response)
-async def user_list(paras: PageParameter,current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- return Response(code=200, msg="", data=await get_user_list(db, paras.page_size, paras.page_index, paras.keyword))
+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))
@user_router.post("/add_user", response_model=Response)
@@ -24,7 +27,8 @@
pwd = user.pwd
if not pwd:
pwd = "000000"
- is_create = await create_user(db, user.userName, user.email, user.phone, user.loginName, pwd, user.roles, user.groups)
+ is_create = await create_user(db, user.userName, user.email, user.phone, user.loginName, pwd, user.roles,
+ user.groups, current_user.id)
if not is_create:
return Response(code=500, msg="user create failure", data={})
return Response(code=200, msg="user create successfully", data={})
@@ -53,7 +57,7 @@
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_status(db, user.status,user.userId)
+ is_edit = await edit_user_status(db, user.status, user.userId)
if not is_edit:
return Response(code=500, msg="user status edit failure", data={})
return Response(code=200, msg="user status edit successfully", data={})
@@ -71,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={})
\ No newline at end of file
+ return Response(code=200, msg="user pwd reset successfully", data={})
--
Gitblit v1.8.0