增加dockfile

pom.xml

@@ -163,7 +163,6 @@
 	
 	<build>
 		<plugins>
-
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -177,7 +176,8 @@
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
-					<!-- <webResources>
+<<<<<<< HEAD
+					<webResources>
 						<resource>
 							<directory>${project.basedir}/libs</directory>
 							<targetPath>WEB-INF/lib</targetPath>
@@ -186,7 +186,9 @@
 								<include>**/*.jar</include>
 							</includes>
 						</resource>
-					</webResources> -->
+					</webResources>
+=======
+>>>>>>> upstream/master
 				</configuration>
 			</plugin>
 
@@ -194,7 +196,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
-
 		</plugins>
 	</build>
 </project>