diff --git a/__pycache__/dependencies.cpython-310.pyc b/__pycache__/dependencies.cpython-310.pyc index a78ebeb..bc09fcc 100644 Binary files a/__pycache__/dependencies.cpython-310.pyc and b/__pycache__/dependencies.cpython-310.pyc differ diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc index 2422912..8f2c201 100644 Binary files a/__pycache__/main.cpython-310.pyc and b/__pycache__/main.cpython-310.pyc differ diff --git a/dependencies.py b/dependencies.py index a57f9c0..262d5d5 100644 --- a/dependencies.py +++ b/dependencies.py @@ -12,7 +12,7 @@ ALGORITHM = "HS256" ACCESS_TOKEN_EXPIRE_MINUTES = 30 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") -oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token") +oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/users/token") # 创建访问令牌 def create_access_token(data: dict, expires_delta: timedelta): diff --git a/internal/__pycache__/database.cpython-310.pyc b/internal/__pycache__/database.cpython-310.pyc index 2c0218f..5de8857 100644 Binary files a/internal/__pycache__/database.cpython-310.pyc and b/internal/__pycache__/database.cpython-310.pyc differ diff --git a/internal/__pycache__/models.cpython-310.pyc b/internal/__pycache__/models.cpython-310.pyc index 782f6da..f4b751e 100644 Binary files a/internal/__pycache__/models.cpython-310.pyc and b/internal/__pycache__/models.cpython-310.pyc differ diff --git a/internal/models.py b/internal/models.py index 564d59a..a5c278a 100644 --- a/internal/models.py +++ b/internal/models.py @@ -1,6 +1,6 @@ from pydantic import BaseModel,Field from typing import Annotated -from datetime import datetime + # Token相关的模型 class Token(BaseModel): access_token: str diff --git a/main.py b/main.py index 6fac410..f6a7f48 100644 --- a/main.py +++ b/main.py @@ -52,9 +52,7 @@ async def register_user(user: UserInDB, _: User = Depends(get_current_active_use # 返回创建的用户信息 return {"status":status.HTTP_200_OK,"message":"users create successfully!"} -@app.get("/users/me/", response_model=User) -async def read_users_me(current_user: User = Depends(get_current_active_user)): - return current_user + @app.get("/users/me/items/") async def read_own_items(current_user: User = Depends(get_current_active_user)): diff --git a/routers/__pycache__/usermanage.cpython-310.pyc b/routers/__pycache__/usermanage.cpython-310.pyc index 11b4276..4ee3b5b 100644 Binary files a/routers/__pycache__/usermanage.cpython-310.pyc and b/routers/__pycache__/usermanage.cpython-310.pyc differ diff --git a/routers/usermanage.py b/routers/usermanage.py index 88105dd..6dbdd7e 100644 --- a/routers/usermanage.py +++ b/routers/usermanage.py @@ -7,6 +7,7 @@ from dependencies import * from internal.models import Token from fastapi.middleware.cors import CORSMiddleware router=APIRouter( + prefix="/users", tags=["用户管理"] ) @@ -26,4 +27,8 @@ async def login_for_access_token( access_token = create_access_token( data={"sub": user.username}, expires_delta=access_token_expires ) - return {"access_token": access_token, "token_type": "bearer"} \ No newline at end of file + return {"access_token": access_token, "token_type": "bearer"} + +@router.get("/me/", response_model=User) +async def read_users_me(current_user: User = Depends(get_current_active_user)): + return current_user \ No newline at end of file