diff --git a/call-client/src-tauri/src/commands/window.rs b/call-client/src-tauri/src/commands/window.rs index 7c82039..bf41ec0 100644 --- a/call-client/src-tauri/src/commands/window.rs +++ b/call-client/src-tauri/src/commands/window.rs @@ -104,6 +104,9 @@ pub fn open_main_window(app: AppHandle) -> Result<(), String> { return Err("主窗口不存在".to_string()); }; + // 首次启动时主窗口可能在隐藏状态下已被路由守卫跳到了 /setup, + // 登录成功后显式纠正 hash,避免显示为服务配置页。 + let _ = main_window.eval("if (window.location.hash !== '#/main') { window.location.hash = '/main'; }"); let _ = main_window.show(); let _ = main_window.unminimize(); let _ = main_window.set_focus(); diff --git a/scripts/docker/install-build-deps.sh b/scripts/docker/install-build-deps.sh index cf3c146..38532c0 100644 --- a/scripts/docker/install-build-deps.sh +++ b/scripts/docker/install-build-deps.sh @@ -5,18 +5,13 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture arm64 -# focal 上使用传统 sources.list 写法,兼容性更好。 -rm -rf /etc/apt/sources.list.d/* -cat > /etc/apt/sources.list <<'EOF' -deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse -deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse -deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse -deb [arch=amd64] http://security.ubuntu.com/ubuntu focal-security main restricted universe multiverse - -deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe multiverse -deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe multiverse -deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted universe multiverse -deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse +# 保留基础镜像默认 amd64 源,只补充 arm64 ports 源,避免覆盖后出现源配置兼容问题。 +rm -f /etc/apt/sources.list.d/arm64-ports.list +cat > /etc/apt/sources.list.d/arm64-ports.list <<'EOF' +deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe multiverse +deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse +deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse +deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted universe multiverse EOF apt-get update