🐛 Fixing a bug. @CacheEvict 功能与原版有出入 #5

pig-mesh · Nov 5, 2020 · c50935f · c50935f
1 parent d822268
commit c50935f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@
 <dependency>
     <groupId>com.pig4cloud.plugin</groupId>
     <artifactId>multilevel-cache-spring-boot-starter</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.4.RELEASE</version>
+        <version>2.3.5.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.pig4cloud.plugin</groupId>
     <artifactId>multilevel-cache-spring-boot-starter</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <name>multilevel-cache-spring-boot-starter</name>
     <description>support L1 caffeine and L2 redis cache</description>
     <url>https://pig4cloud.com</url>

diff --git a/src/main/java/com/pig4cloud/plugin/cache/MultilevelCacheAutoConfiguration.java b/src/main/java/com/pig4cloud/plugin/cache/MultilevelCacheAutoConfiguration.java
@@ -29,8 +29,8 @@ public class MultilevelCacheAutoConfiguration {
 	@ConditionalOnBean(RedisTemplate.class)
 	public RedisCaffeineCacheManager cacheManager(
 			CacheConfigProperties cacheConfigProperties,
-			RedisTemplate<Object, Object> redisTemplate) {
-		return new RedisCaffeineCacheManager(cacheConfigProperties, redisTemplate);
+			RedisTemplate<Object, Object> stringKeyRedisTemplate) {
+		return new RedisCaffeineCacheManager(cacheConfigProperties, stringKeyRedisTemplate);
 	}
 
 	@Bean

diff --git a/src/main/java/com/pig4cloud/plugin/cache/support/RedisCaffeineCache.java b/src/main/java/com/pig4cloud/plugin/cache/support/RedisCaffeineCache.java
@@ -6,6 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.support.AbstractValueAdaptingCache;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -166,6 +167,8 @@ protected Object lookup(Object key) {
 			return value;
 		}
 
+		// 避免自动一个 RedisTemplate 覆盖失效
+		stringKeyRedisTemplate.setKeySerializer(new StringRedisSerializer());
 		value = stringKeyRedisTemplate.opsForValue().get(cacheKey);
 
 		if (value != null) {