Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-paterson/Dockerfile

@@ -0,0 +1,14 @@
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
+
+MAINTAINER h5u@163.com
+
+RUN mkdir -p /logpm/logpm-factory-data-paterson
+
+WORKDIR /logpm/logpm-factory-data-paterson
+
+EXPOSE 19010
+
+ADD ./target/logpm-factory-data-paterson.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m", "app.jar"]
+CMD ["--spring.profiles.active=test"]