From 3282f444e8c9454ced5ad79272284126eab3e69b Mon Sep 17 00:00:00 2001 From: geek Date: Tue, 26 Jul 2022 16:27:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dhttps=E5=BD=A2=E5=BC=8F?= =?UTF-8?q?=E8=AE=BF=E9=97=AEnacos=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=97=B6?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B8=8D=E4=BA=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/alibaba/nacos/config/ConsoleConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java index 7a3ec617d..edafc16fa 100644 --- a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java @@ -60,7 +60,7 @@ public class ConsoleConfig { public CorsFilter corsFilter() { CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); - config.addAllowedOrigin("*"); + config.addAllowedOriginPattern("*"); // SpringBoot2.4.0 [allowedOriginPatterns]代替[allowedOrigins] config.addAllowedHeader("*"); config.setMaxAge(18000L); config.addAllowedMethod("*"); From 33966bf1050e587eac33959608c0b7301f67c729 Mon Sep 17 00:00:00 2001 From: geek Date: Tue, 26 Jul 2022 17:00:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE"key*"?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E7=9A=84=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/cache/DefaultRedisCacheWriter.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java index 500fc86f1..d814b3da6 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java @@ -142,13 +142,27 @@ class DefaultRedisCacheWriter implements RedisCacheWriter { }); } + /** + * 删除，原来是删除指定的键，目前修改为既可以删除指定键的数据，也是可以删除某个前缀开始的所有数据 + * @param name + * @param key + */ @Override public void remove(String name, byte[] key) { Assert.notNull(name, "Name must not be null!"); Assert.notNull(key, "Key must not be null!"); - execute(name, connection -> connection.del(key)); + execute(name, connection ->{ + // 获取某个前缀所拥有的所有的键，某个前缀开头，后面肯定是* + Set keys = connection.keys(key); + int delNum = 0; + Assert.notNull(keys, "keys must not be null!"); + for (byte[] keyByte : keys) { + delNum += connection.del(keyByte); + } + return delNum; + }); } @Override