修改信息更新的请求方式(user.py, dict.py)
This commit is contained in:
parent
3fb098c90c
commit
0d46aaa3f0
|
|
@ -5,7 +5,7 @@ from tortoise.exceptions import DoesNotExist
|
||||||
|
|
||||||
from app.models.base import User
|
from app.models.base import User
|
||||||
from app.models.fr import DefinitionFr
|
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
|
from app.api.admin.router import admin_router
|
||||||
import app.models.fr as fr
|
import app.models.fr as fr
|
||||||
import app.models.jp as jp
|
import app.models.jp as jp
|
||||||
|
|
@ -17,7 +17,7 @@ async def get_wordlist(request: Request,
|
||||||
page: int = Query(1, ge=1),
|
page: int = Query(1, ge=1),
|
||||||
page_size: int = Query(10, le=10),
|
page_size: int = Query(10, le=10),
|
||||||
lang_code: Literal["fr", "jp"] = "fr",
|
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: 请求头
|
:param request: 请求头
|
||||||
|
|
@ -56,7 +56,7 @@ async def get_wordlist(request: Request,
|
||||||
async def search_word(
|
async def search_word(
|
||||||
request: Request,
|
request: Request,
|
||||||
search_word: SearchWordRequest,
|
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
|
return result
|
||||||
|
|
||||||
|
|
||||||
@admin_router.post("/dict/adjust")
|
@admin_router.put("/dict/adjust")
|
||||||
async def adjust_dict(
|
async def adjust_dict(
|
||||||
request: Request,
|
request: Request,
|
||||||
updated_contents: UpdateWordSet,
|
updated_contents: UpdateWordSet,
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,13 @@ async def register(user_in: UserIn):
|
||||||
pwd_hashed=hashed_pwd,
|
pwd_hashed=hashed_pwd,
|
||||||
language=lang_pref, # 后续检查参数是否正确
|
language=lang_pref, # 后续检查参数是否正确
|
||||||
portrait=user_in.portrait)
|
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)):
|
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)
|
reserved_words = await ReservedWords.filter(category="username").values_list("reserved", flat=True)
|
||||||
# 验证当前密码
|
# 验证当前密码
|
||||||
|
|
@ -61,7 +64,7 @@ async def user_login(user_in: UserLoginRequest):
|
||||||
payload = {
|
payload = {
|
||||||
"user_id": user.id,
|
"user_id": user.id,
|
||||||
"exp": datetime.now(timezone.utc) + timedelta(hours=2), # 设置过期时间
|
"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")
|
token = jwt.encode(payload, SECRET_KEY, algorithm="HS256")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue