From a57c6720e37036cafa7a0be3bae9a44c8f9b679a Mon Sep 17 00:00:00 2001
From: wangjia <809946525@qq.com>
Date: Wed, 15 Jul 2026 07:25:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(frp):=20=E9=94=9A=E7=82=B9=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=20pangolin1=E2=86=92ali(=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E9=98=B2=E7=8E=AF=E8=B7=AF=E6=8E=92=E9=99=A4=E8=87=AA=E8=BA=AB?=
 =?UTF-8?q?IP,=E6=97=A0=E6=B3=95=E7=BB=8F=E9=9A=A7=E9=81=93=E5=9B=9E?=
 =?UTF-8?q?=E8=BF=9E);=20mihomo=20=E7=BC=BA=E5=A4=B1=E6=97=B6=E4=BC=98?=
 =?UTF-8?q?=E9=9B=85=E8=B7=B3=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/frp/frpc.toml.example |  2 +-
 scripts/setup-frp-on-nas.sh  | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docker/frp/frpc.toml.example b/docker/frp/frpc.toml.example
index 7a6c863..60e4325 100644
--- a/docker/frp/frpc.toml.example
+++ b/docker/frp/frpc.toml.example
@@ -1,6 +1,6 @@
 # 复制为 frpc.toml 并把 token 换成真值（Bitwarden「frp home-tunnel」）。
 # frpc.toml 含密钥，不入 git（部署由 scripts/setup-frp-remote.sh 自动完成）。
-serverAddr = "103.119.13.48"   # pangolin1（frps）
+serverAddr = "182.92.213.171"  # ali 北京（frps）
 serverPort = 7000
 auth.method = "token"
 auth.token = "<Bitwarden: frp home-tunnel>"
diff --git a/scripts/setup-frp-on-nas.sh b/scripts/setup-frp-on-nas.sh
index eb58904..7ec8123 100755
--- a/scripts/setup-frp-on-nas.sh
+++ b/scripts/setup-frp-on-nas.sh
@@ -19,7 +19,7 @@ read -r TOKEN < "$TOKEN_FILE"
 echo "==> 1/6 写 frpc.toml + docker-compose.yml（sudo）"
 sudo mkdir -p "$FRP_DIR"
 sudo tee "$FRP_DIR/frpc.toml" > /dev/null <<EOF
-serverAddr = "103.119.13.48"
+serverAddr = "182.92.213.171"
 serverPort = 7000
 auth.method = "token"
 auth.token = "$TOKEN"
@@ -73,7 +73,7 @@ echo "==> 2/6 安装 frpc 二进制 + systemd 常驻"
 sudo install -m 755 "$FRPC_BIN" /usr/local/bin/frpc
 sudo tee /etc/systemd/system/frpc.service > /dev/null <<'EOF'
 [Unit]
-Description=frp client (home reverse tunnel to pangolin1)
+Description=frp client (home reverse tunnel to ali frps)
 After=network-online.target
 Wants=network-online.target
 
@@ -92,6 +92,12 @@ sudo systemctl enable frpc >/dev/null 2>&1 || true
 sudo systemctl restart frpc
 
 echo "==> 3/6 mihomo：hosts 覆盖 + fake-ip-filter + use-hosts（幂等）"
+if [ ! -f "$CFG" ]; then
+  echo "    !! mihomo 配置不存在（$CFG）——NAS 上 mihomo 已不在运行，跳过 3/4/5 步。"
+  echo "    !! 家内 DNS 覆盖需另行方案（群晖 DNS Server 套件），见 docs/remote-access-frp.html。"
+  SKIP_MIHOMO=1
+fi
+if [ -z "${SKIP_MIHOMO:-}" ]; then
 cp "$CFG" "$CFG.bak.frp"
 echo "    备份: $CFG.bak.frp"
 python3 - "$CFG" <<'PY'
@@ -185,6 +191,7 @@ echo "    reload 已请求"
 echo "==> 5/6 验证家内解析（期望 192.168.3.200）"
 sleep 1
 nslookup git.yanmeiai.com 127.0.0.1 2>&1 | tail -3
+fi   # SKIP_MIHOMO
 
 echo "==> 6/6 验证 frpc 隧道"
 sleep 3