diff --git a/pom.xml b/pom.xml
index 01d87374..f9654212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,9 +6,9 @@
net.mingsoft
mcms
- 0.0.1-SNAPSHOT
- mcms1
- war
+ 4.7.0-SNAPSHOT
+ ms-mcms
+ jar
1.8
@@ -49,12 +49,6 @@
classes
provided
-
- net.mingsoft
- ms-basic
- 1.0.8.1-SNAPSHOT
- war
-
net.mingsoft
ms-mdiy
@@ -62,12 +56,6 @@
classes
provided
-
- net.mingsoft
- ms-mdiy
- 1.0.7-SNAPSHOT
- war
-
net.mingsoft
ms-mpeople
@@ -75,16 +63,89 @@
classes
provided
+
+
- net.mingsoft
- ms-mpeople
- 1.0.7-SNAPSHOT
- war
+ io.springfox
+ springfox-swagger2
+ 2.9.2
+
+
+ org.springframework
+ spring-core
+
+
+ org.springframework
+ spring-beans
+
+
+ org.springframework
+ spring-context
+
+
+ org.springframework
+ spring-context-support
+
+
+ org.springframework
+ spring-aop
+
+
+ org.springframework
+ spring-tx
+
+
+ org.springframework
+ spring-orm
+
+
+ org.springframework
+ spring-jdbc
+
+
+ org.springframework
+ spring-web
+
+
+ org.springframework
+ spring-webmvc
+
+
+ org.springframework
+ spring-oxm
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+ 2.9.2
ms-mcms
+
org.apache.maven.plugins
maven-compiler-plugin
diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile
new file mode 100644
index 00000000..129c4dd5
--- /dev/null
+++ b/src/main/resources/Dockerfile
@@ -0,0 +1,5 @@
+FROM java
+VOLUME /tmp
+ADD docker-springboot-0.0.1-SNAPSHOT.jar app.jar
+RUN bash -c 'touch /app.jar' ENV JAVA_OPTS=""
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
\ No newline at end of file
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
new file mode 100644
index 00000000..8319ac8f
--- /dev/null
+++ b/src/main/resources/application-pro.yml
@@ -0,0 +1,7 @@
+spring:
+ datasource:
+ url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+ username: root
+ password: root
+ filters: wall,mergeStat
+ type: com.alibaba.druid.pool.DruidDataSource
\ No newline at end of file
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
new file mode 100644
index 00000000..2c3a9d64
--- /dev/null
+++ b/src/main/resources/application-test.yml
@@ -0,0 +1,7 @@
+spring:
+ datasource:
+ url: jdbc:mysql://192.168.1.18:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+ username: root
+ password: root
+ filters: wall,mergeStat
+ type: com.alibaba.druid.pool.DruidDataSource
\ No newline at end of file