修改项目部署配置

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.cc</groupId>
 	<artifactId>xzxt-control</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.ty.1.1-SNAPSHOT_${maven.build.timestamp}</version>
 	<packaging>war</packaging>
 
 	<name>xzxt-control</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.15.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -91,6 +91,13 @@
 			<artifactId>lombok</artifactId>
 			<version>1.16.10</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j</artifactId>
+			<version>1.3.8.RELEASE</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -100,6 +107,24 @@
 
 	<build>
 		<finalName>xzxt-control</finalName>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>static/**</exclude>
+					<exclude>resources/**</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>static/**</include>
+					<include>resources/**</include>
+				</includes>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>

src/main/java/com/cc/ServletInitializer.java

 package com.cc;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
 
 public class ServletInitializer extends SpringBootServletInitializer {
 

src/main/resources/application.properties

@@ -2,7 +2,7 @@
 spring.servlet.multipart.max-request-size=10MB
 # \u5355\u4E2A\u6587\u4EF6\u7684\u6700\u5927\u503C
 spring.servlet.multipart.max-file-size=10MB
-
+version=@project.version@
 # \u5B58\u50A8\u90E8\u7F72\u6587\u6863\u8DEF\u5F84
 #DocumentPath: D://word//
 DocumentPath: /usr/local/word

src/main/resources/application.yml

@@ -2,9 +2,9 @@ spring:
   datasource:
 #   数据源基本配置
     username: root
-    password: 123456
+    password: 123
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.94.61.158:3306/mybatis
+    url: jdbc:mysql://127.0.0.1:3306/mybatis
     type: com.alibaba.druid.pool.DruidDataSource
 #   数据源其他配置
     initialSize: 5
@@ -34,12 +34,12 @@ mybatis:
     #  - classpath:sql/employee.sql
   # 调用运行监控微服务url
 service-rest:
-  startRest: "http://10.94.61.158:8084/service-rest/start"
-  stopRest: "http://10.94.61.158:8084/service-rest/stop"
-  reportRest: "http://10.94.61.158:8084/service-rest/report"
-  LogsRest: "http://10.94.61.158:8084/service-rest/logs"
+  startRest: "http://127.0.0.1:8084/service-rest/start"
+  stopRest: "http://127.0.0.1:8084/service-rest/stop"
+  reportRest: "http://127.0.0.1:8084/service-rest/report"
+  LogsRest: "http://127.0.0.1:8084/service-rest/logs"
   # 调用运行监控微服务shell脚本位置（注意：不建议修改）
-  shellPaht: "/usr/local/shell/"
+  shellPaht: "/usr/local/"
   # 调用运行监控微服务shell脚本
   startTomcatName: "startTomcat.sh"
   stopTomcatName: "shutTomcat.sh"

src/main/resources/version.txt

+version=@project.version@
+describe=
+1.修改页面；
+2.新增查询功能；
+3.本次打包更新以上1.2功能；
+4.新增消息功能
\ No newline at end of file