From ce2c9edf5225be0829062bc8e93ccaaa1f6ffe8a Mon Sep 17 00:00:00 2001
From: zhangsaizz <937425288@qq.com>
Date: Thu, 20 Jun 2019 10:09:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!113?=
 =?UTF-8?q?=20:=20=E4=BF=AE=E5=A4=8Dkeys=E6=96=B9=E6=B3=95bug=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BA=8C=E7=BA=A7=E7=BC=93=E5=AD=98=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Ekey=E5=80=BC=E5=8C=85=E5=90=AB=E7=9A=84namespace?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8Aregion'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cache/support/redis/SpringRedisGenericCache.java   | 10 +++++++---
 .../cache/support/redis/SpringRedisGenericCache.java   | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/spring-boot-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java b/modules/spring-boot-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java
index 2387915..842aff3 100644
--- a/modules/spring-boot-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java
+++ b/modules/spring-boot-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java
@@ -7,7 +7,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +44,7 @@ public class SpringRedisGenericCache implements Level2Cache {
 	public void clear() {
 		Collection<String> keys = keys();
 		keys.stream().forEach(k -> {
-			redisTemplate.delete(this.region + ":" + k);
+			redisTemplate.delete(k);
 		});
 	}
 
@@ -67,7 +66,12 @@ public class SpringRedisGenericCache implements Level2Cache {
 
 	@Override
 	public Collection<String> keys() {
-		return redisTemplate.keys(this.region + ":*").stream().map(k->k.substring(this.region.length()+1)).collect(Collectors.toSet());
+		Set<String> list = redisTemplate.keys(this.region + ":*");
+		List<String> keys = new ArrayList<>(list.size());
+		for (String s : list) {
+			keys.add(s);
+		}
+		return keys;
 	}
 
 	@Override
diff --git a/modules/spring-boot2-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java b/modules/spring-boot2-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java
index 49eb85b..8b4b1ae 100644
--- a/modules/spring-boot2-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java
+++ b/modules/spring-boot2-starter/src/net/oschina/j2cache/cache/support/redis/SpringRedisGenericCache.java
@@ -7,7 +7,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +44,7 @@ public class SpringRedisGenericCache implements Level2Cache {
 	public void clear() {
 		Collection<String> keys = keys();
 		keys.stream().forEach(k -> {
-			redisTemplate.delete(this.region + ":" + k);
+			redisTemplate.delete(k);
 		});
 	}
 
@@ -67,7 +66,12 @@ public class SpringRedisGenericCache implements Level2Cache {
 
 	@Override
 	public Collection<String> keys() {
-		return redisTemplate.keys(this.region + ":*").stream().map(k->k.substring(this.region.length()+1)).collect(Collectors.toSet());
+		Set<String> list = redisTemplate.keys(this.region + ":*");
+		List<String> keys = new ArrayList<>(list.size());
+		for (String s : list) {
+			keys.add(s);
+		}
+		return keys;
 	}
 
 	@Override
-- 
Gitee


From acc25c980fb68918a062f5da85a6f9c82fc21649 Mon Sep 17 00:00:00 2001
From: kl <12029+linux@user.noreply.gitee.com>
Date: Fri, 1 Nov 2024 12:42:44 +0000
Subject: [PATCH 2/2] update pom.xml.

Signed-off-by: kl <12029+linux@user.noreply.gitee.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1455283..4453857 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+    跌跌跌
     <groupId>net.oschina.j2cache</groupId>
     <artifactId>j2cache</artifactId>
     <version>2.7.6-release</version>
-- 
Gitee