Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

DOCKERFILE

@@ -42,11 +42,6 @@ RUN      npm install && \
          cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml && \
          cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml
 
-RUN      npm install && \
-         npm run build && \
-         mkdir -p /opt/wvp/config && \
-         cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml
-
          # wvp打包
 WORKDIR /home/wvp-GB28181
 RUN      mvn compile && \
@@ -129,4 +124,4 @@ RUN apt-get update && \
 
 WORKDIR /opt/wvp
 COPY --from=build /opt /opt
-CMD ["sh", "run.sh"]
+CMD ["sh", "run.sh"]