adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/v0.3.2' into fix/Timebomb_032

Browse Source
This commit is contained in:
Timebomb2018
2026-04-27 15:36:03 +08:00
parent faf8d1a51a d9de96cffa
commit f7fa33c0c4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/app/services/api_key_service.py
View File

@@ -9,7 +9,7 @@ from sqlalchemy.orm import Session
from sqlalchemy import select from sqlalchemy import select
from app.aioRedis import aio_redis from app.aioRedis import aio_redis
from app.models.api_key_model import ApiKey from app.models.api_key_model import ApiKey, ApiKeyType
from app.repositories.api_key_repository import ApiKeyRepository, ApiKeyLogRepository from app.repositories.api_key_repository import ApiKeyRepository, ApiKeyLogRepository
from app.schemas import api_key_schema from app.schemas import api_key_schema
from app.schemas.response_schema import PageData, PageMeta from app.schemas.response_schema import PageData, PageMeta
@@ -65,7 +65,8 @@ class ApiKeyService:
BizCode.BAD_REQUEST BizCode.BAD_REQUEST
) )
if data.resource_id: # SERVICE 类型的 resource_id 指向 workspace，非应用，跳过应用发布校验
if data.resource_id and data.type != ApiKeyType.SERVICE.value:
app = db.get(App, data.resource_id) app = db.get(App, data.resource_id)
if not app or not app.current_release_id: if not app or not app.current_release_id:
raise BusinessException("该应用未发布", BizCode.APP_NOT_PUBLISHED) raise BusinessException("该应用未发布", BizCode.APP_NOT_PUBLISHED)
@@ -452,9 +453,12 @@ class ApiKeyAuthService:
def check_app_published(db: Session, api_key_obj: ApiKey) -> None: def check_app_published(db: Session, api_key_obj: ApiKey) -> None:
""" """
检查应用是否已发布，未发布则抛出异常 检查应用是否已发布，未发布则抛出异常
SERVICE 类型的 api_key 不绑定应用（resource_id 指向 workspace），跳过校验
""" """
if not api_key_obj.resource_id: if not api_key_obj.resource_id:
return return
if api_key_obj.type == ApiKeyType.SERVICE.value:
return
app = db.get(App, api_key_obj.resource_id) app = db.get(App, api_key_obj.resource_id)
if not app or not app.current_release_id: if not app or not app.current_release_id:
raise BusinessException("应用未发布，不可用", BizCode.APP_NOT_PUBLISHED) raise BusinessException("应用未发布，不可用", BizCode.APP_NOT_PUBLISHED)