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 序列化配置 *
@@ -43,7 +25,7 @@ public class RedisConfig {
* @return
*/
@Bean
- public RedisTemplate