super/yaoyaoai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
fengchuanhn@gmail.com
2026-05-22 16:49:02 +08:00
parent a58b0e3bd6
commit 80958994a2
12 changed files with 302 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
app/api/v1/agent_card_keys.py
View File

@@ -1,25 +1,21 @@
"""管理员卡密 CRUD。"""
"""代理卡密：列表、代理备注。"""
from typing import Literal
from fastapi import APIRouter, Query
from app.dependencies import AgentUser, DbSession
from app.schemas.admin_card_key import (
CardKeyBatchCreateResult,
CardKeyCreate,
CardKeyOut,
CardKeyUpdate,
)
from app.schemas.admin_card_key import CardKeyOut
from app.schemas.agent_card_key import AgentCardKeyUpdate
from app.schemas.common import ApiResponse, PaginatedData
from app.services import agent_card_key as card_key_service
router = APIRouter(prefix="/agent/card-keys", tags=["管理-卡密"])
router = APIRouter(prefix="/agent/card-keys", tags=["代理-卡密"])
@router.get("", response_model=ApiResponse[PaginatedData[CardKeyOut]])
async def list_card_keys(
_agent: AgentUser,
agent: AgentUser,
db: DbSession,
page: int = Query(1, ge=1),
page_size: int = Query(
@@ -32,17 +28,15 @@ async def list_card_keys(
description="筛选：all 全部 / unused 未使用 / used 已激活",
),
username: str | None = Query(default=None, description="按激活用户名模糊筛选"),
oem_id: int | None = Query(default=None, description="按预分配 OEM 筛选"),
agent_id: int | None = Query(default=None, description="按预分配代理筛选"),
) -> ApiResponse[PaginatedData[CardKeyOut]]:
filter_status = None if status == "all" else status
cards, total = await card_key_service.list_card_keys(
db,
agent_id=agent.id,
page=page,
page_size=page_size,
status=filter_status,
username=username,
agent_id=_agent.id,
)
return ApiResponse(
ok=True,
@@ -56,53 +50,22 @@ async def list_card_keys(
)
@router.post("", response_model=ApiResponse[CardKeyBatchCreateResult])
async def create_card_keys(
body: CardKeyCreate,
_admin: AgentUser,
db: DbSession,
) -> ApiResponse[CardKeyBatchCreateResult]:
try:
created = await card_key_service.create_card_keys(db, body)
except card_key_service.AdminCardKeyError as exc:
return ApiResponse(ok=False, message=exc.message)
items = [CardKeyOut.model_validate(c) for c in created]
return ApiResponse(
ok=True,
message=f"已生成 {len(items)} 张卡密",
data=CardKeyBatchCreateResult(items=items, created_count=len(items)),
)
@router.patch("/{card_id}", response_model=ApiResponse[CardKeyOut])
async def update_card_key(
card_id: int,
body: CardKeyUpdate,
_admin: AgentUser,
body: AgentCardKeyUpdate,
agent: AgentUser,
db: DbSession,
) -> ApiResponse[CardKeyOut]:
try:
card = await card_key_service.update_card_key(db, card_id, body)
except card_key_service.AdminCardKeyError as exc:
card = await card_key_service.update_card_key(
db, card_id, body, agent_id=agent.id
)
except card_key_service.AgentCardKeyError as exc:
return ApiResponse(ok=False, message=exc.message)
return ApiResponse(
ok=True,
message="卡密已更新",
message="备注已更新",
data=CardKeyOut.model_validate(card),
)
@router.delete("/{card_id}", response_model=ApiResponse[None])
async def delete_card_key(
card_id: int,
_admin: AgentUser,
db: DbSession,
) -> ApiResponse[None]:
try:
await card_key_service.delete_card_key(db, card_id)
except card_key_service.AdminCardKeyError as exc:
return ApiResponse(ok=False, message=exc.message)
return ApiResponse(ok=True, message="卡密已删除")

69
app/api/v1/agent_users.py
View File

@@ -1,18 +1,18 @@
"""管理员用户 CRUD。"""
"""代理：仅查看名下用户（agent_id 匹配）。"""
from fastapi import APIRouter, Query
from app.dependencies import AgentUser, DbSession
from app.schemas.admin_user import AdminUserCreate, AdminUserOut, AdminUserUpdate
from app.schemas.admin_user import AdminUserOut
from app.schemas.common import ApiResponse, PaginatedData
from app.services import agent_user as agent_user_service
router = APIRouter(prefix="/agent/users", tags=["管理-用户"])
router = APIRouter(prefix="/agent/users", tags=["代理-用户"])
@router.get("", response_model=ApiResponse[PaginatedData[AdminUserOut]])
async def list_users(
_agent: AgentUser,
agent: AgentUser,
db: DbSession,
page: int = Query(1, ge=1, description="页码，从 1 开始"),
page_size: int = Query(
@@ -22,17 +22,14 @@ async def list_users(
description="每页条数",
),
username: str | None = Query(None, description="用户名模糊搜索"),
agent_id: int | None = Query(None, description="按所属代理用户 ID 筛选"),
role_id: int | None = Query(None, ge=0, le=3, description="按角色筛选"),
) -> ApiResponse[PaginatedData[AdminUserOut]]:
agent_id=_agent.id
users, total = await agent_user_service.list_users(
db,
agent_id=agent.id,
page=page,
page_size=page_size,
username=username,
agent_id=agent_id,
role_id=role_id,
)
return ApiResponse(
@@ -45,59 +42,3 @@ async def list_users(
page_size=page_size,
),
)
@router.post("", response_model=ApiResponse[AdminUserOut])
async def create_user(
body: AdminUserCreate,
agent: AgentUser,
db: DbSession,
) -> ApiResponse[AdminUserOut]:
try:
user = await agent_user_service.create_user(db, body,agent)
except agent_user_service.AdminUserError as exc:
return ApiResponse(ok=False, message=exc.message)
return ApiResponse(
ok=True,
message="用户已创建",
data=AdminUserOut.model_validate(user),
)
@router.patch("/{user_id}", response_model=ApiResponse[AdminUserOut])
async def update_user(
user_id: int,
body: AdminUserUpdate,
agent: AgentUser,
db: DbSession,
) -> ApiResponse[AdminUserOut]:
try:
user = await agent_user_service.update_user(
db,
user_id,
body,
actor_id=agent.id,
)
except agent_user_service.AdminUserError as exc:
return ApiResponse(ok=False, message=exc.message)
return ApiResponse(
ok=True,
message="用户已更新",
data=AdminUserOut.model_validate(user),
)
@router.delete("/{user_id}", response_model=ApiResponse[None])
async def delete_user(
user_id: int,
agent: AgentUser,
db: DbSession,
) -> ApiResponse[None]:
try:
await agent_user_service.delete_user(db, user_id, actor_id=agent.id)
except agent_user_service.AdminUserError as exc:
return ApiResponse(ok=False, message=exc.message)
return ApiResponse(ok=True, message="用户已删除")

78
app/api/v1/oem_card_keys.py
View File

@@ -1,25 +1,25 @@
"""管理员卡密 CRUD。"""
"""OEM 卡密：列表、备注、批量分配给代理。"""
from typing import Literal
from fastapi import APIRouter, Query
from app.dependencies import OemUser, DbSession
from app.schemas.admin_card_key import (
CardKeyBatchCreateResult,
CardKeyCreate,
CardKeyOut,
CardKeyUpdate,
)
from app.dependencies import DbSession, OemUser
from app.schemas.admin_card_key import CardKeyOut
from app.schemas.common import ApiResponse, PaginatedData
from app.services import admin_card_key as card_key_service
from app.schemas.oem_card_key import (
OemCardKeyBatchAssign,
OemCardKeyBatchAssignResult,
OemCardKeyUpdate,
)
from app.services import oem_card_key as card_key_service
router = APIRouter(prefix="/oem/card-keys", tags=["管理-卡密"])
router = APIRouter(prefix="/oem/card-keys", tags=["OEM-卡密"])
@router.get("", response_model=ApiResponse[PaginatedData[CardKeyOut]])
async def list_card_keys(
_admin: OemUser,
oem: OemUser,
db: DbSession,
page: int = Query(1, ge=1),
page_size: int = Query(
@@ -32,17 +32,16 @@ async def list_card_keys(
description="筛选：all 全部 / unused 未使用 / used 已激活",
),
username: str | None = Query(default=None, description="按激活用户名模糊筛选"),
oem_id: int | None = Query(default=None, description="按预分配 OEM 筛选"),
agent_id: int | None = Query(default=None, description="按预分配代理筛选"),
) -> ApiResponse[PaginatedData[CardKeyOut]]:
filter_status = None if status == "all" else status
cards, total = await card_key_service.list_card_keys(
db,
oem_id=oem.id,
page=page,
page_size=page_size,
status=filter_status,
username=username,
oem_id=oem_id,
agent_id=agent_id,
)
return ApiResponse(
@@ -57,53 +56,42 @@ async def list_card_keys(
)
@router.post("", response_model=ApiResponse[CardKeyBatchCreateResult])
async def create_card_keys(
body: CardKeyCreate,
_admin: OemUser,
db: DbSession,
) -> ApiResponse[CardKeyBatchCreateResult]:
try:
created = await card_key_service.create_card_keys(db, body)
except card_key_service.AdminCardKeyError as exc:
return ApiResponse(ok=False, message=exc.message)
items = [CardKeyOut.model_validate(c) for c in created]
return ApiResponse(
ok=True,
message=f"已生成 {len(items)} 张卡密",
data=CardKeyBatchCreateResult(items=items, created_count=len(items)),
)
@router.patch("/{card_id}", response_model=ApiResponse[CardKeyOut])
async def update_card_key(
card_id: int,
body: CardKeyUpdate,
_admin: OemUser,
body: OemCardKeyUpdate,
oem: OemUser,
db: DbSession,
) -> ApiResponse[CardKeyOut]:
try:
card = await card_key_service.update_card_key(db, card_id, body)
except card_key_service.AdminCardKeyError as exc:
card = await card_key_service.update_card_key(
db, card_id, body, oem_id=oem.id
)
except card_key_service.OemCardKeyError as exc:
return ApiResponse(ok=False, message=exc.message)
return ApiResponse(
ok=True,
message="卡密已更新",
message="备注已更新",
data=CardKeyOut.model_validate(card),
)
@router.delete("/{card_id}", response_model=ApiResponse[None])
async def delete_card_key(
card_id: int,
_admin: OemUser,
@router.post("/assign-agent", response_model=ApiResponse[OemCardKeyBatchAssignResult])
async def batch_assign_to_agent(
body: OemCardKeyBatchAssign,
oem: OemUser,
db: DbSession,
) -> ApiResponse[None]:
) -> ApiResponse[OemCardKeyBatchAssignResult]:
try:
await card_key_service.delete_card_key(db, card_id)
except card_key_service.AdminCardKeyError as exc:
count = await card_key_service.batch_assign_to_agent(
db, body, oem_id=oem.id
)
except card_key_service.OemCardKeyError as exc:
return ApiResponse(ok=False, message=exc.message)
return ApiResponse(ok=True, message="卡密已删除")
return ApiResponse(
ok=True,
message=f"已分配 {count} 张卡密",
data=OemCardKeyBatchAssignResult(updated_count=count),
)