diff --git a/publish/src/linux-x64/publish/apps/www/js/app.js b/publish/src/linux-x64/publish/apps/www/js/app.js index c93197f6..57a61e1f 100644 --- a/publish/src/linux-x64/publish/apps/www/js/app.js +++ b/publish/src/linux-x64/publish/apps/www/js/app.js @@ -63,9 +63,8 @@ const app = new Vue({ }); connection.start().then(function () { console.log('客户端与服务器连接成功!'); - load(); }).catch(function (err) { - console.log('客户端与服务器连接失败!'); + console.log(err); //setTimeout(connect, 15 * 1000); }); }, diff --git a/publish/src/linux-x64/publish/apps/www/pages/home.html b/publish/src/linux-x64/publish/apps/www/pages/home.html index e9028cc6..744d394b 100644 --- a/publish/src/linux-x64/publish/apps/www/pages/home.html +++ b/publish/src/linux-x64/publish/apps/www/pages/home.html @@ -8,15 +8,15 @@
- +
-

物联网中心

+

用户中心

- +
-

用户中心

+

物联网中心

diff --git a/tools/nginx-1.16.0/.gitignore b/tools/nginx-1.16.0/.gitignore index 13c6aaff..c47761d6 100644 --- a/tools/nginx-1.16.0/.gitignore +++ b/tools/nginx-1.16.0/.gitignore @@ -1,2 +1,2 @@ -temp -logs \ No newline at end of file +temp/* +logs/* \ No newline at end of file diff --git a/tools/nginx-1.16.0/conf/nginx.conf b/tools/nginx-1.16.0/conf/nginx.conf index c4ed736d..8c1c066d 100644 --- a/tools/nginx-1.16.0/conf/nginx.conf +++ b/tools/nginx-1.16.0/conf/nginx.conf @@ -27,27 +27,22 @@ http { server_name localhost; location / { - root "D:\1.0\ZHXY\publish\src\linux-x64\publish\apps\www"; - } - - location ^~ /UserCenter/ { - proxy_pass http://localhost:5000/UserCenter/; + root ../../publish/src/linux-x64/publish/apps/www; } location ^~ /IoTCenter/hub { proxy_pass http://localhost:5000/IoTCenter/hub/; proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_read_timeout 86400; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; } - location ^~ /IoTCenter/ { - proxy_pass http://localhost:5000/IoTCenter/; + location ~* /(UserCenter|IoTCenter)/ { + proxy_pass http://localhost:5000; } - - error_page 500 502 503 504 /50x.html; location = /50x.html { root html;