From 05634f433f5e2f9b0c579e8d28cdf5b400f4ecb9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 4 Apr 2026 07:53:24 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=93=B8=E6=B8=8A=E4=B8=93=E7=BA=BF?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=9C=8D=E5=8A=A1502=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E2=80=94=20PM2=E8=BF=9B=E7=A8=8B=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Agent-Logs-Url: https://github.com/qinfendebingshuo/guanghulab/sessions/3a6becc7-9313-432b-b112-d9602a27a514

Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com>
---
 server/proxy/deploy-proxy.sh                | 27 +++++++++++++++++++--
 server/proxy/service/subscription-server.js |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/server/proxy/deploy-proxy.sh b/server/proxy/deploy-proxy.sh
index d82b748a..7af19c6d 100644
--- a/server/proxy/deploy-proxy.sh
+++ b/server/proxy/deploy-proxy.sh
@@ -312,7 +312,21 @@ update() {
     fi
 
     systemctl restart xray
-    pm2 restart zy-proxy-sub zy-proxy-monitor zy-proxy-guardian 2>/dev/null || true
+
+    # 检查PM2中是否已注册代理服务进程
+    # 如果不存在则使用 ecosystem config 启动（而非仅 restart）
+    if pm2 describe zy-proxy-sub >/dev/null 2>&1 && \
+       pm2 describe zy-proxy-monitor >/dev/null 2>&1 && \
+       pm2 describe zy-proxy-guardian >/dev/null 2>&1; then
+        echo "  PM2代理服务已存在，执行重启..."
+        pm2 restart zy-proxy-sub zy-proxy-monitor zy-proxy-guardian
+    else
+        echo "  ⚠️ PM2代理服务未完整注册，执行启动..."
+        # 先删除可能存在的部分注册进程，然后重新启动全部
+        pm2 delete zy-proxy-sub zy-proxy-monitor zy-proxy-guardian 2>/dev/null || true
+        start_pm2_services
+    fi
+
     health_check
     echo "✅ 更新完成"
 }
@@ -326,7 +340,16 @@ status() {
 restart() {
     echo "重启所有代理服务..."
     systemctl restart xray
-    pm2 restart zy-proxy-sub zy-proxy-monitor zy-proxy-guardian 2>/dev/null || true
+    # 检查PM2中是否已注册所有代理服务进程
+    if pm2 describe zy-proxy-sub >/dev/null 2>&1 && \
+       pm2 describe zy-proxy-monitor >/dev/null 2>&1 && \
+       pm2 describe zy-proxy-guardian >/dev/null 2>&1; then
+        pm2 restart zy-proxy-sub zy-proxy-monitor zy-proxy-guardian
+    else
+        echo "  ⚠️ PM2代理服务未完整注册，执行启动..."
+        pm2 delete zy-proxy-sub zy-proxy-monitor zy-proxy-guardian 2>/dev/null || true
+        start_pm2_services
+    fi
     sleep 3
     health_check
 }
diff --git a/server/proxy/service/subscription-server.js b/server/proxy/service/subscription-server.js
index 76de93fd..ecaba074 100644
--- a/server/proxy/service/subscription-server.js
+++ b/server/proxy/service/subscription-server.js
@@ -11,7 +11,7 @@
 //   - Clash YAML (Clash Verge / ClashMi)
 //   - Base64 URI (Shadowrocket)
 //
-// 端口: 3802 (绑定0.0.0.0，支持外部直连 + Nginx反代)
+// 端口: 3802 (绑定127.0.0.1，仅通过Nginx反代访问)
 // 认证: URL中的token参数
 //
 // 环境变量 (从 /opt/zhuyuan/proxy/.env.keys 加载):