修复数据库构建问题

routes/admin.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter
-from typing import Annotated, Literal, Optional
+from typing import Annotated, Literal
 from fastapi import Depends, Query
 from fastapi import HTTPException
 import JWT
@@ -8,9 +8,14 @@ from jwt import InvalidTokenError
 from model import database
 from model.response import DefaultResponse
 from model.items import Item
+from sqlmodel.ext.asyncio.session import AsyncSession
+from model import Setting
 
 # 验证是否为管理员
-async def is_admin(token: Annotated[str, Depends(JWT.oauth2_scheme)]) -> Literal[True]:
+async def is_admin(
+        token: Annotated[str, Depends(JWT.oauth2_scheme)],
+        session: Annotated[AsyncSession, Depends(database.Database.get_session)]
+) -> Literal[True]:
     '''
     验证是否为管理员。
     
@@ -24,9 +29,9 @@ async def is_admin(token: Annotated[str, Depends(JWT.oauth2_scheme)]) -> Literal
     )
     
     try:
-        payload = jwt.decode(token, JWT.SECRET_KEY, algorithms=[JWT.ALGORITHM])
+        payload = jwt.decode(token, JWT.get_secret_key(), algorithms=[JWT.ALGORITHM])
         username = payload.get("sub")
-        if username is None or not await database.Database().get_setting('account') == username:
+        if username is None or not await Setting.get(session, Setting.name == 'account') == username:
             raise credentials_exception
         else:
             return True
@@ -64,8 +69,8 @@ async def verity_admin() -> DefaultResponse:
     response_description='物品信息列表'
 )
 async def get_items(
-    id: Optional[int] = Query(default=None, ge=1, description='物品ID'),
-    key: Optional[str] = Query(default=None, description='物品序列号')):
+    id: int | None = Query(default=None, ge=1, description='物品ID'),
+    key: str | None = Query(default=None, description='物品序列号')):
     '''
     获得物品信息。
     
@@ -80,7 +85,6 @@ async def get_items(
             items = results
         item = []
         for i in items:
-            print(i)
             item.append(Item(
                 id=i[0],
                 type=i[1],
@@ -144,14 +148,15 @@ async def add_items(
 )
 async def update_items(
     id: int = Query(ge=1),
-    key: Optional[str] = None,
-    name: Optional[str] = None,
-    icon: Optional[str] = None,
-    status: Optional[str] = None,
-    phone: Optional[int] = None,
-    lost_description: Optional[str] = None,
-    find_ip: Optional[str] = None,
-    lost_time: Optional[str] = None) -> DefaultResponse:
+    key: str | None = None,
+    name: str | None = None,
+    icon: str | None = None,
+    status: str | None = None,
+    phone: int | None = None,
+    lost_description: str | None = None,
+    find_ip: str | None = None,
+    lost_time: str | None = None
+    ) -> DefaultResponse:
     '''
     更新物品信息。
     

routes/session.py

@@ -5,31 +5,38 @@ from fastapi import Depends, HTTPException
 from fastapi.security import OAuth2PasswordRequestForm
 from fastapi import APIRouter
 import jwt, JWT
+from sqlmodel.ext.asyncio.session import AsyncSession
+from tool import verify_password
+from loguru import logger
 
 from model.token import Token
 from model import Setting, database
-from tool import verify_password
 
 Router = APIRouter(tags=["令牌 session"])
 
 # 创建令牌
-def create_access_token(data: dict, expires_delta: timedelta | None = None):
+async def create_access_token(data: dict, expires_delta: timedelta | None = None):
     to_encode = data.copy()
     if expires_delta:
         expire = datetime.now(timezone.utc) + expires_delta
     else:
         expire = datetime.now(timezone.utc) + timedelta(minutes=15)
     to_encode.update({"exp": expire})
-    encoded_jwt = jwt.encode(to_encode, JWT.SECRET_KEY, algorithm='HS256')
+    encoded_jwt = jwt.encode(to_encode, key=await JWT.get_secret_key(), algorithm='HS256')
     return encoded_jwt
 
 # 验证账号密码
-async def authenticate_user(username: str, password: str):
+async def authenticate_user(session: AsyncSession, username: str, password: str):
     # 验证账号和密码
-    account = await Setting.get('setting', 'account')
-    stored_password = await Setting.get('setting', 'password')
+    account = await Setting.get(session, Setting.name == 'account')
+    stored_password = await Setting.get(session, Setting.name == 'password')
 
-    if account != username or not verify_password(stored_password, password):
+    if not account or not stored_password:
+        logger.error("Account or password not set in settings.")
+        return False
+
+    if account != username or not verify_password(stored_password.value, password):
+        logger.error("Invalid username or password.")
         return False
     
     return {'is_authenticated': True}
@@ -44,8 +51,13 @@ async def authenticate_user(username: str, password: str):
 )
 async def login_for_access_token(
     form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
+    session: Annotated[AsyncSession, Depends(database.Database.get_session)],
 ) -> Token:
-    user = await authenticate_user(form_data.username, form_data.password)
+    user = await authenticate_user(
+        session=session, 
+        username=form_data.username, 
+        password=form_data.password
+    )
     if not user:
         raise HTTPException(
             status_code=401,
@@ -53,7 +65,7 @@ async def login_for_access_token(
             headers={"WWW-Authenticate": "Bearer"},
         )
     access_token_expires = timedelta(hours=1)
-    access_token = create_access_token(
+    access_token = await create_access_token(
         data={"sub": form_data.username}, expires_delta=access_token_expires
     )
     return Token(access_token=access_token, token_type="bearer")