tuonina 6 vuotta sitten
vanhempi
commit
d8536b3e51
2 muutettua tiedostoa jossa 7 lisäystä ja 21 poistoa
  1. 2 18
      zen-web/build.gradle
  2. 5 3
      zen-web/src/main/resources/application.yml

+ 2 - 18
zen-web/build.gradle

@@ -1,6 +1,3 @@
-//apply plugin: 'jar'
-//apply plugin: 'war'
-
 apply plugin: 'docker'
 apply plugin: 'application'
 
@@ -9,9 +6,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
         classpath('se.transmode.gradle:gradle-docker:1.2')
     }
 }
@@ -46,15 +40,5 @@ task dockerBuilder(type: Docker) {
 dockerBuilder.dependsOn(bootJar)
 
 
-bootJar {
-    enabled = true
-}
-
-jar {
-    enabled = false
-}
-
-//实际上这个配置是没有用的,distDocker 打包出来的,启动不了
-startScripts{
-    mainClassName='org.springframework.boot.loader.JarLauncher'
-}
+bootJar { enabled = true }
+jar { enabled = false }

+ 5 - 3
zen-web/src/main/resources/application.yml

@@ -1,4 +1,5 @@
 
+
 # 数据库配置暂时卸载项目中,后期会全部移到配置中心去。
 
 ---
@@ -8,11 +9,11 @@ spring:
     username: root
     password: tuonina
     url: jdbc:mysql://192.168.1.206:3307/envir_test?useInformationSchema=true&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
-# &useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+  jta:
+    log-dir: .logs
 
 swagger:
   open: true
-
 ---
 spring:
   profiles: prod
@@ -20,7 +21,8 @@ spring:
     username: root
     password: tuonina
     url: jdbc:mysql://192.168.1.206:3307/envir_test?useInformationSchema=true&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
-# &useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+  jta:
+    log-dir: .logs
 
 swagger:
   open: false