diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/CacheUtils.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/CacheUtils.java index a704823b952d8b8024dfe512b46aaa616f6b85b4..d9ee294374c7ce9ed5edbfa3e90b49795997b5a0 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/CacheUtils.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/CacheUtils.java @@ -162,10 +162,7 @@ public class CacheUtils { } /** - * keys - * - * @param pattern - * @return + * 模糊搜索 key */ public static Set keys(String pattern) { return getCacheProvider().keys(pattern); diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheProviderDelegate.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheProviderDelegate.java index 79b7bf8ae739f0b4a0b324cc682a3821441c1264..361d930c002ecd699450ef6ab666875c12d80bfd 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheProviderDelegate.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheProviderDelegate.java @@ -13,7 +13,6 @@ import org.springframework.core.env.Environment; import java.time.Duration; import java.util.*; import java.util.Map.Entry; -import java.util.stream.Collectors; /** * @author liaozan @@ -66,12 +65,7 @@ public class CacheProviderDelegate implements CacheProvider { @Override public Set keys(String pattern) { Set keys = getCacheProvider().keys(withKeyPrefix(pattern)); - return keys.stream().map(e->{ - if(StringUtils.isBlank(prefixWithDelimiter)){ - return e; - } - return e.replaceFirst(prefixWithDelimiter,""); - }).collect(Collectors.toSet()); + return StreamUtils.toSet(keys, this::removeKeyPrefix); } @Override diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheProvider.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheProvider.java index e77c4ed9dbafd91656748c6994acd872a143fa8a..d25ff38dc483a0f9dc2b96ab89068508570d60df 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheProvider.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheProvider.java @@ -71,10 +71,7 @@ public class RedisCacheProvider implements CacheProvider { } /** - * 模糊搜索KEY - * - * @param pattern - * @return + * 模糊搜索 key */ @Override public Set keys(String pattern) {