修正了程序，优化了目录

routes/auth.py

@@ -2,9 +2,9 @@ from fastapi import APIRouter, Depends, HTTPException
 from fastapi.security import OAuth2PasswordBearer
 from sqlalchemy.ext.asyncio import AsyncSession
 from schemas.auth import TokenResponse, LoginRequest, RefreshTokenRequest
-from services.auth_service import create_tokens_response, verify_token, refresh_tokens
-from services.user_services import authenticate_user
-from services.db import get_db
+from services.auth import create_tokens_response, verify_token, refresh_tokens
+from services.user import authenticate_user
+from services.db import get_db_session
 
 router = APIRouter(tags=["auth"])
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
@@ -12,7 +12,7 @@ oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
 @router.post("/login", response_model=TokenResponse)
 async def login(
     login_data: LoginRequest,
-    session: AsyncSession = Depends(get_db)
+    session: AsyncSession = Depends(get_db_session)
 ):
     user = await authenticate_user(session, login_data.username, login_data.password)
     if not user:

routes/depends.py

@@ -3,7 +3,7 @@ from fastapi.security import OAuth2PasswordBearer
 from typing import Optional
 from schemas.auth import TokenPayload
 from schemas.user import UserRole
-from services.auth_service import verify_token
+from services.auth import verify_token
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="auth/login")
 

routes/users.py

@@ -3,7 +3,7 @@ from typing import List, Optional
 from schemas.auth import TokenPayload
 from schemas.user import UserCreate, UserUpdate, UserResponse, UserRole
 from routes.depends import get_current_user,get_current_admin
-from services.user_services import get_user_by_id,get_users,create_user,update_user,delete_user
+from services.user import get_users,create_user,update_user,delete_user#,get_user_by_id
 from services.db import get_db_session
 
 router = APIRouter(tags=["users"])
@@ -15,12 +15,12 @@ async def get_users(
     role: Optional[str] = None,
     current_user_token: TokenPayload = Depends(get_current_user)
 ):
-    current_user = await get_user_by_id(current_user_token.id)
-    if current_user is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="User not found"
-        )
+    # current_user = await get_user_by_id(current_user_token.id)
+    # if current_user is None:
+    #     raise HTTPException(
+    #         status_code=status.HTTP_404_NOT_FOUND,
+    #         detail="User not found"
+    #     )
     async with get_db_session() as session:
         skip = (page - 1) * limit
         users = await get_users(session, skip=skip, limit=limit)