From b330f6bb3c625471bdb88d7520f99bcc90981686 Mon Sep 17 00:00:00 2001 From: guerlab Date: Sat, 14 Sep 2024 14:08:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20json=E6=9D=A1=E4=BB=B6=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guerlab/cloud/searchparams/mybatisplus/StringHandler.java | 4 ++-- .../searchparams/mybatisplus/MybatisPlusSearchParamsTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/main/java/net/guerlab/cloud/searchparams/mybatisplus/StringHandler.java b/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/main/java/net/guerlab/cloud/searchparams/mybatisplus/StringHandler.java index 4f4529cb..6b9a1e72 100644 --- a/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/main/java/net/guerlab/cloud/searchparams/mybatisplus/StringHandler.java +++ b/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/main/java/net/guerlab/cloud/searchparams/mybatisplus/StringHandler.java @@ -59,10 +59,10 @@ public class StringHandler extends AbstractMyBatisPlusSearchParamsHandler { if (dbType == DbType.MYSQL) { String sqlTemplate; if (searchModelType == SearchModelType.NOT_IN) { - sqlTemplate = "JSON_SEARCH(%s, 'one', '{0}', null, '%s') IS NULL"; + sqlTemplate = "JSON_SEARCH(%s, 'one', {0}, null, '%s') IS NULL"; } else { - sqlTemplate = "JSON_SEARCH(%s, 'one', '{0}', null, '%s') IS NOT NULL"; + sqlTemplate = "JSON_SEARCH(%s, 'one', {0}, null, '%s') IS NOT NULL"; } wrapper.apply(sqlTemplate.formatted(columnName, jsonPath), str); } diff --git a/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/test/java/net/guerlab/cloud/searchparams/mybatisplus/MybatisPlusSearchParamsTest.java b/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/test/java/net/guerlab/cloud/searchparams/mybatisplus/MybatisPlusSearchParamsTest.java index affa417c..892ecc04 100644 --- a/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/test/java/net/guerlab/cloud/searchparams/mybatisplus/MybatisPlusSearchParamsTest.java +++ b/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/test/java/net/guerlab/cloud/searchparams/mybatisplus/MybatisPlusSearchParamsTest.java @@ -207,7 +207,7 @@ class MybatisPlusSearchParamsTest { SearchParamsUtils.handler(searchParams, queryWrapper); Assertions.assertEquals( - "(JSON_SEARCH(t9, 'one', '#{ew.paramNameValuePairs.MPGENVAL1}', null, '$.a.b') IS NOT NULL)", + "(JSON_SEARCH(t9, 'one', #{ew.paramNameValuePairs.MPGENVAL1}, null, '$.a.b') IS NOT NULL)", queryWrapper.getSqlSegment()); } @@ -243,7 +243,7 @@ class MybatisPlusSearchParamsTest { SearchParamsUtils.handler(searchParams, queryWrapper); Assertions.assertEquals( - "(JSON_SEARCH(t10, 'one', '#{ew.paramNameValuePairs.MPGENVAL1}', null, '$.a.b') IS NULL)", + "(JSON_SEARCH(t10, 'one', #{ew.paramNameValuePairs.MPGENVAL1}, null, '$.a.b') IS NULL)", queryWrapper.getSqlSegment()); } -- Gitee From d3961af48b8f29f2d912ea6479f14aab2fb9aaa1 Mon Sep 17 00:00:00 2001 From: guerlab Date: Sat, 14 Sep 2024 14:34:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20redis=E9=85=8D=E7=BD=AE=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/redis/autoconfgure}/KeyFormat.java | 2 +- .../KeyRedisSerializerProxy.java | 2 +- .../RedisTemplateAutoConfigure.java | 21 +++++++++++-------- .../redis/autoconfgure}/package-info.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) rename guerlab-cloud-redis/src/main/java/{org/springframework/boot/autoconfigure/data/redis => net/guerlab/cloud/redis/autoconfgure}/KeyFormat.java (92%) rename guerlab-cloud-redis/src/main/java/{org/springframework/boot/autoconfigure/data/redis => net/guerlab/cloud/redis/autoconfgure}/KeyRedisSerializerProxy.java (97%) rename guerlab-cloud-redis/src/main/java/{org/springframework/boot/autoconfigure/data/redis => net/guerlab/cloud/redis/autoconfgure}/RedisTemplateAutoConfigure.java (84%) rename guerlab-cloud-redis/src/main/java/{org/springframework/boot/autoconfigure/data/redis => net/guerlab/cloud/redis/autoconfgure}/package-info.java (89%) diff --git a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyFormat.java b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyFormat.java similarity index 92% rename from guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyFormat.java rename to guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyFormat.java index 0d25aef6..976eef08 100644 --- a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyFormat.java +++ b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyFormat.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.data.redis; +package net.guerlab.cloud.redis.autoconfgure; /** * key格式化. diff --git a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyRedisSerializerProxy.java b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyRedisSerializerProxy.java similarity index 97% rename from guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyRedisSerializerProxy.java rename to guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyRedisSerializerProxy.java index aee2051e..a1ffa9eb 100644 --- a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyRedisSerializerProxy.java +++ b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyRedisSerializerProxy.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.data.redis; +package net.guerlab.cloud.redis.autoconfgure; import java.util.List; import java.util.ServiceLoader; diff --git a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisTemplateAutoConfigure.java b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/RedisTemplateAutoConfigure.java similarity index 84% rename from guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisTemplateAutoConfigure.java rename to guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/RedisTemplateAutoConfigure.java index 10f4d3ca..058ad94a 100644 --- a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisTemplateAutoConfigure.java +++ b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/RedisTemplateAutoConfigure.java @@ -11,20 +11,20 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.data.redis; +package net.guerlab.cloud.redis.autoconfgure; import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; import org.redisson.api.RedissonClient; import org.redisson.spring.data.connection.RedissonConnectionFactory; import org.redisson.spring.starter.RedissonAutoConfiguration; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; @@ -34,12 +34,12 @@ import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSeriali * * @author guer */ -@ConditionalOnClass(RedisOperations.class) -@AutoConfiguration(before = { +@Slf4j +@Configuration +@AutoConfigureBefore({ RedisAutoConfiguration.class, RedissonAutoConfiguration.class }) -@Import({LettuceConnectionConfiguration.class, JedisConnectionConfiguration.class}) public class RedisTemplateAutoConfigure { /** @@ -47,8 +47,8 @@ public class RedisTemplateAutoConfigure { */ @Bean @ConditionalOnMissingBean(RedisConnectionFactory.class) - @ConditionalOnClass(RedissonClient.class) public RedissonConnectionFactory redissonConnectionFactory(RedissonClient redisson) { + log.debug("init redissonConnectionFactory"); return new RedissonConnectionFactory(redisson); } @@ -62,6 +62,7 @@ public class RedisTemplateAutoConfigure { @Bean @ConditionalOnMissingBean(name = "redisTemplate") public RedisTemplate redisTemplate(RedisConnectionFactory factory, ObjectMapper objectMapper) { + log.debug("init redisTemplate"); ObjectMapper mapper = objectMapper.copy(); mapper.activateDefaultTyping(mapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL); @@ -85,8 +86,10 @@ public class RedisTemplateAutoConfigure { @Bean @ConditionalOnMissingBean(StringRedisTemplate.class) public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory factory) { + log.debug("init stringRedisTemplate"); StringRedisTemplate template = new StringRedisTemplate(); template.setConnectionFactory(factory); return template; } + } diff --git a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/package-info.java b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/package-info.java similarity index 89% rename from guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/package-info.java rename to guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/package-info.java index fea4585f..10c1b33f 100644 --- a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/package-info.java +++ b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/package-info.java @@ -15,6 +15,6 @@ * */ @NonNullApi -package org.springframework.boot.autoconfigure.data.redis; +package net.guerlab.cloud.redis.autoconfgure; import org.springframework.lang.NonNullApi; diff --git a/guerlab-cloud-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/guerlab-cloud-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index d766d4ba..73d71da9 100644 --- a/guerlab-cloud-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/guerlab-cloud-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -org.springframework.boot.autoconfigure.data.redis.RedisTemplateAutoConfigure +net.guerlab.cloud.redis.autoconfgure.RedisTemplateAutoConfigure -- Gitee From 5e357d66e8fc2ee7a66652a6cfedb3c8e4d80f3c Mon Sep 17 00:00:00 2001 From: guerlab Date: Sat, 14 Sep 2024 14:34:34 +0800 Subject: [PATCH 3/3] release to 2024.10.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8511528c..184735f9 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ - 2024.10.5 + 2024.10.6 ${basedir} 17 -- Gitee