|
|
@@ -79,7 +79,7 @@ public class CacheConfig {
|
|
|
// return new RedisCacheManager(redisCacheWriter, redisCacheConfiguration);
|
|
|
// }
|
|
|
@Bean
|
|
|
- public RedisCacheManager userRedisCacheManager(RedisConnectionFactory connectionFactory) {
|
|
|
+ public RedisCacheManager userRedisCacheManager(RedisTemplate redisTemplate) {
|
|
|
Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(Object.class);
|
|
|
|
|
|
ObjectMapper mapper = new ObjectMapper();
|
|
|
@@ -101,16 +101,14 @@ public class CacheConfig {
|
|
|
|
|
|
Map<String, RedisCacheConfiguration> cacheNamesConfigurationMap = new HashMap<>();
|
|
|
cacheNamesConfigurationMap.put("collectionList", RedisCacheConfiguration.defaultCacheConfig()
|
|
|
- .entryTtl(Duration.ofSeconds(10))
|
|
|
- .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(serializer)));
|
|
|
- cacheNamesConfigurationMap.put("collection", RedisCacheConfiguration.defaultCacheConfig()
|
|
|
- .entryTtl(Duration.ofMinutes(10)));
|
|
|
+ .entryTtl(Duration.ofSeconds(30))
|
|
|
+ .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer())));
|
|
|
|
|
|
RedisCacheConfiguration cacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
|
|
|
- .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(serializer));
|
|
|
+ .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer()));
|
|
|
|
|
|
RedisCacheManager redisCacheManager = RedisCacheManager.builder()
|
|
|
- .cacheWriter(RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory))
|
|
|
+ .cacheWriter(RedisCacheWriter.nonLockingRedisCacheWriter(redisTemplate.getConnectionFactory()))
|
|
|
.withInitialCacheConfigurations(cacheNamesConfigurationMap)
|
|
|
.cacheDefaults(cacheConfiguration)
|
|
|
|