update 升级 luttuce 为 redisson 性能更强 工具更全

ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java

@@ -1,42 +1,69 @@
 package com.ruoyi.framework.config;
 
-import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer;
+import com.ruoyi.framework.config.properties.RedissonProperties;
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.codec.JsonJacksonCodec;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.io.IOException;
 
 /**
  * redis配置
  *
- * @author ruoyi
+ * @author Lion Li
  */
 @Configuration
 @EnableCaching
-public class RedisConfig extends CachingConfigurerSupport
-{
-    @Bean
-    @SuppressWarnings(value = { "unchecked", "rawtypes" })
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
-    {
-        RedisTemplate<Object, Object> template = new RedisTemplate<>();
-        template.setConnectionFactory(connectionFactory);
+public class RedisConfig extends CachingConfigurerSupport {
 
-        GenericFastJsonRedisSerializer serializer = new GenericFastJsonRedisSerializer();
-		StringRedisSerializer keySerializer = new StringRedisSerializer();
+	private static final String REDIS_PROTOCOL_PREFIX = "redis://";
+	private static final String REDISS_PROTOCOL_PREFIX = "rediss://";
 
-        // 使用StringRedisSerializer来序列化和反序列化redis的key值
-		template.setKeySerializer(keySerializer);
-        template.setValueSerializer(serializer);
+	@Autowired
+	private RedisProperties redisProperties;
 
-        // Hash的key也采用StringRedisSerializer的序列化方式
-        template.setHashKeySerializer(keySerializer);
-        template.setHashValueSerializer(serializer);
+	@Autowired
+	private RedissonProperties redissonProperties;
 
-        template.afterPropertiesSet();
-        return template;
-    }
+	@Bean(destroyMethod = "shutdown")
+	@ConditionalOnMissingBean(RedissonClient.class)
+	public RedissonClient redisson() throws IOException {
+		String prefix = REDIS_PROTOCOL_PREFIX;
+		if (redisProperties.isSsl()) {
+			prefix = REDISS_PROTOCOL_PREFIX;
+		}
+		Config config = new Config();
+		config.setThreads(redissonProperties.getThreads())
+			.setNettyThreads(redissonProperties.getNettyThreads())
+			.setCodec(JsonJacksonCodec.INSTANCE)
+			.setTransportMode(redissonProperties.getTransportMode());
+
+		RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig();
+		// 使用单机模式
+		config.useSingleServer()
+			.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
+			.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
+			.setDatabase(redisProperties.getDatabase())
+			.setPassword(redisProperties.getPassword())
+			.setTimeout(singleServerConfig.getTimeout())
+			.setRetryAttempts(singleServerConfig.getRetryAttempts())
+			.setRetryInterval(singleServerConfig.getRetryInterval())
+			.setSubscriptionsPerConnection(singleServerConfig.getSubscriptionsPerConnection())
+			.setClientName(singleServerConfig.getClientName())
+			.setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
+			.setSubscriptionConnectionMinimumIdleSize(singleServerConfig.getSubscriptionConnectionMinimumIdleSize())
+			.setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
+			.setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize())
+			.setConnectionPoolSize(singleServerConfig.getConnectionPoolSize())
+			.setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval());
+		return Redisson.create(config);
+	}
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java

@@ -0,0 +1,101 @@
+package com.ruoyi.framework.config.properties;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.redisson.client.codec.Codec;
+import org.redisson.config.TransportMode;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * Redisson 配置属性
+ *
+ * @author Lion Li
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "redisson")
+public class RedissonProperties {
+
+	/**
+	 * 线程池数量,默认值 = 当前处理核数量 * 2
+	 */
+	private int threads;
+
+	/**
+	 * Netty线程池数量,默认值 = 当前处理核数量 * 2
+	 */
+	private int nettyThreads;
+
+	/**
+	 * 传输模式
+	 */
+	private TransportMode transportMode;
+
+	/**
+	 * 单机服务配置
+	 */
+	private SingleServerConfig singleServerConfig;
+
+	@Data
+	@NoArgsConstructor
+	public static class SingleServerConfig {
+
+		/**
+		 * 客户端名称
+		 */
+		private String clientName;
+
+		/**
+		 * 最小空闲连接数
+		 */
+		private int connectionMinimumIdleSize;
+
+		/**
+		 * 连接池大小
+		 */
+		private int connectionPoolSize;
+
+		/**
+		 * 连接空闲超时，单位：毫秒
+		 */
+		private int idleConnectionTimeout;
+
+		/**
+		 * 命令等待超时，单位：毫秒
+		 */
+		private int timeout;
+
+		/**
+		 * 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+		 */
+		private int retryAttempts;
+
+		/**
+		 * 命令重试发送时间间隔，单位：毫秒
+		 */
+		private int retryInterval;
+
+		/**
+		 * 发布和订阅连接的最小空闲连接数
+		 */
+		private int subscriptionConnectionMinimumIdleSize;
+
+		/**
+		 * 发布和订阅连接池大小
+		 */
+		private int subscriptionConnectionPoolSize;
+
+		/**
+		 * 单个连接最大订阅数量
+		 */
+		private int subscriptionsPerConnection;
+
+		/**
+		 * DNS监测时间间隔，单位：毫秒
+		 */
+		private int dnsMonitoringInterval;
+
+	}
+
+}