chore: 修改了redis配置，采用 RedisProperties 读取配置
diff --git a/config/application-devel-pg-local.properties b/config/application-devel-pg-local.properties
index 3e4a318..fb8bfc2 100644
--- a/config/application-devel-pg-local.properties
+++ b/config/application-devel-pg-local.properties
@@ -12,10 +12,9 @@
spring.datasource.password=123456
database.dbtype=postgresql
# Redis settings
-redis.server=localhost
-redis.port=6379
-redis.password=
-redis.database=0
+spring.redis.server=localhost
+spring.redis.port=6379
+spring.redis.password=
# jwt settings
jwt.secret=Zj5taLomEbrM0lk+NMQZbHfSxaDU1wekjT+kiC3YzDw=
# timeout seconds
diff --git a/config/application-devel-pg.properties b/config/application-devel-pg.properties
index 057303b..14b0bfe 100644
--- a/config/application-devel-pg.properties
+++ b/config/application-devel-pg.properties
@@ -11,10 +11,9 @@
spring.datasource.continue-on-error=true
#spring.datasource.initialization-mode=always
# Redis settings
-redis.server=172.28.201.101
-redis.port=16379
-redis.password=kingstar
-redis.database=0
+spring.redis.server=172.28.201.101
+spring.redis.port=16379
+spring.redis.password=kingstar
# jwt settings
jwt.secret=Zj5taLomEbrM0lk+NMQZbHfSxaDU1wekjT+kiC3YzDw=
# timeout seconds
diff --git a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
index a25fd95..c2d2a32 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
@@ -1,11 +1,11 @@
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.SpringApplication
import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties
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
@@ -27,29 +27,19 @@
@EnableRedisRepositories
class AppConfig {
- @Value("\${redis.server}")
- lateinit var server: String
-
- @Value("\${redis.port:6379}")
- var port: Int = 0
-
- @Value("\${redis.database:0}")
- 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)
}
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8776e42..cee20f1 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -31,3 +31,5 @@
################################################
# user password
auth.password.bcrypt.length=10
+###################################################
+spring.redis.database=0
\ No newline at end of file