diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json index fedd9adc..45c25979 100644 --- a/projects/IoTCenter/appsettings.json +++ b/projects/IoTCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.21", + "version": "1.0.0-rc.31", "Logging": { "LogLevel": { "Default": "Warning", diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index da7ea4a3..53c942d4 100644 Binary files a/projects/IoTCenter/iotcenter.db and b/projects/IoTCenter/iotcenter.db differ diff --git a/projects/IoTNode/appsettings.json b/projects/IoTNode/appsettings.json index 8e5d076e..cf654a29 100644 --- a/projects/IoTNode/appsettings.json +++ b/projects/IoTNode/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.21", + "version": "1.0.0-rc.31", "Logging": { "LogLevel": { "Default": "Warning", diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index 0fa8d147..83a51716 100644 Binary files a/projects/IoTNode/iotnode.db and b/projects/IoTNode/iotnode.db differ diff --git a/projects/StudyCenter/appsettings.json b/projects/StudyCenter/appsettings.json index b5ca28f0..05cf5598 100644 --- a/projects/StudyCenter/appsettings.json +++ b/projects/StudyCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.9", + "version": "1.0.0-rc.31", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/projects/UserCenter/appsettings.json b/projects/UserCenter/appsettings.json index 72f40853..3c0d6c44 100644 --- a/projects/UserCenter/appsettings.json +++ b/projects/UserCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.21", + "version": "1.0.0-rc.31", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/publish/src/linux-x64/publish/nginx.conf b/publish/src/linux-x64/publish/nginx.conf index b5b92c0c..e062e190 100644 --- a/publish/src/linux-x64/publish/nginx.conf +++ b/publish/src/linux-x64/publish/nginx.conf @@ -1,19 +1,13 @@ - -#user nobody; -worker_processes 1; - -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; - +user www-data; +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; events { - worker_connections 1024; + worker_connections 768; + # multi_accept on; } - http { include mime.types; default_type application/octet-stream; @@ -27,28 +21,32 @@ http { server_name localhost; location ^~ /live/ { - proxy_pass http://localhost:8080/live/; - } - - location ^~ /video/ { - proxy_pass http://localhost:8080/; + proxy_pass http://localhost:8080/live/; } location ^~ /UserCenter/ { - proxy_pass http://localhost:8000/; + proxy_pass http://localhost:8010/; + #add_header 'Access-Control-Allow-Origin' '*'; + #add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE'; + #add_header 'Access-Control-Allow-Headers' 'Content-Type'; } location ^~ /IoTCenter/ { - proxy_pass http://localhost:8001/; + proxy_pass http://localhost:8011/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_read_timeout 86400; } + location ^~ /IoTCenter/App/ { + proxy_pass http://localhost:8011/App/; + } + error_page 500 502 503 504 /50x.html; location = /50x.html { root html; } } -} + +} \ 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 fb681eb5..361ccb48 100644 --- a/tools/nginx-1.16.0/conf/nginx.conf +++ b/tools/nginx-1.16.0/conf/nginx.conf @@ -27,28 +27,32 @@ http { server_name localhost; location ^~ /live/ { - proxy_pass http://localhost:8080/live/; - } - - location ^~ /video/ { - proxy_pass http://localhost:8080/; + proxy_pass http://localhost:8080/live/; } location ^~ /UserCenter/ { proxy_pass http://localhost:8010/; + #add_header 'Access-Control-Allow-Origin' '*'; + #add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE'; + #add_header 'Access-Control-Allow-Headers' 'Content-Type'; } location ^~ /IoTCenter/ { - proxy_pass http://localhost:8011/; + proxy_pass http://localhost:8011/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_read_timeout 86400; } + location ^~ /IoTCenter/App/ { + proxy_pass http://localhost:8011/App/; + } + error_page 500 502 503 504 /50x.html; location = /50x.html { root html; } } + }