diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml
index 5cf60308..6febd2bb 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.11.0,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
+ - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.11.1,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
required: true
- type: textarea
attributes:
diff --git a/changes.md b/changes.md
index 859daf53..0265247d 100644
--- a/changes.md
+++ b/changes.md
@@ -2,6 +2,18 @@
查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
+
+
+## v1.11.1 20250725
+- 新增:添加数据源缺失处理器,方便项目启动后,再通过代码添加数据源
+- 新增:between 条件遇到 一个参数为 null 时自动转换成 LE 或 GE 逻辑 #ICKPDB
+- 新增:添加对 Spring Batch 的支持
+- 修复:动态添加数据源第二次切换数据源无效的问题 #ICLQQ3
+- 修复:Datasource lambda 的 orElse 是方法的话,会在执行 lambda 之前堆栈就调用了,那么 Optional 的逻辑就失去作用了
+- 测试:添加对 Spring Batch 的单元测试
+
+
+
## v1.11.0 20250713
- 新增:代码生成器 Column 支持带有范型的类型,感谢 @benshi
- 新增:对于用户常用类,启用代码折叠支持,感谢 @hewei
diff --git a/docs/zh/changes.md b/docs/zh/changes.md
index 859daf53..0265247d 100644
--- a/docs/zh/changes.md
+++ b/docs/zh/changes.md
@@ -2,6 +2,18 @@
查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
+
+
+## v1.11.1 20250725
+- 新增:添加数据源缺失处理器,方便项目启动后,再通过代码添加数据源
+- 新增:between 条件遇到 一个参数为 null 时自动转换成 LE 或 GE 逻辑 #ICKPDB
+- 新增:添加对 Spring Batch 的支持
+- 修复:动态添加数据源第二次切换数据源无效的问题 #ICLQQ3
+- 修复:Datasource lambda 的 orElse 是方法的话,会在执行 lambda 之前堆栈就调用了,那么 Optional 的逻辑就失去作用了
+- 测试:添加对 Spring Batch 的单元测试
+
+
+
## v1.11.0 20250713
- 新增:代码生成器 Column 支持带有范型的类型,感谢 @benshi
- 新增:对于用户常用类,启用代码折叠支持,感谢 @hewei
diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md
index ff49f1b6..8f8a3627 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.11.0
+ 1.11.1
com.mysql
@@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'),
com.mybatis-flex
mybatis-flex-spring-boot3-starter
- 1.11.0
+ 1.11.1
com.mysql
diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md
index da9b767a..ac4a644e 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.11.0")
+ implementation("com.mybatis-flex:mybatis-flex-core:1.11.1")
}
```
@@ -18,7 +18,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-core:1.11.0'
+ implementation 'com.mybatis-flex:mybatis-flex-core:1.11.1'
}
```
@@ -28,7 +28,7 @@ dependencies {
```kotlin
dependencies {
- implementation("com.mybatis-flex:mybatis-flex-spring:1.11.0")
+ implementation("com.mybatis-flex:mybatis-flex-spring:1.11.1")
}
```
@@ -36,7 +36,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-spring:1.11.0'
+ implementation 'com.mybatis-flex:mybatis-flex-spring:1.11.1'
}
```
@@ -46,7 +46,7 @@ dependencies {
```kotlin
dependencies {
- implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.11.0")
+ implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.11.1")
}
```
@@ -54,7 +54,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.11.0'
+ implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.11.1'
}
```
@@ -65,7 +65,7 @@ dependencies {
```kotlin
dependencies {
- implementation("com.mybatis-flex:mybatis-flex-solon-plugin:1.11.0")
+ implementation("com.mybatis-flex:mybatis-flex-solon-plugin:1.11.1")
}
```
@@ -73,7 +73,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-solon-plugin:1.11.0'
+ implementation 'com.mybatis-flex:mybatis-flex-solon-plugin:1.11.1'
}
```
@@ -91,7 +91,7 @@ dependencies {
```kotlin
dependencies {
- annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.11.0")
+ annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.11.1")
}
```
@@ -99,6 +99,6 @@ dependencies {
```groovy
dependencies {
- annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.11.0'
+ annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.11.1'
}
```
diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md
index 9c5494f7..2d61e982 100644
--- a/docs/zh/intro/maven.md
+++ b/docs/zh/intro/maven.md
@@ -12,12 +12,12 @@
com.mybatis-flex
mybatis-flex-core
- 1.11.0
+ 1.11.1
com.mybatis-flex
mybatis-flex-processor
- 1.11.0
+ 1.11.1
provided
```
@@ -28,12 +28,12 @@
com.mybatis-flex
mybatis-flex-spring
- 1.11.0
+ 1.11.1
com.mybatis-flex
mybatis-flex-processor
- 1.11.0
+ 1.11.1
provided
``````
@@ -44,12 +44,12 @@
com.mybatis-flex
mybatis-flex-spring-boot-starter
- 1.11.0
+ 1.11.1
com.mybatis-flex
mybatis-flex-processor
- 1.11.0
+ 1.11.1
provided
```
@@ -60,12 +60,12 @@
com.mybatis-flex
mybatis-flex-spring-boot3-starter
- 1.11.0
+ 1.11.1
com.mybatis-flex
mybatis-flex-processor
- 1.11.0
+ 1.11.1
provided
```
@@ -76,12 +76,12 @@
com.mybatis-flex
mybatis-flex-solon-plugin
- 1.11.0
+ 1.11.1
com.mybatis-flex
mybatis-flex-processor
- 1.11.0
+ 1.11.1
provided
```
@@ -104,7 +104,7 @@
com.mybatis-flex
mybatis-flex-processor
- 1.11.0
+ 1.11.1
diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md
index b7f1de15..717a6a56 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.11.0'
+ annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.11.1'
}
```
diff --git a/docs/zh/others/codegen.md b/docs/zh/others/codegen.md
index 1a37b6d4..75bb9e6c 100644
--- a/docs/zh/others/codegen.md
+++ b/docs/zh/others/codegen.md
@@ -21,7 +21,7 @@
com.mybatis-flex
mybatis-flex-codegen
- 1.11.0
+ 1.11.1
```
diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml
index 7bb0435e..abad4b91 100644
--- a/mybatis-flex-annotation/pom.xml
+++ b/mybatis-flex-annotation/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.11.0
+ 1.11.1
4.0.0
diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml
index f510350b..aab34dde 100644
--- a/mybatis-flex-codegen/pom.xml
+++ b/mybatis-flex-codegen/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.11.0
+ 1.11.1
4.0.0
@@ -24,7 +24,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.11.0
+ 1.11.1
com.mybatis-flex
diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml
index 3f0d958c..94081a9a 100644
--- a/mybatis-flex-core/pom.xml
+++ b/mybatis-flex-core/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.11.0
+ 1.11.1
4.0.0
@@ -102,7 +102,7 @@
com.mybatis-flex
mybatis-flex-annotation
- 1.11.0
+ 1.11.1
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 91a35241..bebe62fa 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.11.0";
+ public static final String VERSION = "1.11.1";
public static final String SQL = "$$sql";
diff --git a/mybatis-flex-loveqq-starter/pom.xml b/mybatis-flex-loveqq-starter/pom.xml
index 4781d3d5..febfa860 100644
--- a/mybatis-flex-loveqq-starter/pom.xml
+++ b/mybatis-flex-loveqq-starter/pom.xml
@@ -6,7 +6,7 @@
com.mybatis-flex
parent
- 1.11.0
+ 1.11.1
mybatis-flex-loveqq-starter
diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml
index f9d92c5d..b4065fb5 100644
--- a/mybatis-flex-processor/pom.xml
+++ b/mybatis-flex-processor/pom.xml
@@ -5,14 +5,14 @@
parent
com.mybatis-flex
- 1.11.0
+ 1.11.1
4.0.0
mybatis-flex-processor
mybatis-flex-processor
jar
- 1.11.0
+ 1.11.1
@@ -24,7 +24,7 @@
com.mybatis-flex
mybatis-flex-annotation
- 1.11.0
+ 1.11.1
diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml
index ac06798a..29259fe7 100644
--- a/mybatis-flex-solon-plugin/pom.xml
+++ b/mybatis-flex-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.11.0
+ 1.11.1
4.0.0
diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml
index 944491e8..b7be56af 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.11.0
+ 1.11.1
4.0.0
@@ -24,7 +24,7 @@
com.mybatis-flex
mybatis-flex-spring
- 1.11.0
+ 1.11.1
@@ -105,7 +105,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.11.0
+ 1.11.1
diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml
index 079e2941..95afce9e 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.11.0
+ 1.11.1
mybatis-flex-spring-boot3-starter
@@ -21,7 +21,7 @@
com.mybatis-flex
mybatis-flex-spring-boot-starter
- 1.11.0
+ 1.11.1
org.mybatis
diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml
index b6bf14c9..921e5bd5 100644
--- a/mybatis-flex-spring/pom.xml
+++ b/mybatis-flex-spring/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.11.0
+ 1.11.1
4.0.0
@@ -23,7 +23,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.11.0
+ 1.11.1
diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml
index 0c250390..5f9c1127 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.11.0
+ 1.11.1
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 1c418319..753b110e 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.11.0
+ 1.11.1
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 daeee706..987c42fc 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.11.0
+ 1.11.1
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 196b0692..67c3cbaf 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.11.0
+ 1.11.1
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 c59a3c59..9519541d 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.11.0
+ 1.11.1
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 58a7ae7a..6e9517bf 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.11.0
+ 1.11.1
4.0.0
diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml
index 81ee5df0..9462b1f8 100644
--- a/mybatis-flex-test/pom.xml
+++ b/mybatis-flex-test/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.11.0
+ 1.11.1
4.0.0
diff --git a/pom.xml b/pom.xml
index e4693e81..e81a4fc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.mybatis-flex
parent
pom
- 1.11.0
+ 1.11.1
mybatis-flex
https://mybatis-flex.com
@@ -65,7 +65,7 @@
8
8
- 1.11.0
+ 1.11.1
3.5.19
2.1.2