优化配置，更新kotlin版本
diff --git a/build.gradle b/build.gradle
index c946c29..dce34e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,7 +65,7 @@
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.security:spring-security-oauth2-client'
implementation 'org.springframework.security:spring-security-oauth2-jose'
- implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
+ implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.session:spring-session-data-redis:2.0.10.RELEASE'
implementation 'org.jetbrains.kotlin:kotlin-reflect'
diff --git a/config/application-devel-pg.properties b/config/application-devel-pg.properties
index cb57d15..1e91bce 100644
--- a/config/application-devel-pg.properties
+++ b/config/application-devel-pg.properties
@@ -1,10 +1,11 @@
-
spring.main.banner-mode=off
# create and drop tables and sequences, loads import.sql
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
spring.datasource.continue-on-error=true
spring.datasource.initialization-mode=always
+spring.jpa.show-sql=true
+logging.level.org.hibernate.SQL=DEBUG
# Postgresql settings
spring.datasource.platform=postgresql
spring.datasource.url=jdbc:postgresql://172.28.201.70:15432/restaurantdev
@@ -12,10 +13,9 @@
spring.datasource.password=123456
database.dbtype=postgresql
# Redis settings
-redis.server=172.28.201.101
-redis.port=16379
-redis.password=kingstar
-redis.database=0
+spring.redis.host=172.28.201.101
+spring.redis.port=16379
+spring.redis.password=kingstar
# jwt settings
jwt.secret=Zj5taLomEbrM0lk+NMQZbHfSxaDU1wekjT+kiC3YzDw=
# timeout seconds
diff --git a/gradle.properties b/gradle.properties
index c4325c4..000a115 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
springbootVersion = 2.1.3.RELEASE
-kotlinVersion = 1.2.41
+kotlinVersion = 1.3.20
restaurantVersion = 1.0
jdkVersion = 1.8
\ No newline at end of file
diff --git a/src/main/kotlin/com/supwisdom/dlpay/RestaurantApplication.kt b/src/main/kotlin/com/supwisdom/dlpay/RestaurantApplication.kt
index 5c5eb52..46f5548 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/RestaurantApplication.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/RestaurantApplication.kt
@@ -1,8 +1,9 @@
package com.supwisdom.dlpay
import io.lettuce.core.ReadFrom
-import org.springframework.beans.factory.annotation.Value
+import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties
import org.springframework.boot.runApplication
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
@@ -21,29 +22,19 @@
@EnableRedisRepositories
class AppConfig {
- @Value("\${redis.server}")
- lateinit var server: String
-
- @Value("\${redis.port}")
- var port: Int = 0
-
- @Value("\${redis.database}")
- var database: Int = 0
-
- @Value("\${redis.password}")
- lateinit var password: String
+ @Autowired
+ private lateinit var redis: RedisProperties
@Bean
fun redisConnectionFactory(): RedisConnectionFactory {
val clientConfig = LettuceClientConfiguration.builder()
.readFrom(ReadFrom.SLAVE_PREFERRED)
.build()
- val serverConfig = RedisStandaloneConfiguration(server, port)
- if (password.isNotEmpty()) {
- serverConfig.password = RedisPassword.of(password)
+ val serverConfig = RedisStandaloneConfiguration(redis.host, redis.port)
+ if (redis.password.isNotEmpty()) {
+ serverConfig.password = RedisPassword.of(redis.password)
}
- serverConfig.database = database
-
+ serverConfig.database = redis.database
return LettuceConnectionFactory(serverConfig, clientConfig)
}
}