From 74253471cae27f9bf6a9647716f3b904272b1351 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Fri, 10 Jan 2025 09:24:29 +0800 Subject: [PATCH] build: v1.10.5 release (^.^)YYa!! --- .gitee/ISSUE_TEMPLATE/bug.yml | 2 +- changes.md | 11 ++++++++++ docs/zh/intro/getting-started.md | 4 ++-- docs/zh/intro/gradle.md | 20 ++++++++--------- docs/zh/intro/maven.md | 22 +++++++++---------- 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 ++-- 24 files changed, 64 insertions(+), 53 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 2fc6789d..ca76a8ef 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.4,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) + - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.10.5,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) required: true - type: textarea attributes: diff --git a/changes.md b/changes.md index 1e1c19e9..70c7f2f2 100644 --- a/changes.md +++ b/changes.md @@ -2,6 +2,17 @@ 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。 + +## v1.10.5 20250110 +- 新增:MyBatisFlexCustomizer 支持定义多个 bean 实例进行配置,感谢 @RexSheng +- 优化:引入 actuator 后日志出现告警的问题,感谢 @lin-mt +- 优化:进一步优化 mybatis-flex-solon-plugin 插件,感谢 @noear_admin +- 优化:优化 duckdb 方言配置,duckdb 方言总体类似于 PG 方言 +- 修复:在某些情况下子线程中使用可能出现 NPE 的问题 +- 修复:多数据源 + WithRelations 查询时导致后面查询的数据源选择异常的问题 + + + ## v1.10.4 20241228 - 修复:多 MybatisFlexBootstrap 实例时,`MybatisFlexBootstrap.getMapper(Class mapperClass)` 方法只能获取最后的实例的 mapper 的问题,感谢 @wcc1433 - 修复:多 MybatisFlexBootstrap 实例时,`FlexGlobalConfig.getConfig(environmentId)` 获取的 config 永远是 defaultConfig,感谢 @wcc1433 diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md index 80595d8f..912d8a2c 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.4 + 1.10.5 com.mysql @@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'), com.mybatis-flex mybatis-flex-spring-boot3-starter - 1.10.4 + 1.10.5 com.mysql diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md index 6378c385..3bda3b2e 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.4") + implementation("com.mybatis-flex:mybatis-flex-core:1.10.5") } ``` @@ -18,7 +18,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-core:1.10.4' + implementation 'com.mybatis-flex:mybatis-flex-core:1.10.5' } ``` @@ -28,7 +28,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-spring:1.10.4") + implementation("com.mybatis-flex:mybatis-flex-spring:1.10.5") } ``` @@ -36,7 +36,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.4' + implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.5' } ``` @@ -46,7 +46,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.4") + implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.5") } ``` @@ -54,7 +54,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.4' + implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.5' } ``` @@ -65,7 +65,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-solon-plugin:1.10.4") + implementation("com.mybatis-flex:mybatis-flex-solon-plugin:1.10.5") } ``` @@ -73,7 +73,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-solon-plugin:1.10.4' + implementation 'com.mybatis-flex:mybatis-flex-solon-plugin:1.10.5' } ``` @@ -91,7 +91,7 @@ dependencies { ```kotlin dependencies { - annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.4") + annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.5") } ``` @@ -99,6 +99,6 @@ dependencies { ```groovy dependencies { - annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.4' + annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.5' } ``` diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md index f02031d4..1e05b00e 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.4 + 1.10.5 com.mybatis-flex mybatis-flex-processor - 1.10.4 + 1.10.5 provided ``` @@ -28,12 +28,12 @@ com.mybatis-flex mybatis-flex-spring - 1.10.4 + 1.10.5 com.mybatis-flex mybatis-flex-processor - 1.10.4 + 1.10.5 provided `````` @@ -44,12 +44,12 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.10.4 + 1.10.5 com.mybatis-flex mybatis-flex-processor - 1.10.4 + 1.10.5 provided ``` @@ -60,12 +60,12 @@ com.mybatis-flex mybatis-flex-spring-boot3-starter - 1.10.4 + 1.10.5 com.mybatis-flex mybatis-flex-processor - 1.10.4 + 1.10.5 provided ``` @@ -76,12 +76,12 @@ com.mybatis-flex mybatis-flex-solon-plugin - 1.10.4 + 1.10.5 com.mybatis-flex mybatis-flex-processor - 1.10.4 + 1.10.5 provided ``` @@ -104,7 +104,7 @@ com.mybatis-flex mybatis-flex-processor - 1.10.4 + 1.10.5 diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md index b199a55a..06990357 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.4' + annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.5' } ``` diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml index f7091278..ee013e08 100644 --- a/mybatis-flex-annotation/pom.xml +++ b/mybatis-flex-annotation/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.4 + 1.10.5 4.0.0 diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml index b9ba3689..7b612da0 100644 --- a/mybatis-flex-codegen/pom.xml +++ b/mybatis-flex-codegen/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.4 + 1.10.5 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.4 + 1.10.5 com.mybatis-flex diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml index d76dfc86..81880550 100644 --- a/mybatis-flex-core/pom.xml +++ b/mybatis-flex-core/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.4 + 1.10.5 4.0.0 @@ -101,7 +101,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.10.4 + 1.10.5 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 6a7293fc..d15b6e14 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.4"; + public static final String VERSION = "1.10.5"; public static final String SQL = "$$sql"; diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml index d8945eb4..04e303e5 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.4 + 1.10.5 pom @@ -48,7 +48,7 @@ - 1.10.4 + 1.10.5 diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml index ddf5e67a..167f8ddf 100644 --- a/mybatis-flex-processor/pom.xml +++ b/mybatis-flex-processor/pom.xml @@ -5,13 +5,13 @@ parent com.mybatis-flex - 1.10.4 + 1.10.5 4.0.0 mybatis-flex-processor jar - 1.10.4 + 1.10.5 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.10.4 + 1.10.5 diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml index 7472b39a..43491ce1 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.4 + 1.10.5 4.0.0 diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml index 186a280c..f9b0ceee 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.4 + 1.10.5 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-spring - 1.10.4 + 1.10.5 @@ -104,7 +104,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.4 + 1.10.5 diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml index 7e95b455..002d1856 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.4 + 1.10.5 mybatis-flex-spring-boot3-starter @@ -19,7 +19,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.10.4 + 1.10.5 org.mybatis diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index 826f8e35..1d304be6 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.4 + 1.10.5 4.0.0 @@ -22,7 +22,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.4 + 1.10.5 diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml index 98ce442b..fa8e9339 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.4 + 1.10.5 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 7027a6dc..9331b5f7 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.4 + 1.10.5 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 744a9509..e1908beb 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.4 + 1.10.5 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 4157de1a..14b82444 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.4 + 1.10.5 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 984f1dba..b9ca1a23 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.4 + 1.10.5 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 c7b02551..aa02833f 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.4 + 1.10.5 4.0.0 diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml index 81aa320c..cec8056a 100644 --- a/mybatis-flex-test/pom.xml +++ b/mybatis-flex-test/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.4 + 1.10.5 4.0.0 diff --git a/pom.xml b/pom.xml index 7e71a352..2f04956a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.mybatis-flex parent pom - 1.10.4 + 1.10.5 mybatis-flex https://mybatis-flex.com @@ -63,7 +63,7 @@ 8 8 - 1.10.4 + 1.10.5 3.5.17 2.1.2