改进build脚本

diff --git a/build.gradle b/build.gradle
index 4c26d8a..1718a71 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -21,12 +21,19 @@ repositories {
 }
 
 war {
+    enabled = true
     manifest {
         attributes('Payapi-Version': rootProject.version)
         writeTo(project.buildDir.toString() + "/classes/MATE-INF.MF")
     }
 }
 
+bootWar {
+    excludeDevtools = false
+    mainClassName = 'com.supwisdom.dlpay.PayApiApplication'
+}
+
+
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'

diff --git a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
index 0181d2d..0224ff9 100644 (file)
--- a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
@@ -2,8 +2,11 @@ package com.supwisdom.dlpay
 
 import io.lettuce.core.ReadFrom
 import org.springframework.beans.factory.annotation.Value
+import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.builder.SpringApplicationBuilder
 import org.springframework.boot.runApplication
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 import org.springframework.cache.annotation.EnableCaching
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient
 import org.springframework.context.annotation.Bean
@@ -67,13 +70,17 @@ class HttpSessionConfig {
 }
 
 
-
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableCaching
-class PayApiApplication
+class PayApiApplication : SpringBootServletInitializer() {
 
-fun main(args: Array<String>) {
-    runApplication<PayApiApplication>(*args)
+    override fun configure(builder: SpringApplicationBuilder): SpringApplicationBuilder {
+        return builder.sources(PayApiApplication::class.java)
+    }
 }
+
+fun main(args: Array<String>) {
+    SpringApplication.run(PayApiApplication::class.java, * args)
+}
\ No newline at end of file