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

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

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

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

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