admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 redis 与 jackson 使用自动装配定制器简化配置

Browse Source
This commit is contained in:
疯狂的狮子Li 2022-05-23 02:06:38 +08:00
parent 4e6f47d50a
commit 88fe5c641f
2 changed files with 54 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java
View File

@ -1,17 +1,14 @@
package com.ruoyi.framework.config; package com.ruoyi.framework.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.ruoyi.framework.jackson.BigNumberSerializer; import com.ruoyi.framework.jackson.BigNumberSerializer;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.jackson.JacksonProperties; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
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.context.annotation.Primary;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
@ -28,23 +25,22 @@ import java.util.TimeZone;
@Configuration @Configuration
public class JacksonConfig { public class JacksonConfig {
@Primary
@Bean @Bean
public ObjectMapper getObjectMapper(Jackson2ObjectMapperBuilder builder, JacksonProperties jacksonProperties) { public Jackson2ObjectMapperBuilderCustomizer customizer() {
ObjectMapper objectMapper = builder.createXmlMapper(false).build(); return builder -> {
// 全局配置序列化返回 JSON 处理 // 全局配置序列化返回 JSON 处理
SimpleModule simpleModule = new SimpleModule(); JavaTimeModule javaTimeModule = new JavaTimeModule();
simpleModule.addSerializer(Long.class, BigNumberSerializer.INSTANCE); javaTimeModule.addSerializer(Long.class, BigNumberSerializer.INSTANCE);
simpleModule.addSerializer(Long.TYPE, BigNumberSerializer.INSTANCE); javaTimeModule.addSerializer(Long.TYPE, BigNumberSerializer.INSTANCE);
simpleModule.addSerializer(BigInteger.class, BigNumberSerializer.INSTANCE); javaTimeModule.addSerializer(BigInteger.class, BigNumberSerializer.INSTANCE);
simpleModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); javaTimeModule.addSerializer(BigDecimal.class, ToStringSerializer.instance);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(jacksonProperties.getDateFormat()); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(formatter)); javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(formatter));
simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter)); javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter));
objectMapper.registerModule(simpleModule); builder.modules(javaTimeModule);
objectMapper.setTimeZone(TimeZone.getDefault()); builder.timeZone(TimeZone.getDefault());
log.info("初始化 jackson 配置"); log.info("初始化 jackson 配置");
return objectMapper; };
} }
} }

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

@ -2,28 +2,24 @@ package com.ruoyi.framework.config;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.properties.RedissonProperties; import com.ruoyi.framework.config.properties.RedissonProperties;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.codec.JsonJacksonCodec; import org.redisson.codec.JsonJacksonCodec;
import org.redisson.config.Config;
import org.redisson.spring.cache.CacheConfig; import org.redisson.spring.cache.CacheConfig;
import org.redisson.spring.cache.RedissonSpringCacheManager; import org.redisson.spring.cache.RedissonSpringCacheManager;
import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;
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.context.annotation.Primary;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* redis配置 * redis配置
@ -33,75 +29,49 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
@Configuration @Configuration
@EnableCaching @EnableCaching
@EnableConfigurationProperties(RedissonProperties.class)
public class RedisConfig extends CachingConfigurerSupport { public class RedisConfig extends CachingConfigurerSupport {
private static final String REDIS_PROTOCOL_PREFIX = "redis://";
private static final String REDISS_PROTOCOL_PREFIX = "rediss://";
@Autowired
private RedisProperties redisProperties;
@Autowired @Autowired
private RedissonProperties redissonProperties; private RedissonProperties redissonProperties;
@Autowired @Autowired
private ObjectMapper objectMapper; private ObjectMapper objectMapper;
@Primary @Bean
@Bean(destroyMethod = "shutdown") public RedissonAutoConfigurationCustomizer redissonCustomizer() {
public RedissonClient redisson(RedisProperties redisProperties, RedissonProperties redissonProperties, ObjectMapper objectMapper) { return config -> {
String prefix = REDIS_PROTOCOL_PREFIX; config.setThreads(redissonProperties.getThreads())
if (redisProperties.isSsl()) { .setNettyThreads(redissonProperties.getNettyThreads())
prefix = REDISS_PROTOCOL_PREFIX; .setCodec(new JsonJacksonCodec(objectMapper));
} RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig();
Config config = new Config(); if (ObjectUtil.isNotNull(singleServerConfig)) {
config.setThreads(redissonProperties.getThreads()) // 使用单机模式
.setNettyThreads(redissonProperties.getNettyThreads()) config.useSingleServer()
.setCodec(new JsonJacksonCodec(objectMapper)); .setTimeout(singleServerConfig.getTimeout())
.setClientName(singleServerConfig.getClientName())
RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig(); .setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
if (ObjectUtil.isNotNull(singleServerConfig)) { .setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
// 使用单机模式 .setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize())
config.useSingleServer() .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize());
.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort()) }
.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue()) // 集群配置方式 参考下方注释
.setDatabase(redisProperties.getDatabase()) RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
.setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null) if (ObjectUtil.isNotNull(clusterServersConfig)) {
.setTimeout(singleServerConfig.getTimeout()) config.useClusterServers()
.setClientName(singleServerConfig.getClientName()) .setTimeout(clusterServersConfig.getTimeout())
.setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout()) .setClientName(clusterServersConfig.getClientName())
.setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize()) .setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
.setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize()) .setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize())
.setConnectionPoolSize(singleServerConfig.getConnectionPoolSize()); .setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize())
} .setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize())
// 集群配置方式 参考下方注释 .setSlaveConnectionMinimumIdleSize(clusterServersConfig.getSlaveConnectionMinimumIdleSize())
RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig(); .setSlaveConnectionPoolSize(clusterServersConfig.getSlaveConnectionPoolSize())
if (ObjectUtil.isNotNull(clusterServersConfig)) { .setReadMode(clusterServersConfig.getReadMode())
// 使用集群模式 .setSubscriptionMode(clusterServersConfig.getSubscriptionMode());
String finalPrefix = prefix; }
List<String> nodes = redisProperties.getCluster().getNodes() log.info("初始化 redis 配置");
.stream() };
.map(node -> finalPrefix + node)
.collect(Collectors.toList());
config.useClusterServers()
.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
.setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
.setTimeout(clusterServersConfig.getTimeout())
.setClientName(clusterServersConfig.getClientName())
.setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
.setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize())
.setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize())
.setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize())
.setSlaveConnectionMinimumIdleSize(clusterServersConfig.getSlaveConnectionMinimumIdleSize())
.setSlaveConnectionPoolSize(clusterServersConfig.getSlaveConnectionPoolSize())
.setReadMode(clusterServersConfig.getReadMode())
.setSubscriptionMode(clusterServersConfig.getSubscriptionMode())
.setNodeAddresses(nodes);
}
RedissonClient redissonClient = Redisson.create(config);
log.info("初始化 redis 配置");
return redissonClient;
} }
/** /**