From 339e120a353ddd14640bc382952dbbe3626441cc Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 6 Nov 2019 19:38:58 +0800 Subject: [PATCH] update Former-commit-id: 97d455c50ccd7da50c8bc97a218c9192d592fe1d --- projects/IoTCenter/appsettings.json | 2 +- projects/IoTCenter/iotcenter.db | Bin 462848 -> 462848 bytes projects/IoTNode/appsettings.json | 2 +- projects/IoTNode/iotnode.db | Bin 499712 -> 499712 bytes projects/StudyCenter/appsettings.json | 2 +- projects/UserCenter/appsettings.json | 2 +- publish/src/linux-x64/publish/nginx.conf | 38 +++++++++++------------ tools/nginx-1.16.0/conf/nginx.conf | 16 ++++++---- 8 files changed, 32 insertions(+), 30 deletions(-) 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 da7ea4a37ebf32172d3234479420843433314eb1..53c942d474e2cc137c989bfcd7b9c025302fc0de 100644 GIT binary patch delta 134 zcmZozAkzRuEsQNpEzB(}Ev#GE?6sKoG;DX&V!L*g(SEB0`&CvZ3*+gI?CjdprP$bA zSq&}p49useu(97}G6IWdFd3O|U(L?$$;4>2{VONC03)N>^a(8NCagT&46F>(t+?48 hm`n_(*Ko6&OwZ+Iw*nbqX*PWgFT3G(RUY=+%mD2lBHI7} delta 133 zcmZozAkzRuEsQNpEzB(}Ev#GE?6sI$H*a^;V!L*g(Q2y%`&CvZbHnM5?CjdprP$bA zS&aFccWryt&}cM0@fw@Twg7fU1$Oo@21SN-EYmp(*wvUA)=f7kV6U4VTF&ms zWMVjdMmf95bk#z3YgR)GJp=RYsfFxfEKEk`(`!rFQ#dS)UvzGIv7vc-!ZkM4?R;hI zLX3hIdX{F-cJ6<=Yne!phw78PebX5ivZ*LB06|$OgR-b3qp&0gN2q~|Q(~htPbh=1 mup}b`15jkT-4-?#9*@#gBO_#Er=KZjcVaZ#&R@a)Q5^ueP)@V} delta 187 zcmV;s07Ud03iV-1D6PJ2POgsRhKYu2Y!<< z5O{^6m+^21G?&bG2SNccw-0y+@h2FYJj?(9 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; } } + }