Merge branch 'master' of http://192.168.0.27:8090/xuxu/yongxinda-h5

Dockerfile

@@ -26,13 +26,14 @@ RUN echo "\
                             proxy_set_header        X-Real-IP \$remote_addr; \
                             proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
                        } \
+
                       location /wx { \
                             proxy_pass              http://yongxingda; \
                             proxy_set_header        Host yongxingda; \
                             proxy_set_header        X-Real-IP \$remote_addr; \
                             proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
-                            charset                 utf-8; \
                        } \
+
                        #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
                        location / { \
                             root   /var/www/html/; \