diff --git a/jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfig.java b/jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfig.java index 692dcbf0..378e3618 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfig.java @@ -1,14 +1,10 @@ package com.jero.common.modules.redis.config; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; -import lombok.extern.slf4j.Slf4j; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.GlobalConstants; import com.jero.common.modules.redis.receiver.RedisReceiver; import com.jero.common.modules.redis.writer.JeroRedisCacheWriter; +import lombok.extern.slf4j.Slf4j; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; @@ -23,7 +19,10 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.listener.ChannelTopic; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; -import org.springframework.data.redis.serializer.*; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; import javax.annotation.Resource; import java.time.Duration; @@ -45,26 +44,6 @@ public class RedisConfig extends CachingConfigurerSupport { private GenericJackson2JsonRedisSerializer jacksonSerializer = new GenericJackson2JsonRedisSerializer(); -// /** -// * @description 自定义的缓存key的生成策略 若想使用这个key -// * 只需要讲注解上keyGenerator的值设置为keyGenerator即可
-// * @return 自定义策略生成的key -// */ -// @Override -// @Bean -// public KeyGenerator keyGenerator() { -// return new KeyGenerator() { -// @Override -// public Object generate(Object target, Method method, Object... params) { -// StringBuilder sb = new StringBuilder(); -// sb.append(target.getClass().getName()); -// sb.append(method.getDeclaringClass().getName()); -// Arrays.stream(params).map(Object::toString).forEach(sb::append); -// return sb.toString(); -// } -// }; -// } - /** * RedisTemplate配置 * @param lettuceConnectionFactory @@ -73,7 +52,6 @@ public class RedisConfig extends CachingConfigurerSupport { @Bean public RedisTemplate redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) { log.info(" --- redis config init --- "); -// Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = jacksonSerializer(); RedisTemplate redisTemplate = new RedisTemplate<>(); redisTemplate.setConnectionFactory(lettuceConnectionFactory); RedisSerializer stringSerializer = new StringRedisSerializer(); @@ -98,12 +76,10 @@ public class RedisConfig extends CachingConfigurerSupport { */ @Bean public CacheManager cacheManager(LettuceConnectionFactory factory) { -// Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = jacksonSerializer(); // 配置序列化(解决乱码的问题),并且配置缓存默认有效期 6小时 RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofHours(6)); RedisCacheConfiguration redisCacheConfiguration = config.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer())) .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(this.jacksonSerializer)); - //.disableCachingNullValues(); // 以锁写入的方式创建RedisCacheWriter对象 //update-begin-author:taoyan date:20210316 for:注解CacheEvict根据key删除redis支持通配符* @@ -135,16 +111,4 @@ public class RedisConfig extends CachingConfigurerSupport { messageListenerAdapter.setSerializer(this.jacksonSerializer); return messageListenerAdapter; } - -// private Jackson2JsonRedisSerializer jacksonSerializer() { -// Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class); -// ObjectMapper objectMapper = new ObjectMapper(); -// objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); -//// objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); -// objectMapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.EVERYTHING); -// jackson2JsonRedisSerializer.setObjectMapper(objectMapper); -// return jackson2JsonRedisSerializer; -// } - - }