diff --git a/fir_client/src/components/FirAppInfostimeline.vue b/fir_client/src/components/FirAppInfostimeline.vue index ea106d0..dca835e 100644 --- a/fir_client/src/components/FirAppInfostimeline.vue +++ b/fir_client/src/components/FirAppInfostimeline.vue @@ -290,9 +290,9 @@ }, getiOStype: function (type) { let ftype = ''; - if (type === "Adhoc") { + if (type === 1) { ftype = '内测版' - } else { + } else if(type === 2) { ftype = '企业版' } return ftype diff --git a/fir_ser/nginx-vhost.conf b/fir_ser/nginx-vhost.conf index 1dfab50..605e665 100644 --- a/fir_ser/nginx-vhost.conf +++ b/fir_ser/nginx-vhost.conf @@ -41,10 +41,14 @@ server location ~ ^/(download|api|files) { - proxy_pass http://synchrotron; - } + #proxy_pass http://synchrotron; + + include uwsgi_params; + uwsgi_pass 127.0.0.1:8899; + uwsgi_param UWSGI_SCRIPT wsgi; +} - location ~ ^/(index|apps|user/login) { + location ~ ^/(index|apps|user|login) { try_files $uri $uri/ /index.html; } diff --git a/fir_ser/uwsgi.conf b/fir_ser/uwsgi.conf index af8c93a..46a7673 100644 --- a/fir_ser/uwsgi.conf +++ b/fir_ser/uwsgi.conf @@ -1,8 +1,9 @@ +[uwsgi] # 对外提供 http 服务的端口 -http = 127.0.0.1:8899 +#http = 127.0.0.1:8899 #the local unix socket file than commnuincate to Nginx 用于和 nginx 进行数据交互的端口 -socket = 127.0.0.1:8898 +socket = 127.0.0.1:8899 # the base directory (full path) django 程序的主目录 chdir = /www/fir_ser @@ -10,11 +11,14 @@ chdir = /www/fir_ser # Django's wsgi file wsgi-file = fir_ser/wsgi.py +touch-reload = fir_ser +#uwsgi 内部解析数据包大小为4K ,自己可以增加64k +buffer-size = 65536 # maximum number of worker processes processes = 8 #thread numbers startched in each worker process -threads = 2 +threads = 4 #monitor uwsgi status 通过该端口可以监控 uwsgi 的负载情况 stats = 127.0.0.1:9191 @@ -23,5 +27,7 @@ stats = 127.0.0.1:9191 # clear environment on exit vacuum = true +enable-threads = true + # 后台运行,并输出日志 daemonize = /var/log/uwsgi.log