From 0a51ae51233e11641f820938818a5679656c6131 Mon Sep 17 00:00:00 2001 From: Jie Zheng <201507802@qq.com> Date: Sat, 25 Jan 2025 13:39:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96Redis=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0AutoConfigureBefore?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/zhengjie/config/RedisConfiguration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfiguration.java b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfiguration.java index f246837e..399e51bd 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfiguration.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfiguration.java @@ -20,6 +20,8 @@ import com.alibaba.fastjson2.JSONFactory; import com.alibaba.fastjson2.JSONWriter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.MurmurHash3; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.cache.Cache; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; @@ -48,6 +50,7 @@ import java.util.Map; @Slf4j @Configuration @EnableCaching +@AutoConfigureBefore(RedisAutoConfiguration.class) public class RedisConfiguration extends CachingConfigurerSupport { // 自动识别json对象白名单配置(仅允许解析的包名,范围越小越安全) From 61f8dc32cf80e1091fe6c046783a0ccadb056da7 Mon Sep 17 00:00:00 2001 From: Jie Zheng <201507802@qq.com> Date: Sat, 25 Jan 2025 13:43:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96Redis=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0AutoConfigureBefore?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/me/zhengjie/config/RedissonConfiguration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedissonConfiguration.java b/eladmin-common/src/main/java/me/zhengjie/config/RedissonConfiguration.java index cd5f2885..d7e0c70e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RedissonConfiguration.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/RedissonConfiguration.java @@ -21,11 +21,14 @@ import org.redisson.Redisson; import org.redisson.api.RedissonClient; import org.redisson.config.Config; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Data @Configuration +@AutoConfigureBefore(RedisAutoConfiguration.class) public class RedissonConfiguration { @Value("${spring.redis.host}") From 429f375f8274023ee55e94f01f334777415001d8 Mon Sep 17 00:00:00 2001 From: Jie Zheng <201507802@qq.com> Date: Sat, 25 Jan 2025 14:43:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E2=9C=A8=EF=B8=8F=E5=8D=87?= =?UTF-8?q?=E7=BA=A7mysql-connector=E8=87=B39.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e9304dd7..31438c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -133,12 +133,11 @@ 1.5.22 - - mysql - mysql-connector-java - 8.0.31 + com.mysql + mysql-connector-j + 9.2.0 runtime