From 55a0a6e6ce99bda6e67beaa92d34bb679adb21df Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Mon, 10 Feb 2025 13:02:33 +0800 Subject: [PATCH] build: v1.10.7 release (^.^)YYa!! --- .gitee/ISSUE_TEMPLATE/bug.yml | 2 +- changes.md | 7 ++++++ 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 +- docs/zh/others/codegen.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, 61 insertions(+), 54 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index a2b03d5f..45d2d31c 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.6,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) + - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.10.7,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues) required: true - type: textarea attributes: diff --git a/changes.md b/changes.md index a9a32483..5ba0ff2f 100644 --- a/changes.md +++ b/changes.md @@ -2,6 +2,13 @@ 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。 + +## v1.10.7 20250210 +- 修复:在不使用 mybatis-flex-processor 模块时,会出现 StrUtil 找不到的问题 +- 修复:代码生成器 Controller 代码生成格式和详情无法生成文档的问题 + + + ## v1.10.6 20250206 - 新增:动态数据源 @UseDataSource 的value值扩展支持表达式解析处理 - 优化:代码生成器补充 solon 的 controller diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md index ef3d3500..01221651 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.6 + 1.10.7 com.mysql @@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'), com.mybatis-flex mybatis-flex-spring-boot3-starter - 1.10.6 + 1.10.7 com.mysql diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md index 267484fb..f7a63238 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.6") + implementation("com.mybatis-flex:mybatis-flex-core:1.10.7") } ``` @@ -18,7 +18,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-core:1.10.6' + implementation 'com.mybatis-flex:mybatis-flex-core:1.10.7' } ``` @@ -28,7 +28,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-spring:1.10.6") + implementation("com.mybatis-flex:mybatis-flex-spring:1.10.7") } ``` @@ -36,7 +36,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.6' + implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.7' } ``` @@ -46,7 +46,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.6") + implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.7") } ``` @@ -54,7 +54,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.6' + implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.7' } ``` @@ -65,7 +65,7 @@ dependencies { ```kotlin dependencies { - implementation("com.mybatis-flex:mybatis-flex-solon-plugin:1.10.6") + implementation("com.mybatis-flex:mybatis-flex-solon-plugin:1.10.7") } ``` @@ -73,7 +73,7 @@ dependencies { ```groovy dependencies { - implementation 'com.mybatis-flex:mybatis-flex-solon-plugin:1.10.6' + implementation 'com.mybatis-flex:mybatis-flex-solon-plugin:1.10.7' } ``` @@ -91,7 +91,7 @@ dependencies { ```kotlin dependencies { - annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.6") + annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.7") } ``` @@ -99,6 +99,6 @@ dependencies { ```groovy dependencies { - annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.6' + annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.7' } ``` diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md index 11428b2e..1c1cbcfd 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.6 + 1.10.7 com.mybatis-flex mybatis-flex-processor - 1.10.6 + 1.10.7 provided ``` @@ -28,12 +28,12 @@ com.mybatis-flex mybatis-flex-spring - 1.10.6 + 1.10.7 com.mybatis-flex mybatis-flex-processor - 1.10.6 + 1.10.7 provided `````` @@ -44,12 +44,12 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.10.6 + 1.10.7 com.mybatis-flex mybatis-flex-processor - 1.10.6 + 1.10.7 provided ``` @@ -60,12 +60,12 @@ com.mybatis-flex mybatis-flex-spring-boot3-starter - 1.10.6 + 1.10.7 com.mybatis-flex mybatis-flex-processor - 1.10.6 + 1.10.7 provided ``` @@ -76,12 +76,12 @@ com.mybatis-flex mybatis-flex-solon-plugin - 1.10.6 + 1.10.7 com.mybatis-flex mybatis-flex-processor - 1.10.6 + 1.10.7 provided ``` @@ -104,7 +104,7 @@ com.mybatis-flex mybatis-flex-processor - 1.10.6 + 1.10.7 diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md index dc1d9287..88caa0d8 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.6' + annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.7' } ``` diff --git a/docs/zh/others/codegen.md b/docs/zh/others/codegen.md index 3cede211..5fb83ea9 100644 --- a/docs/zh/others/codegen.md +++ b/docs/zh/others/codegen.md @@ -21,7 +21,7 @@ com.mybatis-flex mybatis-flex-codegen - 1.10.1 + 1.10.7 ``` diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml index 353ff36f..867cf2cf 100644 --- a/mybatis-flex-annotation/pom.xml +++ b/mybatis-flex-annotation/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.6 + 1.10.7 4.0.0 diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml index e599f4ac..81e6ceb6 100644 --- a/mybatis-flex-codegen/pom.xml +++ b/mybatis-flex-codegen/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.6 + 1.10.7 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.6 + 1.10.7 com.mybatis-flex diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml index 2823ceff..774adacb 100644 --- a/mybatis-flex-core/pom.xml +++ b/mybatis-flex-core/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.6 + 1.10.7 4.0.0 @@ -101,7 +101,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.10.6 + 1.10.7 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 ed8ed62c..17ca09e7 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.6"; + public static final String VERSION = "1.10.7"; public static final String SQL = "$$sql"; diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml index bc3bd2e7..b07beec0 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.6 + 1.10.7 pom @@ -48,7 +48,7 @@ - 1.10.6 + 1.10.7 diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml index 398211c4..79198643 100644 --- a/mybatis-flex-processor/pom.xml +++ b/mybatis-flex-processor/pom.xml @@ -5,13 +5,13 @@ parent com.mybatis-flex - 1.10.6 + 1.10.7 4.0.0 mybatis-flex-processor jar - 1.10.6 + 1.10.7 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.10.6 + 1.10.7 diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml index ba246864..d9a627bb 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.6 + 1.10.7 4.0.0 diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml index 39531a28..52a2b019 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.6 + 1.10.7 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-spring - 1.10.6 + 1.10.7 @@ -104,7 +104,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.6 + 1.10.7 diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml index 11e098b2..46b34f89 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.6 + 1.10.7 mybatis-flex-spring-boot3-starter @@ -19,7 +19,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.10.6 + 1.10.7 org.mybatis diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index e51e200d..dc197298 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.6 + 1.10.7 4.0.0 @@ -22,7 +22,7 @@ com.mybatis-flex mybatis-flex-core - 1.10.6 + 1.10.7 diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml index b1c95ccd..526563d2 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.6 + 1.10.7 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 6f433e45..ff3410c4 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.6 + 1.10.7 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 231bfa68..84465c70 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.6 + 1.10.7 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 19313504..c05d51ed 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.6 + 1.10.7 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 62b98d1c..44d3c589 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.6 + 1.10.7 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 9c9bd0cd..31d51d37 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.6 + 1.10.7 4.0.0 diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml index 5198789a..7d73544d 100644 --- a/mybatis-flex-test/pom.xml +++ b/mybatis-flex-test/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - 1.10.6 + 1.10.7 4.0.0 diff --git a/pom.xml b/pom.xml index f21177dd..ff527f13 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.mybatis-flex parent pom - 1.10.6 + 1.10.7 mybatis-flex https://mybatis-flex.com @@ -63,7 +63,7 @@ 8 8 - 1.10.6 + 1.10.7 3.5.19 2.1.2