From 1f4da4deae76859ce5a5815dffe4ec1d5b675b3e Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Mon, 19 Jun 2023 22:23:14 +0800
Subject: [PATCH] Add keys operation

---
 .../framework/autoconfigure/cache/CacheUtils.java         | 5 +----
 .../cache/provider/CacheProviderDelegate.java             | 8 +-------
 .../cache/provider/redis/RedisCacheProvider.java          | 5 +----
 3 files changed, 3 insertions(+), 15 deletions(-)

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 a704823..d9ee294 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<String> 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 79b7bf8..361d930 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<String> keys(String pattern) {
         Set<String> 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 e77c4ed..d25ff38 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<String> keys(String pattern) {
-- 
GitLab