From b91f84632e40c9bbdf50aa988e77d1d427d9087f Mon Sep 17 00:00:00 2001 From: wcc <1842281311@qq.com> Date: Mon, 23 Dec 2024 16:58:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=9A=20MybatisFlexBo?= =?UTF-8?q?otstrap=20=E5=AE=9E=E4=BE=8B=E6=97=B6=E8=B0=83=E7=94=A8=20Mybat?= =?UTF-8?q?isFlexBootstrap.getMapper(Class=20mapperClass)=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=8F=AA=E8=83=BD=E8=8E=B7=E5=8F=96=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BE=8B=E7=9A=84=20mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed the problem that when calling MybatisFlexBootstrap.getMapper(Class mapperClass) method with multiple MybatisFlexBootstrap instances, only the mapper of the last instance can be obtained. --- .../core/MybatisFlexBootstrap.java | 2 +- .../com/mybatisflex/core/mybatis/Mappers.java | 30 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/MybatisFlexBootstrap.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/MybatisFlexBootstrap.java index bc7be1d2..fd05c1ec 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/MybatisFlexBootstrap.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/MybatisFlexBootstrap.java @@ -133,7 +133,7 @@ public class MybatisFlexBootstrap { * @return mapperObject */ public T getMapper(Class mapperClass) { - return Mappers.ofMapperClass(mapperClass); + return Mappers.ofMapperClass(getEnvironmentId(), mapperClass); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/Mappers.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/Mappers.java index 3e254b74..89b1da1d 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/Mappers.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/Mappers.java @@ -18,6 +18,7 @@ package com.mybatisflex.core.mybatis; import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.FlexGlobalConfig; import com.mybatisflex.core.exception.FlexExceptions; +import com.mybatisflex.core.util.StringUtil; import org.apache.ibatis.reflection.ExceptionUtil; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; @@ -84,6 +85,13 @@ public class Mappers { , new MapperHandler(mapperClass))); return (M) mapperObject; } + public static M ofMapperClass(String environmentId, Class mapperClass) { + Object mapperObject = MapUtil.computeIfAbsent(MAPPER_OBJECTS, mapperClass, clazz -> + Proxy.newProxyInstance(mapperClass.getClassLoader() + , new Class[]{mapperClass} + , new MapperHandler(environmentId, mapperClass))); + return (M) mapperObject; + } private static class MapperHandler implements InvocationHandler { @@ -92,12 +100,24 @@ public class Mappers { private final SqlSessionFactory sqlSessionFactory; public MapperHandler(Class mapperClass) { + this(null, mapperClass); + } + + public MapperHandler(String environmentId, Class mapperClass) { this.mapperClass = mapperClass; - this.executorType = FlexGlobalConfig.getDefaultConfig() - .getConfiguration() - .getDefaultExecutorType(); - this.sqlSessionFactory = FlexGlobalConfig.getDefaultConfig() - .getSqlSessionFactory(); + if(StringUtil.noText(environmentId)) { + this.executorType = FlexGlobalConfig.getDefaultConfig() + .getConfiguration() + .getDefaultExecutorType(); + this.sqlSessionFactory = FlexGlobalConfig.getDefaultConfig() + .getSqlSessionFactory(); + } else { + this.executorType = FlexGlobalConfig.getConfig(environmentId) + .getConfiguration() + .getDefaultExecutorType(); + this.sqlSessionFactory = FlexGlobalConfig.getConfig(environmentId) + .getSqlSessionFactory(); + } } private SqlSession openSession() { From 02f6492d5b7c84ceed65b9dc7f45f97acae02e0b Mon Sep 17 00:00:00 2001 From: wcc <1842281311@qq.com> Date: Wed, 25 Dec 2024 12:57:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=20MybatisFlexBootstrap=20=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E6=97=B6=EF=BC=8CFlexGlobalConfig.getConfig(environmentId)=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9A=84=20config=20=E6=B0=B8=E8=BF=9C?= =?UTF-8?q?=E6=98=AF=20defaultConfig=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When creating multiple MybatisFlexBootstrap instances, the config obtained by FlexGlobalConfig.getConfig(environmentId) is always defaultConfig. --- .../src/main/java/com/mybatisflex/core/FlexGlobalConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexGlobalConfig.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexGlobalConfig.java index 3bf15c91..3dc26379 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexGlobalConfig.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexGlobalConfig.java @@ -423,7 +423,7 @@ public class FlexGlobalConfig { defaultConfig.setConfiguration(config.configuration); } - globalConfigs.put(id, isDefault ? defaultConfig : config); + globalConfigs.put(id, config); } } From c425267bd6f1c90a1731476661acbe7fbc2d498b Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Sat, 28 Dec 2024 16:02:48 +0800 Subject: [PATCH 3/5] build: v1.10.4 release (^.^)YYa!! --- .gitee/ISSUE_TEMPLATE/bug.yml | 2 +- .gitee/ISSUE_TEMPLATE/question.yml | 2 +- changes.md | 7 +++++++ docs/zh/intro/getting-started.md | 4 ++-- docs/zh/intro/gradle.md | 16 ++++++++-------- docs/zh/intro/maven.md | 18 +++++++++--------- docs/zh/others/apt.md | 2 +- mybatis-flex-annotation/pom.xml | 2 +- mybatis-flex-codegen/pom.xml | 4 ++-- mybatis-flex-core/pom.xml | 4 ++-- .../java/com/mybatisflex/core/FlexConsts.java | 2 +- mybatis-flex-dependencies/pom.xml | 4 ++-- mybatis-flex-processor/pom.xml | 6 +++--- mybatis-flex-solon-plugin/pom.xml | 2 +- mybatis-flex-spring-boot-starter/pom.xml | 6 +++--- mybatis-flex-spring-boot3-starter/pom.xml | 4 ++-- mybatis-flex-spring/pom.xml | 4 ++-- .../mybatis-flex-native-test/pom.xml | 2 +- .../mybatis-flex-seata-test/pom.xml | 2 +- .../mybatis-flex-solon-test/pom.xml | 2 +- .../mybatis-flex-spring-boot-test/pom.xml | 2 +- .../mybatis-flex-spring-cloud-test/pom.xml | 2 +- .../mybatis-flex-spring-test/pom.xml | 2 +- mybatis-flex-test/pom.xml | 2 +- pom.xml | 4 ++-- 25 files changed, 57 insertions(+), 50 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index f0977f67..2fc6789d 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -7,7 +7,7 @@ body: attributes: label: 这个 Bug 是否已经存在： options: - - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.10.3，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) + - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.10.4，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) required: true - type: textarea attributes: diff --git a/.gitee/ISSUE_TEMPLATE/question.yml b/.gitee/ISSUE_TEMPLATE/question.yml index 74ad4a25..03b2647b 100644 --- a/.gitee/ISSUE_TEMPLATE/question.yml +++ b/.gitee/ISSUE_TEMPLATE/question.yml @@ -13,7 +13,7 @@ body: attributes: label: 这个问题是否已经存在： options: - - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.10.3，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) + - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.10.4，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) required: true - type: textarea id: question-description diff --git a/changes.md b/changes.md index 0267ec5a..dbd13ec6 100644 --- a/changes.md +++ b/changes.md @@ -2,6 +2,13 @@ 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。 +## v1.10.4 20241228 +- 修复：多 MybatisFlexBootstrap 实例时，MybatisFlexBootstrap.getMapper(Class mapperClass) 方法只能获取最后的实例的 mapper 的问题，感谢 @wcc1433 +- 修复：多 MybatisFlexBootstrap 实例时，FlexGlobalConfig.getConfig(environmentId) 获取的 config 永远是 defaultConfig，感谢 @wcc1433 +- 优化：进一步优化 mybatis-flex-solon-plugin 插件，感谢 @noear_admin + + + ## v1.10.3 20241220 - 新增：添加了duckdb 数据库支持，感谢 @PTmore - 优化：优化 mybatis-flex-solon-plugin 插件，感谢 @noear_admin diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md index 14e87f36..89fc50bb 100644 --- a/docs/zh/intro/getting-started.md +++ b/docs/zh/intro/getting-started.md @@ -53,7 +53,7 @@ VALUES (1, '张三', 18, '2020-01-11'), com.mybatis-flex mybatis-flex-spring-boot-starter - 1.10.3 + 1.10.4 com.mysql @@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'), com.mybatis-flex mybatis-flex-spring-boot3-starter - 1.10.3 + 1.10.4 com.mysql diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md index 4282dade..9f1bffa2 100644 --- a/docs/zh/intro/gradle.md +++ b/docs/zh/intro/gradle.md @@ -10,7 +10,7 @@ ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-core:1.10.3") + implementation("com.mybatis-flex:mybatis-flex-core:1.10.4") } ``` @@ -18,7 +18,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-core:1.10.3' + implementation 'com.mybatis-flex:mybatis-flex-core:1.10.4' } ``` @@ -28,7 +28,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-spring:1.10.3") + implementation("com.mybatis-flex:mybatis-flex-spring:1.10.4") } ``` @@ -36,7 +36,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.3' + implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.4' } ``` @@ -46,7 +46,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.3") + implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.4") } ``` @@ -54,7 +54,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.3' + implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.4' } ``` @@ -70,7 +70,7 @@ dependencies { ```kotlin dependencies { - annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.3") + annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.4") } ``` @@ -78,6 +78,6 @@ dependencies { ```groovy dependencies { - annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.3' + annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.4' } ``` diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md index 7bfccdc1..6649fd78 100644 --- a/docs/zh/intro/maven.md +++ b/docs/zh/intro/maven.md @@ -12,12 +12,12 @@ com.mybatis-flex mybatis-flex-core - 1.10.3 + 1.10.4 com.mybatis-flex mybatis-flex-processor - 1.10.3 + 1.10.4 provided ``` @@ -28,12 +28,12 @@ com.mybatis-flex mybatis-flex-spring - 1.10.3 + 1.10.4 com.mybatis-flex mybatis-flex-processor - 1.10.3 + 1.10.4 provided `````` @@ -44,12 +44,12 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.10.3 + 1.10.4 com.mybatis-flex mybatis-flex-processor - 1.10.3 + 1.10.4 provided ``` @@ -60,12 +60,12 @@ com.mybatis-flex mybatis-flex-spring-boot3-starter - 1.10.3 + 1.10.4 com.mybatis-flex mybatis-flex-processor - 1.10.3 + 1.10.4 provided ``` @@ -88,7 +88,7 @@ com.mybatis-flex mybatis-flex-processor - 1.10.3 + 1.10.4 diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md index 8d563653..b199a55a 100644 --- a/docs/zh/others/apt.md +++ b/docs/zh/others/apt.md @@ -248,7 +248,7 @@ pom.xml 添加 `annotationProcessorPaths` 配置， ``` dependencies { ... - annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.3' + annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.4' } ``` diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml index ba825b07..f7091278 100644 --- a/mybatis-flex-annotation/pom.xml +++ b/mybatis-flex-annotation/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml index d90ee7a9..b9ba3689 100644 --- a/mybatis-flex-codegen/pom.xml +++ b/mybatis-flex-codegen/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.3 + 1.10.4 com.mybatis-flex diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml index 32e37923..d76dfc86 100644 --- a/mybatis-flex-core/pom.xml +++ b/mybatis-flex-core/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 @@ -101,7 +101,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.10.3 + 1.10.4 compile diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java index ae441f2c..6a7293fc 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java @@ -27,7 +27,7 @@ public class FlexConsts { } public static final String NAME = "MyBatis-Flex"; - public static final String VERSION = "1.10.3"; + public static final String VERSION = "1.10.4"; public static final String SQL = "$$sql"; diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml index fc84ee6d..d8945eb4 100644 --- a/mybatis-flex-dependencies/pom.xml +++ b/mybatis-flex-dependencies/pom.xml @@ -6,7 +6,7 @@ com.mybatis-flex mybatis-flex-dependencies - 1.10.3 + 1.10.4 pom @@ -48,7 +48,7 @@ - 1.10.3 + 1.10.4 diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml index 2ebca795..ddf5e67a 100644 --- a/mybatis-flex-processor/pom.xml +++ b/mybatis-flex-processor/pom.xml @@ -5,13 +5,13 @@ parent com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 mybatis-flex-processor jar - 1.10.3 + 1.10.4 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.10.3 + 1.10.4 diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml index bfd5e601..7472b39a 100644 --- a/mybatis-flex-solon-plugin/pom.xml +++ b/mybatis-flex-solon-plugin/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml index b8249af4..186a280c 100644 --- a/mybatis-flex-spring-boot-starter/pom.xml +++ b/mybatis-flex-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-spring - 1.10.3 + 1.10.4 @@ -104,7 +104,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.3 + 1.10.4 diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml index 90a75f62..7e95b455 100644 --- a/mybatis-flex-spring-boot3-starter/pom.xml +++ b/mybatis-flex-spring-boot3-starter/pom.xml @@ -6,7 +6,7 @@ com.mybatis-flex parent - 1.10.3 + 1.10.4 mybatis-flex-spring-boot3-starter @@ -19,7 +19,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.10.3 + 1.10.4 org.mybatis diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index 87eaed61..826f8e35 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 @@ -22,7 +22,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.3 + 1.10.4 diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml index a915ca49..98ce442b 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-native-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml index ba3ae225..7027a6dc 100644 --- a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml @@ -4,7 +4,7 @@ mybatis-flex-test com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-solon-test/pom.xml b/mybatis-flex-test/mybatis-flex-solon-test/pom.xml index 90c4113d..c9b0438e 100644 --- a/mybatis-flex-test/mybatis-flex-solon-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-solon-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml index e0aa539f..4157de1a 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml index e5888d2f..984f1dba 100644 --- a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml index 5a39055d..c7b02551 100644 --- a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml index a9d7e815..81aa320c 100644 --- a/mybatis-flex-test/pom.xml +++ b/mybatis-flex-test/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.3 + 1.10.4 4.0.0 diff --git a/pom.xml b/pom.xml index 964cafd5..7e71a352 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.mybatis-flex parent pom - 1.10.3 + 1.10.4 mybatis-flex https://mybatis-flex.com @@ -63,7 +63,7 @@ 8 8 - 1.10.3 + 1.10.4 3.5.17 2.1.2 From 1d373fa7005d8a272a8bed2a855fb8b9fbcc9cf8 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Sat, 28 Dec 2024 16:04:39 +0800 Subject: [PATCH 4/5] build: v1.10.4 release (^.^)YYa!! --- changes.md | 4 ++-- docs/zh/changes.md | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes.md b/changes.md index dbd13ec6..1e1c19e9 100644 --- a/changes.md +++ b/changes.md @@ -3,8 +3,8 @@ 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。 ## v1.10.4 20241228 -- 修复：多 MybatisFlexBootstrap 实例时，MybatisFlexBootstrap.getMapper(Class mapperClass) 方法只能获取最后的实例的 mapper 的问题，感谢 @wcc1433 -- 修复：多 MybatisFlexBootstrap 实例时，FlexGlobalConfig.getConfig(environmentId) 获取的 config 永远是 defaultConfig，感谢 @wcc1433 +- 修复：多 MybatisFlexBootstrap 实例时，`MybatisFlexBootstrap.getMapper(Class mapperClass)` 方法只能获取最后的实例的 mapper 的问题，感谢 @wcc1433 +- 修复：多 MybatisFlexBootstrap 实例时，`FlexGlobalConfig.getConfig(environmentId)` 获取的 config 永远是 defaultConfig，感谢 @wcc1433 - 优化：进一步优化 mybatis-flex-solon-plugin 插件，感谢 @noear_admin diff --git a/docs/zh/changes.md b/docs/zh/changes.md index 0267ec5a..1e1c19e9 100644 --- a/docs/zh/changes.md +++ b/docs/zh/changes.md @@ -2,6 +2,13 @@ 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。 +## v1.10.4 20241228 +- 修复：多 MybatisFlexBootstrap 实例时，`MybatisFlexBootstrap.getMapper(Class mapperClass)` 方法只能获取最后的实例的 mapper 的问题，感谢 @wcc1433 +- 修复：多 MybatisFlexBootstrap 实例时，`FlexGlobalConfig.getConfig(environmentId)` 获取的 config 永远是 defaultConfig，感谢 @wcc1433 +- 优化：进一步优化 mybatis-flex-solon-plugin 插件，感谢 @noear_admin + + + ## v1.10.3 20241220 - 新增：添加了duckdb 数据库支持，感谢 @PTmore - 优化：优化 mybatis-flex-solon-plugin 插件，感谢 @noear_admin From 37559179b1b6a6ccc4445a76dce2ac0efabd1a22 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Sat, 28 Dec 2024 16:12:09 +0800 Subject: [PATCH 5/5] build: v1.10.4 release (^.^)YYa!! --- mybatis-flex-test/mybatis-flex-solon-test/pom.xml | 1 - mybatis-flex-test/pom.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mybatis-flex-test/mybatis-flex-solon-test/pom.xml b/mybatis-flex-test/mybatis-flex-solon-test/pom.xml index c9b0438e..744a9509 100644 --- a/mybatis-flex-test/mybatis-flex-solon-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-solon-test/pom.xml @@ -6,7 +6,6 @@ mybatis-flex-test com.mybatis-flex 1.10.4 - 4.0.0 diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml index 81aa320c..3f7539fb 100644 --- a/mybatis-flex-test/pom.xml +++ b/mybatis-flex-test/pom.xml @@ -19,7 +19,7 @@ mybatis-flex-spring-test mybatis-flex-spring-boot-test mybatis-flex-spring-cloud-test - mybatis-flex-solon-test +