From c3b73376870e72ad7ddb726e78b741089dd9549c Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Mon, 1 Apr 2024 10:11:19 +0800 Subject: [PATCH] build: v1.8.5 release (^.^)YYa!! --- .gitee/ISSUE_TEMPLATE/bug.yml | 2 +- changes.md | 14 ++++++++++++++ docs/zh/changes.md | 14 ++++++++++++++ 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 | 4 ++-- 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-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, 75 insertions(+), 47 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 46bcf7ef..09925ef8 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.8.4,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) + - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.8.5,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) required: true - type: textarea attributes: diff --git a/changes.md b/changes.md index 28639644..59b88b07 100644 --- a/changes.md +++ b/changes.md @@ -3,6 +3,20 @@ 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。 +## v1.8.5 20240401: +- 新增:Join ON 增加 lambda 重载方法,简化使用,感谢 @robor.luo +- 新增:Db + Row 添加支持 MyBatis 原生 SQL 及参数的方法,感谢 @Suomm +- 新增:新增不忽略 null 值时拼接 null 参数的相关功能,感谢 @Suomm +- 新增:代码生成添加 “总是生成 @Column 注解” 选项,感谢 @Suomm +- 优化:EnumWrapper 的 getEnumValue 方法如果没有注解,则使用枚举 name 返回,感谢 @robor.luo +- 优化:代码生成器 EntityConfig 链式调用错误的优化,感谢 @Suomm +- 修复:代码生成器无法生成内置数据脱敏处理器键(Masks)的问题,感谢 @Suomm +- 修复:修复 ConvertUtil 等一些工具类的方法错误 +- 文档:添加 Db + Row 添加支持 MyBatis 原生 SQL 的相关文档,感谢 @Suomm +- 文档:配置相关文档链接到 mybatis3 中文文档路径错误 + + + ## v1.8.4 20240325: - 修复:修改 QueryWrapperAdapter 的 Join 方法返回的泛型错误的问题,感谢 @Suomm - 优化:优化 ActiveRecord Join 自己,感谢 @Suomm diff --git a/docs/zh/changes.md b/docs/zh/changes.md index 28639644..59b88b07 100644 --- a/docs/zh/changes.md +++ b/docs/zh/changes.md @@ -3,6 +3,20 @@ 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。 +## v1.8.5 20240401: +- 新增:Join ON 增加 lambda 重载方法,简化使用,感谢 @robor.luo +- 新增:Db + Row 添加支持 MyBatis 原生 SQL 及参数的方法,感谢 @Suomm +- 新增:新增不忽略 null 值时拼接 null 参数的相关功能,感谢 @Suomm +- 新增:代码生成添加 “总是生成 @Column 注解” 选项,感谢 @Suomm +- 优化:EnumWrapper 的 getEnumValue 方法如果没有注解,则使用枚举 name 返回,感谢 @robor.luo +- 优化:代码生成器 EntityConfig 链式调用错误的优化,感谢 @Suomm +- 修复:代码生成器无法生成内置数据脱敏处理器键(Masks)的问题,感谢 @Suomm +- 修复:修复 ConvertUtil 等一些工具类的方法错误 +- 文档:添加 Db + Row 添加支持 MyBatis 原生 SQL 的相关文档,感谢 @Suomm +- 文档:配置相关文档链接到 mybatis3 中文文档路径错误 + + + ## v1.8.4 20240325: - 修复:修改 QueryWrapperAdapter 的 Join 方法返回的泛型错误的问题,感谢 @Suomm - 优化:优化 ActiveRecord Join 自己,感谢 @Suomm diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md index db21ec5a..ccb1a31b 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.8.4 + 1.8.5 com.mysql @@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'), com.mybatis-flex mybatis-flex-spring-boot3-starter - 1.8.4 + 1.8.5 com.mysql diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md index e3db7cc5..cbe5c8d4 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.8.4") + implementation("com.mybatis-flex:mybatis-flex-core:1.8.5") } ``` @@ -18,7 +18,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-core:1.8.4' + implementation 'com.mybatis-flex:mybatis-flex-core:1.8.5' } ``` @@ -28,7 +28,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-spring:1.8.4") + implementation("com.mybatis-flex:mybatis-flex-spring:1.8.5") } ``` @@ -36,7 +36,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-spring:1.8.4' + implementation 'com.mybatis-flex:mybatis-flex-spring:1.8.5' } ``` @@ -46,7 +46,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.8.4") + implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.8.5") } ``` @@ -54,7 +54,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.8.4' + implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.8.5' } ``` @@ -70,7 +70,7 @@ dependencies { ```kotlin dependencies { - annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.8.4") + annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.8.5") } ``` @@ -78,6 +78,6 @@ dependencies { ```groovy dependencies { - annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.8.4' + annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.8.5' } ``` diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md index bb1d3915..cc38b206 100644 --- a/docs/zh/intro/maven.md +++ b/docs/zh/intro/maven.md @@ -12,12 +12,12 @@ com.mybatis-flex mybatis-flex-core - 1.8.4 + 1.8.5 com.mybatis-flex mybatis-flex-processor - 1.8.4 + 1.8.5 provided ``` @@ -28,12 +28,12 @@ com.mybatis-flex mybatis-flex-spring - 1.8.4 + 1.8.5 com.mybatis-flex mybatis-flex-processor - 1.8.4 + 1.8.5 provided `````` @@ -44,12 +44,12 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.8.4 + 1.8.5 com.mybatis-flex mybatis-flex-processor - 1.8.4 + 1.8.5 provided ``` @@ -60,12 +60,12 @@ com.mybatis-flex mybatis-flex-spring-boot3-starter - 1.8.4 + 1.8.5 com.mybatis-flex mybatis-flex-processor - 1.8.4 + 1.8.5 provided ``` @@ -88,7 +88,7 @@ com.mybatis-flex mybatis-flex-processor - 1.8.4 + 1.8.5 diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md index e08827fd..643b0ed3 100644 --- a/docs/zh/others/apt.md +++ b/docs/zh/others/apt.md @@ -220,7 +220,7 @@ pom.xml 添加 `annotationProcessorPaths` 配置, ``` dependencies { ... - annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.8.4' + annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.8.5' } ``` diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml index 4de9f880..3809266a 100644 --- a/mybatis-flex-annotation/pom.xml +++ b/mybatis-flex-annotation/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.8.4 + 1.8.5 4.0.0 diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml index 3ca4a9d0..4d309580 100644 --- a/mybatis-flex-codegen/pom.xml +++ b/mybatis-flex-codegen/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.8.4 + 1.8.5 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-core - 1.8.4 + 1.8.5 com.mybatis-flex diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml index f943bf8e..fd26906c 100644 --- a/mybatis-flex-core/pom.xml +++ b/mybatis-flex-core/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.8.4 + 1.8.5 4.0.0 @@ -101,7 +101,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.8.4 + 1.8.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 e8878982..9716af85 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.8.4"; + public static final String VERSION = "1.8.5"; public static final String SQL = "$$sql"; diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml index 03780c00..1b70fccb 100644 --- a/mybatis-flex-dependencies/pom.xml +++ b/mybatis-flex-dependencies/pom.xml @@ -6,7 +6,7 @@ com.mybatis-flex mybatis-flex-dependencies - 1.8.4 + 1.8.5 pom @@ -48,7 +48,7 @@ - 1.8.4 + 1.8.5 diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml index 8c39f979..cbd25ecb 100644 --- a/mybatis-flex-processor/pom.xml +++ b/mybatis-flex-processor/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.8.4 + 1.8.5 4.0.0 @@ -22,7 +22,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.8.4 + 1.8.5 diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml index a775517c..01594cdb 100644 --- a/mybatis-flex-solon-plugin/pom.xml +++ b/mybatis-flex-solon-plugin/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.8.4 + 1.8.5 4.0.0 diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml index f325c242..213f80a0 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.8.4 + 1.8.5 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-spring - 1.8.4 + 1.8.5 @@ -104,7 +104,7 @@ com.mybatis-flex mybatis-flex-core - 1.8.4 + 1.8.5 diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml index 8756c8d3..3ede0202 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.8.4 + 1.8.5 mybatis-flex-spring-boot3-starter @@ -19,7 +19,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.8.4 + 1.8.5 org.mybatis diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index c5d33930..4890097e 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.8.4 + 1.8.5 4.0.0 @@ -22,7 +22,7 @@ com.mybatis-flex mybatis-flex-core - 1.8.4 + 1.8.5 diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml index 3f9a0f1a..b516a2e7 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.8.4 + 1.8.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 4c06d877..188089ae 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.8.4 + 1.8.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 bb2c29eb..ec606f39 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.8.4 + 1.8.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 3f46a781..9009270e 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.8.4 + 1.8.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 45e91866..5f6ad537 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.8.4 + 1.8.5 4.0.0 diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml index 3ec91ecc..e799b144 100644 --- a/mybatis-flex-test/pom.xml +++ b/mybatis-flex-test/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.8.4 + 1.8.5 4.0.0 diff --git a/pom.xml b/pom.xml index b67ad8d9..a757908b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.mybatis-flex parent pom - 1.8.4 + 1.8.5 mybatis-flex https://mybatis-flex.com @@ -55,7 +55,7 @@ 8 8 - 1.8.4 + 1.8.5 3.5.15 2.1.2