全面清理冗余与过度分层
后端优化: - 合并 api/routes/stats.py 到 api/routes/proxies.py,统计接口变更为 /api/proxies/stats - 内联 services/settings_service.py:settings.py 和 scheduler.py 直接使用 SettingsRepository - 简化 repositories/proxy_repo.py:提取 _row_to_proxy 辅助函数,消除重复构造代码 - 更新 api/lifespan.py 和 api/deps.py,移除对 settings_service 的依赖 - 从 requirements.txt 移除 websockets 依赖(已废弃的 WebSocket 功能残留) 前端适配: - 更新 frontend/src/api/index.js:stats 接口路径同步为 /api/proxies/stats - 清理 api/index.js 中未使用的 createRequestConfig 和多余 JSDoc 注释 脚本优化: - 移除 script/stop.bat 末尾的 pause,避免自动化调用时挂起
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
from fastapi import APIRouter
|
||||
from . import stats, proxies, plugins, scheduler, settings
|
||||
from . import proxies, plugins, scheduler, settings
|
||||
|
||||
api_router = APIRouter()
|
||||
api_router.include_router(stats.router)
|
||||
api_router.include_router(proxies.router)
|
||||
api_router.include_router(plugins.router)
|
||||
api_router.include_router(scheduler.router)
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
"""代理相关路由"""
|
||||
"""代理相关路由(含统计信息)"""
|
||||
from typing import Optional
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from services.proxy_service import ProxyService
|
||||
from services.scheduler_service import SchedulerService
|
||||
from models.schemas import ProxyListRequest, BatchDeleteRequest
|
||||
from api.deps import get_proxy_service
|
||||
from api.deps import get_proxy_service, get_scheduler_service
|
||||
from core.log import logger
|
||||
|
||||
router = APIRouter(prefix="/api/proxies", tags=["proxies"])
|
||||
|
||||
@@ -16,6 +18,20 @@ def error_response(message: str, code: int = 500):
|
||||
return {"code": code, "message": message, "data": None}
|
||||
|
||||
|
||||
@router.get("/stats")
|
||||
async def get_stats(
|
||||
proxy_service: ProxyService = Depends(get_proxy_service),
|
||||
scheduler_service: SchedulerService = Depends(get_scheduler_service),
|
||||
):
|
||||
try:
|
||||
stats = await proxy_service.get_stats()
|
||||
stats["scheduler_running"] = scheduler_service.running
|
||||
return success_response("获取统计信息成功", stats)
|
||||
except Exception as e:
|
||||
logger.error(f"Get stats failed: {e}")
|
||||
return error_response("获取统计信息失败")
|
||||
|
||||
|
||||
@router.post("")
|
||||
async def list_proxies(
|
||||
request: ProxyListRequest,
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
"""调度器相关路由"""
|
||||
from fastapi import APIRouter, Depends
|
||||
from services.scheduler_service import SchedulerService
|
||||
from services.settings_service import SettingsService
|
||||
from repositories.settings_repo import SettingsRepository
|
||||
from core.db import get_db
|
||||
from api.deps import get_scheduler_service
|
||||
from core.log import logger
|
||||
|
||||
router = APIRouter(prefix="/api/scheduler", tags=["scheduler"])
|
||||
settings_repo = SettingsRepository()
|
||||
|
||||
|
||||
def success_response(message: str, data=None):
|
||||
@@ -25,11 +27,11 @@ async def start_scheduler(
|
||||
return success_response("验证调度器已在运行", {"running": True})
|
||||
await scheduler.start()
|
||||
# 持久化设置
|
||||
settings_service = SettingsService()
|
||||
settings = await settings_service.get_settings()
|
||||
settings["auto_validate"] = True
|
||||
from models.schemas import SettingsSchema
|
||||
await settings_service.save_settings(SettingsSchema(**settings))
|
||||
async with get_db() as db:
|
||||
settings = await settings_repo.get_all(db)
|
||||
settings["auto_validate"] = True
|
||||
from models.schemas import SettingsSchema
|
||||
await settings_repo.save(db, SettingsSchema(**settings).model_dump())
|
||||
return success_response("验证调度器已启动", {"running": True})
|
||||
except Exception as e:
|
||||
logger.error(f"Start scheduler failed: {e}")
|
||||
@@ -45,11 +47,11 @@ async def stop_scheduler(
|
||||
return success_response("验证调度器未运行", {"running": False})
|
||||
await scheduler.stop()
|
||||
# 持久化设置
|
||||
settings_service = SettingsService()
|
||||
settings = await settings_service.get_settings()
|
||||
settings["auto_validate"] = False
|
||||
from models.schemas import SettingsSchema
|
||||
await settings_service.save_settings(SettingsSchema(**settings))
|
||||
async with get_db() as db:
|
||||
settings = await settings_repo.get_all(db)
|
||||
settings["auto_validate"] = False
|
||||
from models.schemas import SettingsSchema
|
||||
await settings_repo.save(db, SettingsSchema(**settings).model_dump())
|
||||
return success_response("验证调度器已停止", {"running": False})
|
||||
except Exception as e:
|
||||
logger.error(f"Stop scheduler failed: {e}")
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
"""设置相关路由"""
|
||||
from fastapi import APIRouter, Depends
|
||||
from services.settings_service import SettingsService
|
||||
from fastapi import APIRouter
|
||||
from core.db import get_db
|
||||
from repositories.settings_repo import SettingsRepository
|
||||
from models.schemas import SettingsSchema
|
||||
from api.deps import get_settings_service
|
||||
from core.log import logger
|
||||
|
||||
router = APIRouter(prefix="/api/settings", tags=["settings"])
|
||||
settings_repo = SettingsRepository()
|
||||
|
||||
|
||||
def success_response(message: str, data=None):
|
||||
@@ -17,9 +18,10 @@ def error_response(message: str, code: int = 500):
|
||||
|
||||
|
||||
@router.get("")
|
||||
async def get_settings(service: SettingsService = Depends(get_settings_service)):
|
||||
async def get_settings():
|
||||
try:
|
||||
settings = await service.get_settings()
|
||||
async with get_db() as db:
|
||||
settings = await settings_repo.get_all(db)
|
||||
return success_response("获取设置成功", settings)
|
||||
except Exception as e:
|
||||
logger.error(f"Get settings failed: {e}")
|
||||
@@ -27,12 +29,10 @@ async def get_settings(service: SettingsService = Depends(get_settings_service))
|
||||
|
||||
|
||||
@router.post("")
|
||||
async def save_settings(
|
||||
request: SettingsSchema,
|
||||
service: SettingsService = Depends(get_settings_service),
|
||||
):
|
||||
async def save_settings(request: SettingsSchema):
|
||||
try:
|
||||
success = await service.save_settings(request)
|
||||
async with get_db() as db:
|
||||
success = await settings_repo.save(db, request.model_dump())
|
||||
if not success:
|
||||
return error_response("保存设置失败")
|
||||
return success_response("保存设置成功", request.model_dump())
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
"""统计信息路由"""
|
||||
from fastapi import APIRouter, Depends
|
||||
from services.proxy_service import ProxyService
|
||||
from services.scheduler_service import SchedulerService
|
||||
from api.deps import get_proxy_service, get_scheduler_service
|
||||
from core.log import logger
|
||||
|
||||
router = APIRouter(prefix="/api/stats", tags=["stats"])
|
||||
|
||||
|
||||
def success_response(message: str, data=None):
|
||||
return {"code": 200, "message": message, "data": data}
|
||||
|
||||
|
||||
def error_response(message: str, code: int = 500):
|
||||
return {"code": code, "message": message, "data": None}
|
||||
|
||||
|
||||
@router.get("")
|
||||
async def get_stats(
|
||||
proxy_service: ProxyService = Depends(get_proxy_service),
|
||||
scheduler_service: SchedulerService = Depends(get_scheduler_service),
|
||||
):
|
||||
try:
|
||||
stats = await proxy_service.get_stats()
|
||||
stats["scheduler_running"] = scheduler_service.running
|
||||
return success_response("获取统计信息成功", stats)
|
||||
except Exception as e:
|
||||
logger.error(f"Get stats failed: {e}")
|
||||
return error_response("获取统计信息失败")
|
||||
Reference in New Issue
Block a user