From 057f034d4cd728c1bd0284e7c6b4a47739d5220d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 12 十二月 2024 19:57:41 +0800
Subject: [PATCH] yonghu
---
app/api/user.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index 1e2db47..506c1b4 100644
--- a/app/api/user.py
+++ b/app/api/user.py
@@ -1,16 +1,18 @@
from fastapi import APIRouter, Depends
-from app.api import Response, pwd_context, get_current_user
+from app.api import Response, pwd_context, get_current_user, ResponseList
+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
+from app.service.auth import is_valid_password
from app.service.user import get_user_list, edit_user_status, delete_user_data, create_user, edit_user_data, \
- edit_user_pwd
+ edit_user_pwd, get_user_info, get_user_routers, get_user_menus, get_user_permission, get_user_dept
user_router = APIRouter()
@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))
@@ -20,12 +22,15 @@
async def add_user(user: UserInfo, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
if not user.userName:
return Response(code=400, msg="The userName cannot be empty!")
+ if user.pwd:
+ if not is_valid_password(user.pwd):
+ return Response(code=400, msg="The password must be at least 8 and contain both numbers and letters")
db_user = db.query(UserModel).filter(UserModel.username == user.userName).first()
if db_user:
return Response(code=200, msg="user already created")
pwd = user.pwd
if not pwd:
- pwd = "000000"
+ pwd = "basic123456"
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:
@@ -74,11 +79,44 @@
@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={})
+
+
+@user_router.get("/user_info", response_model=Response)
+async def user_info(current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ user_info = await get_user_info(db, current_user.id)
+ if not user_info:
+ return Response(code=500, msg="user get failure", data={})
+ return Response(code=200, msg="successfully", data=user_info)
+
+
+@user_router.get("/user_routers", response_model=Response)
+async def user_routers(current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ routers = await get_user_routers(db, current_user.id)
+ if not routers:
+ return Response(code=500, msg="user get failure", data={})
+ return Response(code=200, msg="successfully", data=routers)
+
+
+@user_router.get("/menus", response_model=ResponseList)
+async def user_menus(keyword="", current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ menus = await get_user_menus(db, current_user.id)
+ # return Response(code=200, msg="successfully", data=menus)
+ # result = [item.to_dict() for item in agents]
+ return ResponseList(code=200, msg="successfully", data=menus)
+
+
+@user_router.get("/permission", response_model=Response)
+async def user_permission(userId:int, current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ menus = await get_user_permission(db, userId)
+ return Response(code=200, msg="successfully", data=menus)
+
+
+@user_router.get("/dept", response_model=Response)
+async def user_dept_api(userId:int, current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ menus = await get_user_dept(db, userId)
+ return Response(code=200, msg="successfully", data=menus)
\ No newline at end of file
--
Gitblit v1.8.0