From 8f115d404d7707558e8a97fb1eff111c2323dea3 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 25 Jan 2021 14:18:47 +0800 Subject: [PATCH] update Former-commit-id: d416902372a66beeec8d2b17ab726571a737d28c Former-commit-id: 5d58f219ef36f808e448103ad52d49f5d9ca0dac --- .../publish/docker/conf/gateway/nginx.conf | 19 +++++++++++-------- .../publish/docker/conf/website/nginx.conf | 9 ++++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf b/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf index 8a6347ec..f8ca8db7 100644 --- a/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf +++ b/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf @@ -68,23 +68,26 @@ http { proxy_pass http://172.172.0.60:8080/; } - location ^~ /UserCenter/ { - proxy_pass http://172.172.0.70/UserCenter/; - } - location ^~ /IoTCenter/ { - proxy_pass http://172.172.0.80/IoTCenter/; + proxy_pass http://172.172.0.80/Platform/; } location ^~ /IoTCenter/hub { - proxy_pass http://172.172.0.80/IoTCenter/hub; + proxy_pass http://172.172.0.80/Platform/hub; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } - location ^~ /JobServer/ { - proxy_pass http://172.172.0.90/JobServer/; + location ^~ /platform/ { + proxy_pass http://172.172.0.80/Platform/; + } + + location ^~ /platform/hub { + proxy_pass http://172.172.0.80/Platform/hub; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; } error_page 500 502 503 504 /50x.html; diff --git a/publish/src/linux-x64/publish/docker/conf/website/nginx.conf b/publish/src/linux-x64/publish/docker/conf/website/nginx.conf index 3aed0525..e244761f 100644 --- a/publish/src/linux-x64/publish/docker/conf/website/nginx.conf +++ b/publish/src/linux-x64/publish/docker/conf/website/nginx.conf @@ -36,7 +36,7 @@ http { index index.html; } - location ~* ^/(dfs|live|video|influxdb|UserCenter|IoTCenter|JobServer|portainer|minio|mysqlui|influxui|phpredisadmin|srs)/ { + location ~* ^/(IoTCenter|platform|dfs|live|video|influxdb|portainer|minio|mysqlui|influxui|phpredisadmin|srs)/ { proxy_pass http://gateway; } @@ -47,6 +47,13 @@ http { proxy_set_header Connection "upgrade"; } + location ^~ /platform/hub { + proxy_pass http://gateway; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + error_page 500 502 503 504 /50x.html; location = /50x.html { root html;