GithubBackup/gemini-balance
1
0
Fork 0
mirror of https://github.com/snailyp/gemini-balance.git synced 2026-09-04 23:19:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): 将服务配置改为从 settings 获取

Browse Source 
将 SecurityService, ModelService, EmbeddingService 的配置依赖从构造函数注入改为直接从 app.config.config.settings 获取。

这简化了服务类的实例化过程，并实现了配置的集中管理。
This commit is contained in:
snaily
2025-04-12 21:35:38 +08:00
parent aea2f39952
commit 0dd9dd5380
5 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/core/security.py
+7 -10
View File
@@ -13,12 +13,9 @@ def verify_auth_token(token: str) -> bool:
class SecurityService:
def __init__(self, allowed_tokens: list, auth_token: str):
self.allowed_tokens = allowed_tokens
self.auth_token = auth_token
async def verify_key(self, key: str):
if key not in self.allowed_tokens and key != self.auth_token:
if key not in settings.ALLOWED_TOKENS and key != settings.AUTH_TOKEN:
logger.error("Invalid key")
raise HTTPException(status_code=401, detail="Invalid key")
return key
@@ -37,7 +34,7 @@ class SecurityService:
)
token = authorization.replace("Bearer ", "")
if token not in self.allowed_tokens and token != self.auth_token:
if token not in settings.ALLOWED_TOKENS and token != settings.AUTH_TOKEN:
logger.error("Invalid token")
raise HTTPException(status_code=401, detail="Invalid token")
@@ -52,8 +49,8 @@ class SecurityService:
raise HTTPException(status_code=401, detail="Missing x-goog-api-key header")
if (
x_goog_api_key not in self.allowed_tokens
and x_goog_api_key != self.auth_token
x_goog_api_key not in settings.ALLOWED_TOKENS
and x_goog_api_key != settings.AUTH_TOKEN
):
logger.error("Invalid x-goog-api-key")
raise HTTPException(status_code=401, detail="Invalid x-goog-api-key")
@@ -67,7 +64,7 @@ class SecurityService:
logger.error("Missing auth_token header")
raise HTTPException(status_code=401, detail="Missing auth_token header")
token = authorization.replace("Bearer ", "")
if token != self.auth_token:
if token != settings.AUTH_TOKEN:
logger.error("Invalid auth_token")
raise HTTPException(status_code=401, detail="Invalid auth_token")
@@ -78,7 +75,7 @@ class SecurityService:
) -> str:
"""验证URL中的key或请求头中的x-goog-api-key"""
# 如果URL中的key有效，直接返回
if key in self.allowed_tokens or key == self.auth_token:
if key in settings.ALLOWED_TOKENS or key == settings.AUTH_TOKEN:
return key
# 否则检查请求头中的x-goog-api-key
@@ -86,7 +83,7 @@ class SecurityService:
logger.error("Invalid key and missing x-goog-api-key header")
raise HTTPException(status_code=401, detail="Invalid key and missing x-goog-api-key header")
if x_goog_api_key not in self.allowed_tokens and x_goog_api_key != self.auth_token:
if x_goog_api_key not in settings.ALLOWED_TOKENS and x_goog_api_key != settings.AUTH_TOKEN:
logger.error("Invalid key and invalid x-goog-api-key")
raise HTTPException(status_code=401, detail="Invalid key and invalid x-goog-api-key")