From f71771c05b2294e1431147b4b1bd811f3e1c91d3 Mon Sep 17 00:00:00 2001
From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Sat, 6 Jul 2019 16:11:30 +0800
Subject: [PATCH] =?utf8?q?chore:=20=E4=BF=AE=E6=94=B9=E4=BA=86redis?=
 =?utf8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=87=87=E7=94=A8=20RedisProperties?=
 =?utf8?q?=20=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/application-devel-pg-local.properties  |  7 +++--
 config/application-devel-pg.properties        |  7 +++--
 .../com/supwisdom/dlpay/PayApiApplication.kt  | 26 ++++++-------------
 src/main/resources/application.properties     |  2 ++
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/config/application-devel-pg-local.properties b/config/application-devel-pg-local.properties
index 3e4a3181..fb8bfc2f 100644
--- a/config/application-devel-pg-local.properties
+++ b/config/application-devel-pg-local.properties
@@ -12,10 +12,9 @@ spring.datasource.username=payapi
 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 057303b3..14b0bfe9 100644
--- a/config/application-devel-pg.properties
+++ b/config/application-devel-pg.properties
@@ -11,10 +11,9 @@ spring.datasource.password=123456
 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 a25fd95b..c2d2a32a 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 @@ import org.springframework.scheduling.annotation.EnableScheduling
 @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 8776e421..cee20f16 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -31,3 +31,5 @@ dayend.settletask.cron=0 3/30 2-3 * * ?
 ################################################
 # user password
 auth.password.bcrypt.length=10
+###################################################
+spring.redis.database=0
\ No newline at end of file
-- 
2.17.1