From f2c43713b16e821f4a1ae97804c60f18734d5f6a Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 13 十二月 2024 17:25:12 +0800
Subject: [PATCH] 问题优化
---
app/api/user.py | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index e9d34b3..78666b4 100644
--- a/app/api/user.py
+++ b/app/api/user.py
@@ -1,11 +1,12 @@
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.api import Response, pwd_context, get_current_user, ResponseList
from app.models.base_model import get_db
-from app.models.user import PageParameter, UserStatus, UserInfo, LoginData
+from app.models.user import PageParameter, UserStatus, UserInfo, LoginData, UserPassword
from app.models.user_model import UserModel
+from app.service.auth import is_valid_password, verify_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, change_user_pwd, \
+ user_data_service
user_router = APIRouter()
@@ -21,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:
@@ -80,3 +84,62 @@
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.put("/change_password", response_model=Response)
+async def change_user_password(user: UserPassword, current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ user_info = db.query(UserModel).filter(UserModel.id==current_user.id).first()
+ if not user_info:
+ return Response(code=401, msg="Incorrect change password !")
+ if not verify_password(user.oldPassword, user_info.hashed_password):
+ return Response(code=400, msg="Incorrect password !")
+ if not is_valid_password(user.newPassword):
+ return Response(code=400, msg="The password must be at least 8 and contain both numbers and letters")
+ is_edit = await change_user_pwd(db, user_info.id, user.newPassword)
+ if not is_edit:
+ return Response(code=500, msg="user pwd change failure", data={})
+ return Response(code=200, msg="user pwd change success", 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)
+
+
+@user_router.get("/user_data", response_model=Response)
+async def user_data_api(userId, current_user: UserModel = Depends(get_current_user),db=Depends(get_db)):
+ user_info = await user_data_service(db, userId)
+ if not user_info:
+ return Response(code=500, msg="user get failure", data={})
+ return Response(code=200, msg="successfully", data=user_info)
\ No newline at end of file
--
Gitblit v1.8.0