From 773399347db56357a0ba0630e960a73ed16b615d Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 8 Sep 2024 14:53:52 +0800
Subject: [PATCH] fix user api

---
 app/api/endpoints/user.py | 8 ++++----
 app/schemas/user.py       | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/api/endpoints/user.py b/app/api/endpoints/user.py
index 60a2e045..56172be3 100644
--- a/app/api/endpoints/user.py
+++ b/app/api/endpoints/user.py
@@ -182,16 +182,16 @@ def delete_user(
     return schemas.Response(success=True)
 
 
-@router.get("/{user_id}", summary="用户详情", response_model=schemas.User)
+@router.get("/{username}", summary="用户详情", response_model=schemas.User)
 def read_user_by_id(
-        user_id: int,
+        username: str,
         current_user: User = Depends(get_current_active_user),
         db: Session = Depends(get_db),
 ) -> Any:
     """
     查询用户详情
     """
-    user = current_user.get(db, rid=user_id)
+    user = current_user.get_by_name(db, name=username)
     if not user:
         raise HTTPException(
             status_code=404,
@@ -199,7 +199,7 @@ def read_user_by_id(
         )
     if user == current_user:
         return user
-    if not user.is_superuser:
+    if not current_user.is_superuser:
         raise HTTPException(
             status_code=400,
             detail="用户权限不足"
diff --git a/app/schemas/user.py b/app/schemas/user.py
index fab99579..5da2b375 100644
--- a/app/schemas/user.py
+++ b/app/schemas/user.py
@@ -43,12 +43,14 @@ class UserCreate(UserBase):
     name: str
     email: Optional[str] = None
     password: Optional[str] = None
+    settings: Optional[dict] = {}
 
 
 # Properties to receive via API on update
 class UserUpdate(UserBase):
     name: str
     password: Optional[str] = None
+    settings: Optional[dict] = {}
 
 
 class UserInDBBase(UserBase):