Merge remote-tracking branch 'origin/2.5.0' into 2.5.0

docker/Dockerfile

+FROM nginx:stable-alpine
+COPY dist /usr/share/nginx/ide/
+# COPY baas-dev.conf /etc/nginx/conf.d/baas-.conf
+# COPY docker/*.sh /docker-entrypoint.d/
+
+# RUN rm -rf /var/log/nginx/access.log && rm -rf /var/log/nginx/error.log
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

docker/baas-dev.conf

+map $http_upgrade $connection_upgrade {
+	default upgrade;
+	''      close;
+}
+
+server {
+    listen       80;
+    server_name  localhost;
+
+    location /custom-context-path {
+        context-cmd   /usr/share/nginx/console;
+        index  index.html index.htm;
+        try_files $uri $uri/ /custom-context-path/index.html;
+    }
+
+    location /root/ {
+        client_max_body_size    300m;
+        proxy_connect_timeout 300s;
+        proxy_send_timeout 300s;
+        proxy_read_timeout 300s;
+
+        proxy_pass http://baas-gateway:8088/;
+
+        proxy_set_header    X-Real-IP        $remote_addr;
+        proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;
+        proxy_set_header    HTTP_X_FORWARDED_FOR $remote_addr;
+        proxy_set_header    X-Forwarded-Proto $scheme;
+        proxy_redirect      default;
+    }
+    
+    location /api {
+        client_max_body_size    300m;
+        proxy_connect_timeout 300s;
+        proxy_send_timeout 300s;
+        proxy_read_timeout 300s;
+
+        proxy_pass http://baas-gateway:8088;
+
+        proxy_set_header    X-Real-IP        $remote_addr;
+        proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;
+        proxy_set_header    HTTP_X_FORWARDED_FOR $remote_addr;
+        proxy_set_header    X-Forwarded-Proto $scheme;
+        proxy_redirect      default;
+    }
+
+    location /websocket/ {
+        proxy_pass http://baas-gateway:8088/;
+        proxy_read_timeout 300s;
+
+        proxy_set_header   Host $host;
+        proxy_set_header   X-Real-IP $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection $connection_upgrade;
+    }
+
+    location = /50x.html {
+        root   /usr/share/nginx/console;
+    }
+}

docker/baas.conf

+map $http_upgrade $connection_upgrade {
+	default upgrade;
+	''      close;
+}
+
+server {
+    listen       80;
+    server_name  baasadmin.33.cn;
+    return 301 https://baasadmin.33.cn;
+    location / {
+        try_files $uri $uri/ =404;
+    }
+}
+
+server {
+    listen       443 ssl;
+    keepalive_timeout   70;
+    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers         AES128-SHA:AES256-SHA:RC4-SHA:DES-CBC3-SHA:RC4-MD5;
+    ssl_certificate     /etc/nginx/ssl/baas.33.cn.pem;
+    ssl_certificate_key /etc/nginx/ssl/baas.33.cn.key;
+    ssl_session_cache   shared:SSL:10m;
+    ssl_session_timeout 10m;
+    server_name baasadmin.33.cn;
+    root /usr/share/nginx/console/;
+    index index.html;
+    # 开启gzip
+	gzip on;
+	gzip_min_length 10k;
+	gzip_buffers 4 16k;
+	#gzip_http_version 1.0;
+	gzip_comp_level 9;
+	gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+	gzip_vary off;
+	gzip_disable "MSIE [1-6]\.";
+
+    location / {
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /root/ {
+        client_max_body_size    300m;
+        proxy_connect_timeout 300s;
+        proxy_send_timeout 300s;
+        proxy_read_timeout 300s;
+
+        proxy_pass http://baas-gateway:8088/;
+
+        proxy_set_header    X-Real-IP        $remote_addr;
+        proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;
+        proxy_set_header    HTTP_X_FORWARDED_FOR $remote_addr;
+        proxy_set_header    X-Forwarded-Proto $scheme;
+        proxy_redirect      default;
+    }
+
+    location /api {
+        client_max_body_size    300m;
+        proxy_connect_timeout 300s;
+        proxy_send_timeout 300s;
+        proxy_read_timeout 300s;
+
+        proxy_pass http://baas-gateway:8088;
+
+        proxy_set_header    X-Real-IP        $remote_addr;
+        proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;
+        proxy_set_header    HTTP_X_FORWARDED_FOR $remote_addr;
+        proxy_set_header    X-Forwarded-Proto $scheme;
+        proxy_redirect      default;
+    }
+
+    location /websocket/ {
+        proxy_pass http://baas-gateway:8088/;
+        proxy_read_timeout 300s;
+
+        proxy_set_header   Host $host;
+        proxy_set_header   X-Real-IP $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection $connection_upgrade;
+    }
+
+    location = /50x.html {
+        root   /usr/share/nginx/console;
+    }
+}