From 11160717c3d1144c642a4feb2f92b3b27f8a70e8 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Wed, 10 May 2023 19:30:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20`redisson-spring-boot-starter`=20?=
 =?UTF-8?q?=E5=92=8C=20`redis`=20=E9=85=8D=E7=BD=AE=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/youlai/system/config/RedisConfig.java | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/youlai/system/config/RedisConfig.java b/src/main/java/com/youlai/system/config/RedisConfig.java
index f2523932..5bbc38e4 100644
--- a/src/main/java/com/youlai/system/config/RedisConfig.java
+++ b/src/main/java/com/youlai/system/config/RedisConfig.java
@@ -1,13 +1,11 @@
 package com.youlai.system.config;
 
-import org.springframework.beans.factory.annotation.Value;
+import org.redisson.spring.starter.RedissonAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisPassword;
-import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
 
@@ -15,25 +13,9 @@ import org.springframework.data.redis.serializer.RedisSerializer;
  * Redis 配置
  */
 @Configuration
-@AutoConfigureBefore(RedisAutoConfiguration.class)
+@AutoConfigureBefore({RedisAutoConfiguration.class, RedissonAutoConfiguration.class})
 public class RedisConfig {
 
-    @Value("${spring.data.redis.host}")
-    private String redisHost;
-
-    @Value("${spring.data.redis.port}")
-    private Integer redisPort;
-
-    @Value("${spring.data.redis.password}")
-    private String redisPassword;
-
-    @Bean
-    public LettuceConnectionFactory redisConnectionFactory() {
-        RedisStandaloneConfiguration redisConfiguration = new RedisStandaloneConfiguration(redisHost, redisPort);
-        redisConfiguration.setPassword(RedisPassword.of(redisPassword));
-        return new LettuceConnectionFactory(redisConfiguration);
-    }
-
     /**
      * RedisTemplate 序列化配置
      * <p>
@@ -43,7 +25,7 @@ public class RedisConfig {
      * @return
      */
     @Bean
-    public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) {
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory lettuceConnectionFactory) {
 
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(lettuceConnectionFactory);