Merge branch 'dev' into master

# Conflicts:
#	Dockerfile

Dockerfile

@@ -2,10 +2,10 @@ FROM node:10-alpine as builder
 WORKDIR /code
 RUN yarn config set registry https://registry.npm.taobao.org/
 ADD package.json /code
+ADD yarn.lock /code
 RUN yarn install
 ADD . /code
 RUN yarn build
 
 FROM nginx:1.19-alpine
-COPY nginx.conf /etc/nginx/conf.d/seecoder-paas-ui.conf
 COPY --from=builder /code/dist/ /var/www/html/dist/

nginx.conf

@@ -1,11 +0,0 @@
-server {
-  listen 80 default_server;
-  listen [::]:80 default_server;
-  root /var/www/html/dist;
-  location ~ / {
-    if ($request_uri ~* (api)) {
-        proxy_pass http://http://47.111.95.164:8080;
-    }
-    try_files $uri $uri/ /index.html;
-  }
-}