diff --git a/app/core/security.py b/app/core/security.py index fee46132..3fbb57c1 100644 --- a/app/core/security.py +++ b/app/core/security.py @@ -5,11 +5,11 @@ import json import os import traceback from datetime import datetime, timedelta -from typing import Any, Union, Optional +from typing import Any, Union, Optional, Annotated import jwt from Crypto.Cipher import AES from Crypto.Util.Padding import pad -from fastapi import HTTPException, status, Depends +from fastapi import HTTPException, status, Depends, Header from fastapi.security import OAuth2PasswordBearer from passlib.context import CryptContext @@ -68,11 +68,11 @@ def get_token(token: str = None) -> str: return token -def get_apikey(apikey: str = None) -> str: +def get_apikey(apikey: str = None, x_api_key: Annotated[str | None, Header()] = None) -> str: """ 从请求URL中获取apikey """ - return apikey + return apikey or x_api_key def verify_uri_token(token: str = Depends(get_token)) -> str: