Merge remote-tracking branch 'origin/master'

pom.xml

@@ -9,7 +9,7 @@
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.mingsoft</groupId>
-	<artifactId>mcms</artifactId>
+	<artifactId>ms-mcms</artifactId>
 	<version>5.1-SNAPSHOT</version>
 	<name>ms-mcms</name>
 	<properties>
@@ -22,11 +22,7 @@
 			<artifactId>ms-mpeople</artifactId>
 		</dependency>
 		<!-- 此部分是铭飞平台MStroe的客户端（MStore不在铭飞开源产品范围），如果不需要使用MStore可以删除掉 -->
-		<dependency>
-			<groupId>net.mingsoft</groupId>
-			<artifactId>store-client</artifactId>
-			<version>2.0</version>
-		</dependency>
+
 	</dependencies>
 	<build>
 		<finalName>ms-mcms</finalName>
@@ -40,30 +36,24 @@
 					<target>${java.version}</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<fork>true</fork>
-				</configuration>
-			</plugin>
 		</plugins>
 		<resources>
 			<resource>
 				<directory>src/main/webapp</directory>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
+				<excludes>
+					<exclude>static/**</exclude>
+					<exclude>html/**</exclude>
+					<exclude>upload/**</exclude>
+					<exclude>templets/**</exclude>
+				</excludes>
 			</resource>
 			<resource>
 				<directory>src/main/java</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+					<exclude>**/MSApplication.class</exclude>
+					<exclude>**/MSServletInitializer.class</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<defaultGoal>compile</defaultGoal>