wangrunpu
/
stm32-iot-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
疯狂的狮子li 5 years ago
parent f3aaa7ea7a
commit 99c4692a0d
7 changed files with 448 additions and 271 deletions
Show Stats Download Patch File Download Diff File

8
pom.xml
Unescape View File

@ -31,6 +31,7 @@
<feign.version>2.2.6.RELEASE</feign.version> <feign.version>2.2.6.RELEASE</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version> <feign-okhttp.version>11.0</feign-okhttp.version>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version> <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
<redisson.version>3.15.2</redisson.version>
</properties> </properties>
<!-- 依赖声明 --> <!-- 依赖声明 -->
@ -180,6 +181,13 @@
<version>${ruoyi-vue-plus.version}</version> <version>${ruoyi-vue-plus.version}</version>
</dependency> </dependency>
<!--redisson-->
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

45
ruoyi-admin/src/main/resources/application-dev.yml
Unescape View File

@ -67,13 +67,38 @@ spring:
password: password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: # 是否开启ssl
pool: ssl: false
# 连接池中的最小空闲连接
min-idle: 0 --- # redisson 客户端配置
# 连接池中的最大空闲连接 redisson:
max-idle: 8 # 线程池数量
# 连接池的最大数据库连接数 threads: 16
max-active: 8 # Netty线程池数量
# #连接池最大阻塞等待时间（使用负值表示没有限制） nettyThreads: 32
max-wait: -1ms # 传输模式
transportMode: "NIO"
# 单节点配置
singleServerConfig:
# 客户端名称
clientName: ${ruoyi-vue-plus.name}
# 最小空闲连接数
connectionMinimumIdleSize: 32
# 连接池大小
connectionPoolSize: 64
# 连接空闲超时，单位：毫秒
idleConnectionTimeout: 10000
# 命令等待超时，单位：毫秒
timeout: 3000
# 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
retryAttempts: 3
# 命令重试发送时间间隔，单位：毫秒
retryInterval: 1500
# 发布和订阅连接的最小空闲连接数
subscriptionConnectionMinimumIdleSize: 1
# 发布和订阅连接池大小
subscriptionConnectionPoolSize: 50
# 单个连接最大订阅数量
subscriptionsPerConnection: 5
# DNS监测时间间隔，单位：毫秒
dnsMonitoringInterval: 5000

45
ruoyi-admin/src/main/resources/application-prod.yml
Unescape View File

@ -67,13 +67,38 @@ spring:
password: password:
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: # 是否开启ssl
pool: ssl: false
# 连接池中的最小空闲连接
min-idle: 0 --- # redisson 客户端配置
# 连接池中的最大空闲连接 redisson:
max-idle: 8 # 线程池数量
# 连接池的最大数据库连接数 threads: 16
max-active: 8 # Netty线程池数量
# #连接池最大阻塞等待时间（使用负值表示没有限制） nettyThreads: 32
max-wait: -1ms # 传输模式
transportMode: "NIO"
# 单节点配置
singleServerConfig:
# 客户端名称
clientName: ${ruoyi-vue-plus.name}
# 最小空闲连接数
connectionMinimumIdleSize: 32
# 连接池大小
connectionPoolSize: 64
# 连接空闲超时，单位：毫秒
idleConnectionTimeout: 10000
# 命令等待超时，单位：毫秒
timeout: 3000
# 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
retryAttempts: 3
# 命令重试发送时间间隔，单位：毫秒
retryInterval: 1500
# 发布和订阅连接的最小空闲连接数
subscriptionConnectionMinimumIdleSize: 1
# 发布和订阅连接池大小
subscriptionConnectionPoolSize: 50
# 单个连接最大订阅数量
subscriptionsPerConnection: 5
# DNS监测时间间隔，单位：毫秒
dnsMonitoringInterval: 5000

6
ruoyi-common/pom.xml
Unescape View File

@ -151,6 +151,12 @@
<artifactId>spring-boot-configuration-processor</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>
</dependency> </dependency>
<!--redisson-->
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

431
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
Unescape View File

@ -1,234 +1,219 @@
package com.ruoyi.common.core.redis; package com.ruoyi.common.core.redis;
import java.util.Collection; import com.google.common.collect.Lists;
import java.util.Iterator; import org.redisson.api.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.BoundSetOperations;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.*;
import java.util.concurrent.TimeUnit;
/** /**
* spring redis 工具类 * spring redis 工具类
* *
* @author ruoyi * @author shenxinquan
**/ **/
@SuppressWarnings(value = { "unchecked", "rawtypes" }) @SuppressWarnings(value = {"unchecked", "rawtypes"})
@Component @Component
public class RedisCache public class RedisCache {
{
@Autowired @Autowired
public RedisTemplate redisTemplate; private RedissonClient redissonClient;
/** /**
* 缓存基本的对象，Integer、String、实体类等 * 缓存基本的对象，Integer、String、实体类等
* *
* @param key 缓存的键值 * @param key 缓存的键值
* @param value 缓存的值 * @param value 缓存的值
*/ */
public <T> void setCacheObject(final String key, final T value) public <T> void setCacheObject(final String key, final T value) {
{ redissonClient.getBucket(key).set(value);
redisTemplate.opsForValue().set(key, value); }
}
/**
/** * 缓存基本的对象，Integer、String、实体类等
* 缓存基本的对象，Integer、String、实体类等 *
* * @param key 缓存的键值
* @param key 缓存的键值 * @param value 缓存的值
* @param value 缓存的值 * @param timeout 时间
* @param timeout 时间 * @param timeUnit 时间颗粒度
* @param timeUnit 时间颗粒度 */
*/ public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) RBucket<T> result = redissonClient.getBucket(key);
{ result.set(value);
redisTemplate.opsForValue().set(key, value, timeout, timeUnit); result.expire(timeout, timeUnit);
} }
/** /**
* 设置有效时间 * 设置有效时间
* *
* @param key Redis键 * @param key Redis键
* @param timeout 超时时间 * @param timeout 超时时间
* @return true=设置成功；false=设置失败 * @return true=设置成功；false=设置失败
*/ */
public boolean expire(final String key, final long timeout) public boolean expire(final String key, final long timeout) {
{ return expire(key, timeout, TimeUnit.SECONDS);
return expire(key, timeout, TimeUnit.SECONDS); }
}
/**
/** * 设置有效时间
* 设置有效时间 *
* * @param key Redis键
* @param key Redis键 * @param timeout 超时时间
* @param timeout 超时时间 * @param unit 时间单位
* @param unit 时间单位 * @return true=设置成功；false=设置失败
* @return true=设置成功；false=设置失败 */
*/ public boolean expire(final String key, final long timeout, final TimeUnit unit) {
public boolean expire(final String key, final long timeout, final TimeUnit unit) RBucket rBucket = redissonClient.getBucket(key);
{ return rBucket.expire(timeout, unit);
return redisTemplate.expire(key, timeout, unit); }
}
/**
/** * 获得缓存的基本对象。
* 获得缓存的基本对象。 *
* * @param key 缓存键值
* @param key 缓存键值 * @return 缓存键值对应的数据
* @return 缓存键值对应的数据 */
*/ public <T> T getCacheObject(final String key) {
public <T> T getCacheObject(final String key) RBucket<T> rBucket = redissonClient.getBucket(key);
{ return rBucket.get();
ValueOperations<String, T> operation = redisTemplate.opsForValue(); }
return operation.get(key);
} /**
* 删除单个对象
/** *
* 删除单个对象 * @param key
* */
* @param key public boolean deleteObject(final String key) {
*/ return redissonClient.getBucket(key).delete();
public boolean deleteObject(final String key) }
{
return redisTemplate.delete(key); /* */
}
/**
/** * 删除集合对象
* 删除集合对象 *
* * @param collection 多个对象
* @param collection 多个对象 * @return
* @return */
*/ public long deleteObject(final Collection collection) {
public long deleteObject(final Collection collection) return redissonClient.getKeys().delete(Arrays.toString(collection.toArray()));
{ }
return redisTemplate.delete(collection);
} /**
* 缓存List数据
/** *
* 缓存List数据 * @param key 缓存的键值
* * @param dataList 待缓存的List数据
* @param key 缓存的键值 * @return 缓存的对象
* @param dataList 待缓存的List数据 */
* @return 缓存的对象 public <T> boolean setCacheList(final String key, final List<T> dataList) {
*/ RList<T> rList = redissonClient.getList(key);
public <T> long setCacheList(final String key, final List<T> dataList) return rList.addAll(dataList);
{ }
Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
return count == null ? 0 : count; /**
} * 获得缓存的list对象
*
/** * @param key 缓存的键值
* 获得缓存的list对象 * @return 缓存键值对应的数据
* */
* @param key 缓存的键值 public <T> List<T> getCacheList(final String key) {
* @return 缓存键值对应的数据 RList<T> rList = redissonClient.getList(key);
*/ return rList.readAll();
public <T> List<T> getCacheList(final String key) }
{
return redisTemplate.opsForList().range(key, 0, -1); /**
} * 缓存Set
*
/** * @param key 缓存键值
* 缓存Set * @param dataSet 缓存的数据
* * @return 缓存数据的对象
* @param key 缓存键值 */
* @param dataSet 缓存的数据 public <T> boolean setCacheSet(final String key, final Set<T> dataSet) {
* @return 缓存数据的对象 RSet<T> rSet = redissonClient.getSet(key);
*/ return rSet.addAll(dataSet);
public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) }
{
BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key); /**
Iterator<T> it = dataSet.iterator(); * 获得缓存的set
while (it.hasNext()) *
{ * @param key
setOperation.add(it.next()); * @return
} */
return setOperation; public <T> Set<T> getCacheSet(final String key) {
} RSet<T> rSet = redissonClient.getSet(key);
return rSet.readAll();
/** }
* 获得缓存的set
* /**
* @param key * 缓存Map
* @return *
*/ * @param key
public <T> Set<T> getCacheSet(final String key) * @param dataMap
{ */
return redisTemplate.opsForSet().members(key); public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
} if (dataMap != null) {
RMap<String, T> rMap = redissonClient.getMap(key);
/** rMap.putAll(dataMap);
* 缓存Map }
* }
* @param key
* @param dataMap /**
*/ * 获得缓存的Map
public <T> void setCacheMap(final String key, final Map<String, T> dataMap) *
{ * @param key
if (dataMap != null) { * @return
redisTemplate.opsForHash().putAll(key, dataMap); */
} public <T> Map<String, T> getCacheMap(final String key) {
} RMap<String, T> rMap = redissonClient.getMap(key);
return rMap.getAll(rMap.keySet());
/** }
* 获得缓存的Map
* /**
* @param key * 往Hash中存入数据
* @return *
*/ * @param key Redis键
public <T> Map<String, T> getCacheMap(final String key) * @param hKey Hash键
{ * @param value 值
return redisTemplate.opsForHash().entries(key); */
} public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
RMap<String, T> rMap = redissonClient.getMap(key);
/** rMap.put(hKey, value);
* 往Hash中存入数据 }
*
* @param key Redis键 /**
* @param hKey Hash键 * 获取Hash中的数据
* @param value 值 *
*/ * @param key Redis键
public <T> void setCacheMapValue(final String key, final String hKey, final T value) * @param hKey Hash键
{ * @return Hash中的对象
redisTemplate.opsForHash().put(key, hKey, value); */
} public <T> T getCacheMapValue(final String key, final String hKey) {
RMap<String, T> rMap = redissonClient.getMap(key);
/** return rMap.get(hKey);
* 获取Hash中的数据 }
*
* @param key Redis键 /**
* @param hKey Hash键 * 获取多个Hash中的数据
* @return Hash中的对象 *
*/ * @param key Redis键
public <T> T getCacheMapValue(final String key, final String hKey) * @param hKeys Hash键集合
{ * @return Hash对象集合
HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash(); */
return opsForHash.get(key, hKey); public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
} RListMultimap rListMultimap = redissonClient.getListMultimap(key);
return rListMultimap.getAll(hKeys);
/** }
* 获取多个Hash中的数据
* /**
* @param key Redis键 * 获得缓存的基本对象列表
* @param hKeys Hash键集合 *
* @return Hash对象集合 * @param pattern 字符串前缀
*/ * @return 对象列表
public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) */
{ public Collection<String> keys(final String pattern) {
return redisTemplate.opsForHash().multiGet(key, hKeys); Iterable<String> iterable = redissonClient.getKeys().getKeysByPattern(pattern);
} return Lists.newArrayList(iterable);
}
/**
* 获得缓存的基本对象列表
*
* @param pattern 字符串前缀
* @return 对象列表
*/
public Collection<String> keys(final String pattern)
{
return redisTemplate.keys(pattern);
}
} }

83
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
Unescape View File

@ -1,42 +1,69 @@
package com.ruoyi.framework.config; 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.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate; import java.io.IOException;
import org.springframework.data.redis.serializer.StringRedisSerializer;
/** /**
* redis配置 * redis配置
* *
* @author ruoyi * @author Lion Li
*/ */
@Configuration @Configuration
@EnableCaching @EnableCaching
public class RedisConfig extends CachingConfigurerSupport public class RedisConfig extends CachingConfigurerSupport {
{
@Bean private static final String REDIS_PROTOCOL_PREFIX = "redis://";
@SuppressWarnings(value = { "unchecked", "rawtypes" }) private static final String REDISS_PROTOCOL_PREFIX = "rediss://";
public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
{ @Autowired
RedisTemplate<Object, Object> template = new RedisTemplate<>(); private RedisProperties redisProperties;
template.setConnectionFactory(connectionFactory);
@Autowired
GenericFastJsonRedisSerializer serializer = new GenericFastJsonRedisSerializer(); private RedissonProperties redissonProperties;
StringRedisSerializer keySerializer = new StringRedisSerializer();
@Bean(destroyMethod = "shutdown")
// 使用StringRedisSerializer来序列化和反序列化redis的key值 @ConditionalOnMissingBean(RedissonClient.class)
template.setKeySerializer(keySerializer); public RedissonClient redisson() throws IOException {
template.setValueSerializer(serializer); String prefix = REDIS_PROTOCOL_PREFIX;
if (redisProperties.isSsl()) {
// Hash的key也采用StringRedisSerializer的序列化方式 prefix = REDISS_PROTOCOL_PREFIX;
template.setHashKeySerializer(keySerializer); }
template.setHashValueSerializer(serializer); Config config = new Config();
config.setThreads(redissonProperties.getThreads())
template.afterPropertiesSet(); .setNettyThreads(redissonProperties.getNettyThreads())
return template; .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);
}
} }

101
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
Unescape View File

@ -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;
}
}
Write Preview
Loading…
Cancel
Save