fix: 修复暗色主题UI对比度、端口占用死循环及多项Web表单bug
后端修复: - engine/instances.py: Socks5Server.start() 端口占用时死循环, 增加超时和异常透传 - engine/instances.py: import time 移至顶层 - engine/instances.py: sync_instances/start_instance 容忍单实例启动失败 - run.py: 启动时 sync_instances 失败不退出进程 - web/routes.py: instances start/restart/edit 路由捕获 OSError, flash 友好提示 - api/v1.py: instances start/restart/update API 返回 JSON 错误而非 500 崩溃 - web/routes.py: toggle_user/ban_user 支持 hidden 字段语义, 缺字段时切换状态 - web/routes.py: inject_nav 增加独立 nav.dashboard 和 page_name, 修复双 active bug - auth.py: login 路由添加 logging import, 修 NameError 前端重构: - templates/base.html: 全局对比度提升(--text #f1f5f9, --accent #a5b4fc), 标题色显式声明, alert/modal/progress/table 完整暗色样式 - templates/base.html: main-content padding-top 修复 navbar 遮挡内容 - templates/base.html: 侧边栏 active 高亮 (白字 + elevated bg + 左边框) - templates/base.html: 顶栏动态显示当前页面名 - templates/*.html: 统一 page-header 类, 所有图标按钮添加 title tooltip - templates/users.html: toggle/ban 表单添加 hidden enabled/ban 字段 - templates/connections.html: fmtBytes 改为 Jinja macro, 时间格式化 - templates/dashboard.html: 时间格式化为 YYYY-MM-DD HH:MM:SS, chart canvas 高度调整 - templates/logs.html: 时间格式化为可读格式 - templates/stats.html: 提升 chart 颜色对比度 - templates/system.html: 使用 time.localtime() 显示本地时间
This commit is contained in:
@@ -106,9 +106,12 @@ def update_instance(iid):
|
||||
|
||||
# 重启以应用配置
|
||||
if inst.running:
|
||||
current_app.instance_manager.restart_instance(iid)
|
||||
try:
|
||||
current_app.instance_manager.restart_instance(iid)
|
||||
except OSError as e:
|
||||
return {"error": f"重启失败(端口可能被占用): {e}"}, 500
|
||||
|
||||
return jsonify({"ok": True})
|
||||
return {"ok": True}
|
||||
|
||||
|
||||
@bp.route("/instances/<int:iid>", methods=["DELETE"])
|
||||
@@ -126,25 +129,33 @@ def delete_instance(iid):
|
||||
@bp.route("/instances/<int:iid>/start", methods=["POST"])
|
||||
@login_required
|
||||
def start_instance(iid):
|
||||
if current_app.instance_manager.start_instance(iid):
|
||||
return jsonify({"ok": True})
|
||||
return {"error": "启动失败"}, 500
|
||||
try:
|
||||
ok = current_app.instance_manager.start_instance(iid)
|
||||
if not ok:
|
||||
return {"error": "启动失败"}, 500
|
||||
return {"ok": True}
|
||||
except OSError as e:
|
||||
return {"error": f"启动失败: {e}"}, 500
|
||||
|
||||
|
||||
@bp.route("/instances/<int:iid>/stop", methods=["POST"])
|
||||
@login_required
|
||||
def stop_instance(iid):
|
||||
if current_app.instance_manager.stop_instance(iid):
|
||||
return jsonify({"ok": True})
|
||||
return {"ok": True}
|
||||
return {"error": "停止失败"}, 500
|
||||
|
||||
|
||||
@bp.route("/instances/<int:iid>/restart", methods=["POST"])
|
||||
@login_required
|
||||
def restart_instance(iid):
|
||||
if current_app.instance_manager.restart_instance(iid):
|
||||
return jsonify({"ok": True})
|
||||
return {"error": "重启失败"}, 500
|
||||
try:
|
||||
ok = current_app.instance_manager.restart_instance(iid)
|
||||
if not ok:
|
||||
return {"error": "重启失败"}, 500
|
||||
return {"ok": True}
|
||||
except OSError as e:
|
||||
return {"error": f"重启失败: {e}"}, 500
|
||||
|
||||
|
||||
@bp.route("/instances/sync", methods=["POST"])
|
||||
|
||||
Reference in New Issue
Block a user