make it possible to deploy the war to a standalone tomcat

Author: yangziwen

README.md

@@ -17,7 +17,7 @@
 
 - **后端框架:**  Spring Boot, Spring Framework, Shiro
 
-- **数据库:**    MySQL
+- **数  据  库:**  MySQL
 
 ### 开发环境运行方法
 
@@ -46,6 +46,4 @@ set autocommit=1;
 ### 生产环境运行方法
    **1.打包项目** `mvn clean package`
 
-   **2.运行项目** `java -jar -Dspring.config.location=${your_application_properties_file} logreplay.war`
-
-   注意，虽然项目的打包产出是war包，但是只能基于内嵌tomcat直接运行，无法部署到独立的tomcat中
+   **2.运行项目** `java -jar -Dspring.config.location=${your_application_properties_file} logreplay.war`或将war包部署到独立的tomcat(8.5)中

src/main/java/io/github/yangziwen/logreplay/LogreplayApplication.java

@@ -3,8 +3,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.system.ApplicationPidFileWriter;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -16,7 +18,7 @@
 @EnableTransactionManagement
 @EnableWebSocketMessageBroker
 @SpringBootApplication
-public class LogreplayApplication {
+public class LogreplayApplication extends SpringBootServletInitializer {
 
 	@Bean("executor")
 	public ThreadPoolTaskExecutor executor() {
@@ -33,6 +35,11 @@ public AsyncEventBus eventBus(@Autowired ThreadPoolTaskExecutor executor) {
 		return new AsyncEventBus(executor);
 	}
 
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(LogreplayApplication.class);
+	}
+
 	public static void main(String[] args) {
 		System.setProperty("tomcat.util.http.parser.HttpParser.requestTargetAllow","|{}");
 		SpringApplication application = new SpringApplication(LogreplayApplication.class);

src/main/java/io/github/yangziwen/logreplay/config/DataSourceConfig.java

@@ -17,10 +17,11 @@ public class DataSourceConfig {
 
 	@Primary
 	@Bean("dataSource")
-	@ConfigurationProperties("hiraki.datasource")
+	@ConfigurationProperties("spring.datasource.hikari")
 	public HikariDataSource dataSource() {
 		return (HikariDataSource) DataSourceBuilder
 				.create()
+				.driverClassName("com.mysql.jdbc.Driver")
 				.type(HikariDataSource.class)
 				.build();
 	}

src/main/resources/application.properties

@@ -9,11 +9,11 @@ spring.main.banner-mode=off
 
 spring.pid.file=logreplay.pid
 
-hiraki.datasource.jdbc-url=jdbc:mysql://localhost:3306/logreplay?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-hiraki.datasource.username=mobile
-hiraki.datasource.password=mobile
-hiraki.datasource.minimum-idle=10
-hiraki.datasource.maximum-pool-size=100
+spring.datasource.hikari.jdbc-url=jdbc:mysql://localhost:3306/logreplay?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+spring.datasource.hikari.username=mobile
+spring.datasource.hikari.password=mobile
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=100
 
 shiro.remember.me.cipher.key=2itfW92XazYRi5ltW0M2yA==