Merge remote-tracking branch 'origin/master'

nginx/conf.d/default.conf

@@ -2,6 +2,7 @@ server {
         listen       8080;
         server_name  _;
         charset utf-8;
+        
         location / {
             root   /app;
             try_files $uri $uri/ /index.html;
@@ -13,7 +14,7 @@ server {
             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://127.0.0.1:8880;
+            proxy_pass http://api-gateway:8080;
         }
 
         error_page   500 502 503 504  /50x.html;