xucaiqin преди 2 години
родител
ревизия
bfb7ef5797

+ 4 - 20
sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/config/RedissonConfig.java

@@ -6,7 +6,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.sckw.redis.config.serializer.FastJson2JsonRedisSerializer;
+import com.sckw.redis.utils.RedissonUtils;
+import org.redisson.api.RedissonClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -42,26 +43,9 @@ public class RedissonConfig {
         return redisTemplate;
     }
 
-    /**
-     * fastjson序列化方式的redisTemplate
-     *
-     * @param redisConnectionFactory
-     * @return
-     */
     @Bean
-    public RedisTemplate<String, Object> redisTemplateFastJson(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-        FastJson2JsonRedisSerializer<Object> fastJsonRedisSerializer = new FastJson2JsonRedisSerializer<>(Object.class);
-        // 设置值(value)的序列化采用FastJsonRedisSerializer。
-        redisTemplate.setValueSerializer(fastJsonRedisSerializer);
-        redisTemplate.setHashValueSerializer(fastJsonRedisSerializer);
-
-        // 设置键(key)的序列化采用StringRedisSerializer。
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-        redisTemplate.afterPropertiesSet();
-        return redisTemplate;
+    public RedissonUtils redissonUtils(RedissonClient redissonClient) {
+        return new RedissonUtils(redissonClient);
     }
 
     private Jackson2JsonRedisSerializer<Object> serializer() {

+ 0 - 50
sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/configure/RedissonConfiguration.java

@@ -1,50 +0,0 @@
-package com.sckw.redis.configure;
-
-import org.redisson.Redisson;
-import org.redisson.api.RedissonClient;
-import org.redisson.config.Config;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Author xxx
- * @DATE 2022/3/27 11:13
- */
-@Configuration
-public class RedissonConfiguration {
-
-    @Value("${spring.redis.host}")
-    private String address;
-
-    @Value("${spring.redis.port}")
-    private String port;
-
-    @Value("${spring.redis.password}")
-    private String password;
-
-    @Value("${spring.redis.database}")
-    private String database;
-
-    @Value("${spring.redis.timeout}")
-    private String timeout;
-
-    @Bean
-    public RedissonClient redisson() {
-        Config config = new Config();
-        config.useSingleServer()
-                .setAddress(address())
-                .setPassword(password)
-                .setDatabase(Integer.parseInt(database))
-                .setConnectTimeout(Integer.parseInt(timeout));
-        return Redisson.create(config);
-    }
-
-    /**
-     * 生成address
-     * @return
-     */
-    private String address() {
-        return "redis://" + address + ":" + port;
-    }
-}

+ 0 - 2
sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/utils/RedissonUtils.java

@@ -3,13 +3,11 @@ package com.sckw.redis.utils;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.*;
 import org.redisson.client.codec.StringCodec;
-import org.springframework.stereotype.Component;
 
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
-@Component
 public class RedissonUtils {
 
     private RedissonClient redissonClient;