fix: 统一端口并完善桌面端授权和安装

2026-05-20 16:54:24 +08:00
parent 22c343a85e
commit 1288553df8
22 changed files with 363 additions and 363 deletions
@@ -1,88 +0,0 @@
-import os
-import platform
-import signal
-import subprocess
-from pathlib import Path
-
-
-def is_supervisor_running() -> bool:
-    if os.environ.get("SUPERVISOR_ENABLED") == "1":
-        return True
-
-    supervisor_sock = Path("/var/run/supervisor.sock")
-    if supervisor_sock.exists() and _command_succeeds(["supervisorctl", "status"], timeout=5):
-        return True
-
-    try:
-        import psutil  # pyright: ignore[reportMissingModuleSource]
-
-        parent = psutil.Process().parent()
-        if parent and "supervisor" in parent.name().lower():
-            return True
-    except Exception:
-        pass
-
-    return _command_succeeds(["pgrep", "-f", "supervisord"], timeout=2)
-
-
-def is_container_runtime() -> bool:
-    if os.environ.get("container"):
-        return True
-    if Path("/.dockerenv").exists():
-        return True
-
-    cgroup_path = Path("/proc/1/cgroup")
-    if not cgroup_path.exists():
-        return False
-
-    try:
-        cgroup = cgroup_path.read_text(encoding="utf-8", errors="ignore").lower()
-    except Exception:
-        return False
-
-    return any(marker in cgroup for marker in ("docker", "kubepods", "containerd"))
-
-
-def restart_via_supervisor() -> tuple[bool, str]:
-    try:
-        result = subprocess.run(
-            ["supervisorctl", "restart", "fastapi"],
-            capture_output=True,
-            text=True,
-            timeout=30,
-        )
-        if result.returncode == 0:
-            return True, "服务正在通过 supervisor 重启..."
-
-        error_msg = result.stderr or result.stdout or "未知错误"
-        return False, f"重启失败: {error_msg}"
-    except subprocess.TimeoutExpired:
-        return False, "重启操作超时"
-    except FileNotFoundError:
-        return False, "找不到 supervisorctl 命令"
-    except Exception as exc:
-        return False, f"重启异常: {exc}"
-
-
-def terminate_current_process() -> None:
-    if platform.system() == "Windows":
-        os._exit(0)
-    os.kill(os.getpid(), signal.SIGTERM)
-
-
-def restart_method_name(supervisor_running: bool) -> str:
-    if supervisor_running:
-        return "supervisor"
-    if platform.system() == "Windows":
-        return "windows-process"
-    if is_container_runtime():
-        return "container-process"
-    return "process"
-
-
-def _command_succeeds(command: list[str], timeout: int) -> bool:
-    try:
-        result = subprocess.run(command, capture_output=True, text=True, timeout=timeout)
-        return result.returncode == 0 and bool(result.stdout.strip() or command[0] == "supervisorctl")
-    except Exception:
-        return False