Merge branch 'fawney19:master' into keys

This commit is contained in:
AAEE86
2026-02-28 16:13:30 +08:00
committed by GitHub
23 changed files with 240 additions and 2991 deletions

View File

@@ -392,13 +392,13 @@ class ProxyNodeService:
query = db.query(ProxyNode)
if status:
normalized = status.strip().lower()
allowed = {"online", "unhealthy", "offline"}
allowed = {"online", "offline"}
if normalized not in allowed:
raise InvalidRequestException(f"status 必须是以下之一: {sorted(allowed)}", "status")
query = query.filter(ProxyNode.status == ProxyNodeStatus(normalized))
total = query.count()
nodes = query.order_by(ProxyNode.updated_at.desc()).offset(skip).limit(limit).all()
nodes = query.order_by(ProxyNode.name.asc()).offset(skip).limit(limit).all()
return nodes, total
@staticmethod