From e21b2f42d25636e16b4be30c505046b2e98e2554 Mon Sep 17 00:00:00 2001 From: tim Date: Sun, 26 Oct 2025 14:17:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=B2=BE=E7=AE=80websocket=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx/openisle | 2 -- nginx/openisle-staging | 52 +----------------------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/nginx/openisle b/nginx/openisle index 612242399..ff9e71ed8 100644 --- a/nginx/openisle +++ b/nginx/openisle @@ -100,8 +100,6 @@ server { # auth_basic_user_file /etc/nginx/.htpasswd; } - - # ---------- WEBSOCKET GATEWAY TO :8082 ---------- location ^~ /websocket/ { proxy_pass http://127.0.0.1:8084/; proxy_http_version 1.1; diff --git a/nginx/openisle-staging b/nginx/openisle-staging index 951a9b4cf..dd1c906c4 100644 --- a/nginx/openisle-staging +++ b/nginx/openisle-staging @@ -8,11 +8,8 @@ server { listen 443 ssl; server_name staging.open-isle.com www.staging.open-isle.com; - ssl_certificate /etc/letsencrypt/live/staging.open-isle.com/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/staging.open-isle.com/privkey.pem; - # ssl_certificate /etc/letsencrypt/live/open-isle.com/fullchain.pem; - # ssl_certificate_key /etc/letsencrypt/live/open-isle.com/privkey.pem; include /etc/letsencrypt/options-ssl-nginx.conf; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; @@ -40,52 +37,6 @@ server { add_header X-Upstream $upstream_addr always; } - # 1) 原生 WebSocket - location ^~ /api/ws { - proxy_pass http://127.0.0.1:8081; # 不要尾随 /，保留原样 URI - proxy_http_version 1.1; - - # 升级所需 - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - - # 统一透传这些头（你在 /api/ 有，/api/ws 也要有） - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host; - - proxy_read_timeout 300s; - proxy_send_timeout 300s; - proxy_buffering off; - proxy_cache off; - } - - # 2) SockJS（包含 /info、/iframe.html、/.../websocket 等） - location ^~ /api/sockjs { - proxy_pass http://127.0.0.1:8081; - proxy_http_version 1.1; - - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host; - - proxy_read_timeout 300s; - proxy_send_timeout 300s; - proxy_buffering off; - proxy_cache off; - - # 如要同源 iframe 回退，下面两行二选一（或者交给 Spring Security 的 sameOrigin） - # proxy_hide_header X-Frame-Options; - # add_header X-Frame-Options "SAMEORIGIN" always; - } - # ---------- API ---------- location /api/ { proxy_pass http://127.0.0.1:8081/api/; @@ -108,8 +59,7 @@ server { proxy_no_cache 1; proxy_cache_bypass 1; } - - # ---------- WEBSOCKET GATEWAY TO :8083 ---------- + location ^~ /websocket/ { proxy_pass http://127.0.0.1:8083/; proxy_http_version 1.1; From b3b0b194a32678d7188a8f4ede3f089b043eba2f Mon Sep 17 00:00:00 2001 From: Tim <135014430+nagisa77@users.noreply.github.com> Date: Sun, 26 Oct 2025 14:25:09 +0800 Subject: [PATCH 2/2] Configure MCP port and nginx proxies --- .env.example | 1 + nginx/openisle | 22 +++++++++++++++++++++- nginx/openisle-staging | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index e042d515b..b65449ea9 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,7 @@ SERVER_PORT=8080 FRONTEND_PORT=3000 WEBSOCKET_PORT=8082 +OPENISLE_MCP_PORT=8085 MYSQL_PORT=3306 REDIS_PORT=6379 RABBITMQ_PORT=5672 diff --git a/nginx/openisle b/nginx/openisle index ff9e71ed8..fb523acdc 100644 --- a/nginx/openisle +++ b/nginx/openisle @@ -101,7 +101,27 @@ server { } location ^~ /websocket/ { - proxy_pass http://127.0.0.1:8084/; + proxy_pass http://127.0.0.1:8084/; + proxy_http_version 1.1; + + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + proxy_buffering off; + proxy_cache off; + add_header Cache-Control "no-store" always; + } + + location ^~ /mcp/ { + proxy_pass http://127.0.0.1:8085/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; diff --git a/nginx/openisle-staging b/nginx/openisle-staging index dd1c906c4..ef5d014c9 100644 --- a/nginx/openisle-staging +++ b/nginx/openisle-staging @@ -80,4 +80,24 @@ server { add_header Cache-Control "no-store" always; } + location ^~ /mcp/ { + proxy_pass http://127.0.0.1:8086/; + proxy_http_version 1.1; + + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + proxy_buffering off; + proxy_cache off; + add_header Cache-Control "no-store" always; + } + }