From 0d46aaa3f097297a98d7700efac07333860431a8 Mon Sep 17 00:00:00 2001
From: Miyamizu-MitsuhaSang <2510681107@qq.com>
Date: Sat, 16 Aug 2025 17:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F=EF=BC=88?=
 =?UTF-8?q?user.py,=20dict.py)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/admin/dict.py | 8 ++++----
 app/api/users.py      | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/api/admin/dict.py b/app/api/admin/dict.py
index 4555b78..dbe5e89 100644
--- a/app/api/admin/dict.py
+++ b/app/api/admin/dict.py
@@ -5,7 +5,7 @@ from tortoise.exceptions import DoesNotExist
 
 from app.models.base import User
 from app.models.fr import DefinitionFr
-from app.utils.security import get_current_user
+from app.utils.security import is_admin_user
 from app.api.admin.router import admin_router
 import app.models.fr as fr
 import app.models.jp as jp
@@ -17,7 +17,7 @@ async def get_wordlist(request: Request,
                        page: int = Query(1, ge=1),
                        page_size: int = Query(10, le=10),
                        lang_code: Literal["fr", "jp"] = "fr",
-                       admin_user: Tuple[User, dict] = Depends(get_current_user)):
+                       admin_user: Tuple[User, dict] = Depends(is_admin_user)):
     """
     后台管理系统中关于词典部分的初始界面，分页显示
     :param request: 请求头
@@ -56,7 +56,7 @@ async def get_wordlist(request: Request,
 async def search_word(
         request: Request,
         search_word: SearchWordRequest,
-        admin_user: Tuple[User, dict] = Depends(get_current_user),
+        admin_user: Tuple[User, dict] = Depends(is_admin_user),
 ):
     """
     查询单词
@@ -102,7 +102,7 @@ async def search_word(
         return result
 
 
-@admin_router.post("/dict/adjust")
+@admin_router.put("/dict/adjust")
 async def adjust_dict(
         request: Request,
         updated_contents: UpdateWordSet,
diff --git a/app/api/users.py b/app/api/users.py
index c47a157..7f34085 100644
--- a/app/api/users.py
+++ b/app/api/users.py
@@ -27,10 +27,13 @@ async def register(user_in: UserIn):
                                  pwd_hashed=hashed_pwd,
                                  language=lang_pref,  # 后续检查参数是否正确
                                  portrait=user_in.portrait)
-    return new_user
+    return {
+        "id": new_user.id,
+        "message": "register success",
+    }
 
 
-@users_router.post("/update")
+@users_router.put("/update")
 async def user_modification(updated_user: UpdateUserRequest, current_user: User = Depends(get_current_user)):
     reserved_words = await ReservedWords.filter(category="username").values_list("reserved", flat=True)
     # 验证当前密码
@@ -61,7 +64,7 @@ async def user_login(user_in: UserLoginRequest):
     payload = {
         "user_id": user.id,
         "exp": datetime.now(timezone.utc) + timedelta(hours=2),  # 设置过期时间
-        "is_admin" : user.is_admin,
+        "is_admin": user.is_admin,
     }
 
     token = jwt.encode(payload, SECRET_KEY, algorithm="HS256")