Merge remote-tracking branch 'origin/master'

nginx.conf

@@ -13,6 +13,58 @@ http {
     keepalive_timeout  65;
     client_max_body_size 50m;
 
+    server { 
+	listen 88;
+	server_name 120.46.159.163;
+    # ssl_certificate  /home/nginx/html/dms/ssl/www.dljpwx.com.crt;
+    # ssl_certificate_key  /home/nginx/html/dms/ssl/www.dljpwx.com.key;
+    # ssl_session_cache   shared:SSL:1m;
+    # ssl_ciphers  HIGH:!aNULL:!MD5;
+    # ssl_prefer_server_ciphers  on;
+
+    location / {
+        root /home/nginx/html/dms/app;
+        try_files $uri $uri/ /index.html;
+        index  index.html index.htm;
+    }
+
+    location /ezhizao-dms-sys/{
+	proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header REMOTE-HOST $remote_addr;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_pass http://120.46.159.163:7001/;
+    }
+
+    location /ezhizao-dms-p2/{
+	proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header REMOTE-HOST $remote_addr;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_pass http://120.46.159.163:7002/;
+    }
+
+    location /ezhizao-dms-production/{
+	proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header REMOTE-HOST $remote_addr;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_pass http://120.46.159.163:7003/;
+    }
+    location /ezhizao-dms-app/{
+	proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header REMOTE-HOST $remote_addr;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_pass http://120.46.159.163:7004/;
+    }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+   } 
+
    server { 
 	listen 80;
 	server_name 120.46.159.163;

run.sh

@@ -19,7 +19,7 @@ echo '----rm image----'
 # 打包编译docker镜像
 docker build -t ${group_name}/${app_name}:${app_version} .
 echo '----build image----'
-docker run -p ${vue_port}:80 --name ${app_name}  --network host \
+docker run -p ${vue_port}:80 -p 88:88 --name ${app_name}  --network host \
 -e TZ="Asia/Shanghai" \
 -v /home/nginx/html:/home/nginx/html \
 -d ${group_name}/${app_name}:${app_version}