From b2aaeeab88e151ea5d17ba3c04491f4e9298464e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 11:11:49 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20V2=20VPN=20subscription=20404=20-=20ngin?= =?UTF-8?q?x=20path=20/api/proxy-sub/=20=E2=86=92=20/api/proxy-v2/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Root cause: deploy-brain-proxy.yml generates subscription URLs with /api/proxy-v2/ path, but nginx config and deploy script incorrectly used V1 path /api/proxy-sub/, causing 404 on subscription requests. Changes: - nginx-brain-proxy-snippet.conf: location /api/proxy-sub/ → /api/proxy-v2/ - deploy-brain-proxy.sh: all inline nginx templates, grep checks, perl/sed injections, and health checks updated to /api/proxy-v2/ - Added migration logic to auto-fix existing servers with old path Agent-Logs-Url: https://github.com/qinfendebingshuo/guanghulab/sessions/8e4facc2-e5bd-4114-bfd0-ec0d2ca93b6d Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com> --- .../config/nginx-brain-proxy-snippet.conf | 4 +-- server/proxy/deploy-brain-proxy.sh | 26 ++++++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/server/proxy/config/nginx-brain-proxy-snippet.conf b/server/proxy/config/nginx-brain-proxy-snippet.conf index cd060704..ff80a89b 100644 --- a/server/proxy/config/nginx-brain-proxy-snippet.conf +++ b/server/proxy/config/nginx-brain-proxy-snippet.conf @@ -9,10 +9,10 @@ # ═══════════════════════════════════════════════ # §3 铸渊专线V2订阅服务 (大脑服务器 · ZY-SVR-005) -# 通过 /api/proxy-sub/ 路径访问 +# 通过 /api/proxy-v2/ 路径访问 # 实际由 subscription-server-v2.js (port 3803) 处理 -location /api/proxy-sub/ { +location /api/proxy-v2/ { proxy_pass http://127.0.0.1:3803/; proxy_http_version 1.1; proxy_set_header Host $host; diff --git a/server/proxy/deploy-brain-proxy.sh b/server/proxy/deploy-brain-proxy.sh index 9227c0cf..0d6c0742 100644 --- a/server/proxy/deploy-brain-proxy.sh +++ b/server/proxy/deploy-brain-proxy.sh @@ -256,7 +256,7 @@ server { server_name localhost 127.0.0.1; # ─── 铸渊专线V2订阅服务 (端口 3803) ─── - location /api/proxy-sub/ { + location /api/proxy-v2/ { proxy_pass http://127.0.0.1:3803/; proxy_http_version 1.1; proxy_set_header Host $host; @@ -293,8 +293,14 @@ NGINXEOF echo " ✅ 已修复端口: 3802 → 3803" fi - # 如果没有proxy-sub配置，注入V2配置 - if ! grep -q "proxy-sub" "$NGINX_CONF" 2>/dev/null; then + # 修复路径错误: 如果V2配置仍使用旧的 /api/proxy-sub/ 路径，替换为 /api/proxy-v2/ + if grep -q "location.*/api/proxy-sub/" "$NGINX_CONF" 2>/dev/null && grep -q "127\.0\.0\.1:3803" "$NGINX_CONF" 2>/dev/null; then + sed -i 's|location /api/proxy-sub/|location /api/proxy-v2/|g' "$NGINX_CONF" + echo " ✅ 已修复V2路径: /api/proxy-sub/ → /api/proxy-v2/" + fi + + # 如果没有proxy-v2配置，注入V2配置 + if ! grep -q "proxy-v2" "$NGINX_CONF" 2>/dev/null; then echo " 添加V2订阅服务反向代理配置..." # 在server块内的最后一个location之后、server块结束}之前插入 # 使用更安全的锚点: 匹配server块内的 } (缩进的) @@ -304,12 +310,12 @@ NGINXEOF # 使用perl进行更安全的插入（在server块的最后一个}之前） if command -v perl &>/dev/null; then - perl -i -0pe 's/(server\s*\{(?:(?!server\s*\{).)*?)(^\})/\1 # ─── 铸渊专线V2订阅服务 (端口 3803) ───\n location \/api\/proxy-sub\/ {\n proxy_pass http:\/\/127.0.0.1:3803\/;\n proxy_http_version 1.1;\n proxy_set_header Host \$host;\n proxy_set_header X-Real-IP \$remote_addr;\n proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;\n proxy_set_header X-Forwarded-Proto \$scheme;\n proxy_connect_timeout 10s;\n proxy_read_timeout 30s;\n proxy_send_timeout 30s;\n add_header X-Content-Type-Options nosniff always;\n add_header X-Frame-Options DENY always;\n add_header Cache-Control "no-store, no-cache, must-revalidate" always;\n }\n\n\2/ms' "$NGINX_CONF" 2>/dev/null + perl -i -0pe 's/(server\s*\{(?:(?!server\s*\{).)*?)(^\})/\1 # ─── 铸渊专线V2订阅服务 (端口 3803) ───\n location \/api\/proxy-v2\/ {\n proxy_pass http:\/\/127.0.0.1:3803\/;\n proxy_http_version 1.1;\n proxy_set_header Host \$host;\n proxy_set_header X-Real-IP \$remote_addr;\n proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;\n proxy_set_header X-Forwarded-Proto \$scheme;\n proxy_connect_timeout 10s;\n proxy_read_timeout 30s;\n proxy_send_timeout 30s;\n add_header X-Content-Type-Options nosniff always;\n add_header X-Frame-Options DENY always;\n add_header Cache-Control "no-store, no-cache, must-revalidate" always;\n }\n\n\2/ms' "$NGINX_CONF" 2>/dev/null else # 回退: 在第一个顶层 } 之前插入 sed -i '/^}/i\ # ─── 铸渊专线V2订阅服务 (端口 3803) ───\ - location /api/proxy-sub/ {\ + location /api/proxy-v2/ {\ proxy_pass http://127.0.0.1:3803/;\ proxy_http_version 1.1;\ proxy_set_header Host $host;\ @@ -324,9 +330,9 @@ NGINXEOF add_header Cache-Control "no-store, no-cache, must-revalidate" always;\ }' "$NGINX_CONF" || true fi - echo " ✅ V2 proxy-sub配置已注入" + echo " ✅ V2 proxy-v2配置已注入" else - echo " proxy-sub配置已存在" + echo " proxy-v2配置已存在" fi fi @@ -373,10 +379,10 @@ health_check() { # Nginx反向代理 if systemctl is-active --quiet nginx 2>/dev/null; then - if curl -sf http://127.0.0.1:80/api/proxy-sub/health >/dev/null 2>&1; then - echo " ✅ Nginx反代: 正常 (/api/proxy-sub/ → 3803)" + if curl -sf http://127.0.0.1:80/api/proxy-v2/health >/dev/null 2>&1; then + echo " ✅ Nginx反代: 正常 (/api/proxy-v2/ → 3803)" else - echo " ⚠️ Nginx反代: /api/proxy-sub/ 无法访问 (检查proxy_pass端口)" + echo " ⚠️ Nginx反代: /api/proxy-v2/ 无法访问 (检查proxy_pass端口)" fi else echo " ⚠️ Nginx: 未运行"