!530 feat: 添加数据源缺失处理器

Merge pull request !530 from oc/dev-20250219

.gitee/ISSUE_TEMPLATE/bug.yml

@@ -7,7 +7,7 @@ body:
         attributes:
             label: 这个 Bug 是否已经存在：
             options:
-                -   label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.10.9，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
+                -   label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.11.0，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
                     required: true
     -   type: textarea
         attributes:

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

changes.md

@@ -2,6 +2,22 @@
 
 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
 
+## v1.11.0 20250713
+- 新增：代码生成器 Column 支持带有范型的类型，感谢 @benshi
+- 新增：对于用户常用类，启用代码折叠支持，感谢 @hewei
+- 新增：Column 添加 setProperty 方法的支持，感谢 @benshi
+- 新增：增加 GBASE_8C、GBASE_8S_PG、GOLDENDB、SUNDB、VASTBASE、YASDB、PRESTO 驱动识别，感谢 @fangzhengjin
+- 新增：添加 loveqq-framework 启动器，感谢 @kfyty725
+- 优化：优化 `>=` 逻辑和 `<=` 逻辑保持一致，感谢 @fyh
+- 优化：调整 sqlserver 2008 版本的 DbType 为 SQLSERVER_2005，修复分页语句不支持 offset 问题，感谢 @all-around-badass
+- 修复：高斯数据库调整为无反义处理，避免严格大小写处理，感谢 @all-around-badass
+- 修复：在 join 多次相同的表时, 构建租户条件没能取到正确的别名，感谢 @gzkemays
+- 修复：在使用 UpdateChain 更新实体类字段时偶发 ClassCastException 异常问题，感谢 @iminifly
+- 修复：多环境导入相同 Mapper 冲突问题，感谢 @wcc1433
+- 文档：更新代码生成器的相关文档
+
+
+
 ## v1.10.9 20250319
 - 新增: 代码生成器支持配置 entity 类 lombok 注解生成 (@NoArgsConstructor, @AllArgsConstructor)，感谢 @coder-xiaomo
 - 新增：增加全局忽略 schema 配置的支持，感谢 @cui

docs/zh/changes.md

@@ -2,6 +2,22 @@
 
 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
 
+## v1.11.0 20250713
+- 新增：代码生成器 Column 支持带有范型的类型，感谢 @benshi
+- 新增：对于用户常用类，启用代码折叠支持，感谢 @hewei
+- 新增：Column 添加 setProperty 方法的支持，感谢 @benshi
+- 新增：增加 GBASE_8C、GBASE_8S_PG、GOLDENDB、SUNDB、VASTBASE、YASDB、PRESTO 驱动识别，感谢 @fangzhengjin
+- 新增：添加 loveqq-framework 启动器，感谢 @kfyty725
+- 优化：优化 `>=` 逻辑和 `<=` 逻辑保持一致，感谢 @fyh
+- 优化：调整 sqlserver 2008 版本的 DbType 为 SQLSERVER_2005，修复分页语句不支持 offset 问题，感谢 @all-around-badass
+- 修复：高斯数据库调整为无反义处理，避免严格大小写处理，感谢 @all-around-badass
+- 修复：在 join 多次相同的表时, 构建租户条件没能取到正确的别名，感谢 @gzkemays
+- 修复：在使用 UpdateChain 更新实体类字段时偶发 ClassCastException 异常问题，感谢 @iminifly
+- 修复：多环境导入相同 Mapper 冲突问题，感谢 @wcc1433
+- 文档：更新代码生成器的相关文档
+
+
+
 ## v1.10.9 20250319
 - 新增: 代码生成器支持配置 entity 类 lombok 注解生成 (@NoArgsConstructor, @AllArgsConstructor)，感谢 @coder-xiaomo
 - 新增：增加全局忽略 schema 配置的支持，感谢 @cui

docs/zh/core/multi-datasource.md

@@ -206,6 +206,43 @@ public class Account {
 `DataSourceKey.use()` > `@UseDataSource()在方法上` > `@UseDataSource()在类上` >`@Table(dataSource="...")`
 :::
 
+## 数据源缺失处理器
+
+当无法根据 `dataSourceKey` 找到数据源时，默认情况下会抛出 `IllegalStateException` 异常。
+数据源缺失处理器（`DataSourceMissingHandler`）提供了更加灵活的处理方式，你可以通过它自定义处理逻辑（如：记录日志、抛出异常或主动初始化新的数据源）。
+
+### 使用示例
+
+我们推荐使用 `MyBatisFlexCustomizer` 来配置数据源缺失处理器，如下所示：
+
+```java
+@Configuration
+public class MyBatisFlexConfiguration implements MyBatisFlexCustomizer {
+
+    @Override
+    public void customize(FlexGlobalConfig globalConfig) {
+        // ...
+
+        // 配置数据源缺失处理器：此处演示的是以后备逻辑主动初始化数据源
+        globalConfig.setDataSourceMissingHandler((dataSourceKey, dataSourceMap) -> {
+            // 根据 key 获取数据源
+            DataSource ds = customCreateDataSource(dataSourceKey);
+
+            // 取不到的时候返回 null，后续代码逻辑仍然由 FlexDataSource 处理（即抛出异常）
+            if (ds == null) return null;
+
+            // 添加新的数据源，避免下次再次触发和创建
+            dataSourceMap.put(dataSourceKey, ds);
+
+            return dataSourceMap;
+        });
+
+        // ...
+    }
+
+}
+```
+
 ## 更多的 Spring 或 Solon Yaml 配置支持
 ```yaml
 mybatis-flex:

docs/zh/intro/getting-started.md

@@ -53,7 +53,7 @@ VALUES (1, '张三', 18, '2020-01-11'),
     <dependency>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </dependency>
     <dependency>
         <groupId>com.mysql</groupId>
@@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'),
     <dependency>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </dependency>
     <dependency>
         <groupId>com.mysql</groupId>

docs/zh/intro/gradle.md

@@ -10,7 +10,7 @@
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-core:1.10.9")
+    implementation("com.mybatis-flex:mybatis-flex-core:1.11.0")
 }
 ```
 
@@ -18,7 +18,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-core:1.10.9'
+    implementation 'com.mybatis-flex:mybatis-flex-core:1.11.0'
 }
 ```
 
@@ -28,7 +28,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-spring:1.10.9")
+    implementation("com.mybatis-flex:mybatis-flex-spring:1.11.0")
 }
 ```
 
@@ -36,7 +36,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.9'
+    implementation 'com.mybatis-flex:mybatis-flex-spring:1.11.0'
 }
 ```
 
@@ -46,7 +46,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.9")
+    implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.11.0")
 }
 ```
 
@@ -54,7 +54,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.9'
+    implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.11.0'
 }
 ```
 
@@ -65,7 +65,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-solon-plugin:1.10.9")
+    implementation("com.mybatis-flex:mybatis-flex-solon-plugin:1.11.0")
 }
 ```
 
@@ -73,7 +73,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-solon-plugin:1.10.9'
+    implementation 'com.mybatis-flex:mybatis-flex-solon-plugin:1.11.0'
 }
 ```
 
@@ -91,7 +91,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.9")
+    annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.11.0")
 }
 ```
 
@@ -99,6 +99,6 @@ dependencies {
 
 ```groovy
 dependencies {
-    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.9'
+    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.11.0'
 }
 ```

docs/zh/intro/maven.md

@@ -12,12 +12,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-core</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -28,12 +28,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-spring</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
     <scope>provided</scope>
 </dependency>
 ``````
@@ -44,12 +44,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -60,12 +60,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -76,12 +76,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-solon-plugin</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -104,7 +104,7 @@
             <path>
                 <groupId>com.mybatis-flex</groupId>
                 <artifactId>mybatis-flex-processor</artifactId>
-                <version>1.10.9</version>
+                <version>1.11.0</version>
             </path>
         </annotationProcessorPaths>
     </configuration>

docs/zh/others/apt.md

@@ -248,7 +248,7 @@ pom.xml 添加 `annotationProcessorPaths` 配置，
 ```
 dependencies {
     ...
-    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.9'
+    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.11.0'
 }
 ```
 

docs/zh/others/codegen.md

@@ -21,7 +21,7 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-codegen</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 </dependency>
 ```
 

mvnw

@@ -0,0 +1,316 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,188 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%

mybatis-flex-annotation/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-annotation</name>
     <artifactId>mybatis-flex-annotation</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-codegen/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-codegen</name>
     <artifactId>mybatis-flex-codegen</artifactId>
     <packaging>jar</packaging>
 
@@ -23,7 +24,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.10.9</version>
+            <version>1.11.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.mybatis-flex</groupId>

mybatis-flex-core/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-core</name>
     <artifactId>mybatis-flex-core</artifactId>
     <packaging>jar</packaging>
 
@@ -101,7 +102,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-annotation</artifactId>
-            <version>1.10.9</version>
+            <version>1.11.0</version>
             <scope>compile</scope>
         </dependency>
 

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.9";
+    public static final String VERSION = "1.11.0";
 
 
     public static final String SQL = "$$sql";

mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexGlobalConfig.java

@@ -20,6 +20,7 @@ import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Listener;
 import com.mybatisflex.annotation.SetListener;
 import com.mybatisflex.annotation.UpdateListener;
+import com.mybatisflex.core.datasource.DataSourceMissingHandler;
 import com.mybatisflex.core.datasource.FlexDataSource;
 import com.mybatisflex.core.dialect.DbType;
 import com.mybatisflex.core.exception.FlexAssert;
@@ -120,6 +121,11 @@ public class FlexGlobalConfig {
      */
     private UnMappedColumnHandler unMappedColumnHandler;
 
+    /**
+     * 数据源缺失处理器
+     */
+    private DataSourceMissingHandler dataSourceMissingHandler;
+
     public boolean isPrintBanner() {
         return printBanner;
     }
@@ -362,6 +368,21 @@ public class FlexGlobalConfig {
         FlexGlobalConfig.globalConfigs = globalConfigs;
     }
 
+    /**
+     * 获取数据源缺失处理器。
+     * @return DataSourceMissingHandler 数据源缺失处理器实例，用于自定义处理逻辑（如：记录日志、抛出异常或提供默认数据源）。
+     */
+    public DataSourceMissingHandler getDataSourceMissingHandler() {
+        return dataSourceMissingHandler;
+    }
+
+    /**
+     * 设置获取数据源缺失处理器。
+     * @param dataSourceMissingHandler 数据源缺失处理器实例，用于自定义处理逻辑（如：记录日志、抛出异常或提供默认数据源）。
+     */
+    public void setDataSourceMissingHandler(final DataSourceMissingHandler dataSourceMissingHandler) {
+        this.dataSourceMissingHandler = dataSourceMissingHandler;
+    }
 
     /**
      * 对应的是 注解 {@link com.mybatisflex.annotation.Id} 的配置
@@ -399,7 +420,7 @@ public class FlexGlobalConfig {
     }
 
 
-    /////static factory methods/////
+    /// //static factory methods/////
     private static ConcurrentHashMap<String, FlexGlobalConfig> globalConfigs = new ConcurrentHashMap<>();
     private static FlexGlobalConfig defaultConfig = new FlexGlobalConfig();
 

mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/DataSourceKey.java

@@ -34,9 +34,11 @@ public class DataSourceKey {
 
     public static void use(String dataSourceKey) {
         Deque<String> deque = lookup.get();
-        if (deque != null) {
+        if (deque == null) {
-            deque.push(dataSourceKey);
+            deque = new ArrayDeque<>(1);
+            lookup.set(deque);
         }
+        deque.push(dataSourceKey);
     }
 
     public static String get() {
@@ -95,31 +97,4 @@ public class DataSourceKey {
         return shardingDsKey != null ? shardingDsKey : dataSource;
     }
 
-    // === For Removal ===
-
-    @Deprecated
-    public static String getByManual() {
-        throw new UnsupportedOperationException("使用 DataSource.get() 代替。");
-    }
-
-    @Deprecated
-    public static String getByAnnotation() {
-        throw new UnsupportedOperationException("使用 DataSource.get() 代替。");
-    }
-
-    @Deprecated
-    public static void useWithAnnotation(String dataSourceKey) {
-        throw new UnsupportedOperationException("使用 DataSource.use(String) 代替。");
-    }
-
-    @Deprecated
-    public static void setAnnotationKeyThreadLocal(ThreadLocal<String> annotationKeyThreadLocal) {
-        throw new UnsupportedOperationException("使用 DataSource.setThreadLocal(ThreadLocal<Deque<String>>) 代替。");
-    }
-
-    @Deprecated
-    public static void setManualKeyThreadLocal(ThreadLocal<String> manualKeyThreadLocal) {
-        throw new UnsupportedOperationException("使用 DataSource.setThreadLocal(ThreadLocal<Deque<String>>) 代替。");
-    }
-
 }

mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/DataSourceMissingHandler.java

@@ -0,0 +1,34 @@
+package com.mybatisflex.core.datasource;
+
+import javax.sql.DataSource;
+import java.util.Map;
+
+/**
+ * 数据源缺失处理器接口。当尝试获取指定数据源但不存在时，通过此接口进行动态处理。
+ *
+ * <p>
+ * 该接口被设计为函数式接口，可通过Lambda表达式或方法引用实现，用于在运行时动态处理缺失的数据源。<br/>
+ * 常见应用场景：<br/>
+ * - 多租户系统中根据租户ID动态创建并缓存数据源；<br/>
+ * - 数据源缺失时的主动初始化；
+ * </p>
+ */
+@FunctionalInterface
+public interface DataSourceMissingHandler {
+    /**
+     * 处理缺失数据源的核心方法。
+     *
+     * @param dataSourceKey 当前请求的数据源键（标识符），通常用于识别目标数据源
+     * @param dataSourceMap 当前已存在的数据源集合（key: 数据源键，value: 数据源实例）
+     * @return 处理后的新数据源集合，通常应包含原有数据源及新增处理的数据源
+     * @implSpec 实现类应通过此方法实现：<br/>
+     * 1. 根据dataSourceKey识别需要补充的数据源<br/>
+     * 2. 创建/配置新的DataSource实例<br/>
+     * 3. 将新数据源添加到dataSourceMap中<br/>
+     * 4. 返回更新后的数据源集合<br/>
+     * 5. 如返回 null 或 Map 为空，后续会抛出异常。<br/>
+     * @example 示例场景：
+     * 当请求"tenant_123"数据源不存在时，在此方法中创建对应数据源并放入返回的Map
+     */
+    Map<String, DataSource> handle(String dataSourceKey, Map<String, DataSource> dataSourceMap);
+}

mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/FlexDataSource.java

@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.datasource;
 
+import com.mybatisflex.core.FlexGlobalConfig;
 import com.mybatisflex.core.dialect.DbType;
 import com.mybatisflex.core.dialect.DbTypeUtil;
 import com.mybatisflex.core.transaction.TransactionContext;
@@ -30,7 +31,11 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -200,7 +205,7 @@ public class FlexDataSource extends AbstractDataSource {
         } catch (SQLException e) {
             if (log.isDebugEnabled()) {
                 log.debug("Error resetting autoCommit to true before closing the connection. " +
-                    "Cause: " + e);
+                          "Cause: " + e);
             }
         }
     }
@@ -235,38 +240,74 @@ public class FlexDataSource extends AbstractDataSource {
         return (iface.isInstance(this) || getDataSource().isWrapperFor(iface));
     }
 
+    /**
+     * 获取数据源缺失处理器。
+     * @return DataSourceMissingHandler 数据源缺失处理器实例，用于自定义处理逻辑（如：记录日志、抛出异常或提供默认数据源）。
+     */
+    public DataSourceMissingHandler getDataSourceMissingHandler() {
+        return FlexGlobalConfig.getDefaultConfig().getDataSourceMissingHandler();
+    }
 
     protected DataSource getDataSource() {
         DataSource dataSource = defaultDataSource;
+        DataSourceMissingHandler dataSourceMissingHandler = getDataSourceMissingHandler();
+
         if (dataSourceMap.size() > 1) {
             String dataSourceKey = DataSourceKey.get();
+
             if (StringUtil.hasText(dataSourceKey)) {
-                //负载均衡 key
+                // 负载均衡 key
                 if (dataSourceKey.charAt(dataSourceKey.length() - 1) == LOAD_BALANCE_KEY_SUFFIX) {
                     String prefix = dataSourceKey.substring(0, dataSourceKey.length() - 1);
                     List<String> matchedKeys = new ArrayList<>();
+
                     for (String key : dataSourceMap.keySet()) {
                         if (key.startsWith(prefix)) {
                             matchedKeys.add(key);
                         }
                     }
 
+                    // 当找不到匹配的 key 时，尝试后备匹配
+                    if (matchedKeys.isEmpty() && dataSourceMissingHandler != null) {
+                        Map<String, DataSource> dsMap = dataSourceMissingHandler.handle(dataSourceKey, dataSourceMap);
+
+                        if (dsMap != null && !dsMap.isEmpty()) {
+                            for (String key : dsMap.keySet()) {
+                                if (key.startsWith(prefix)) {
+                                    matchedKeys.add(key);
+                                }
+                            }
+                        }
+                    }
+
                     if (matchedKeys.isEmpty()) {
                         throw new IllegalStateException("Can not matched dataSource by key: \"" + dataSourceKey + "\"");
                     }
 
                     String randomKey = matchedKeys.get(ThreadLocalRandom.current().nextInt(matchedKeys.size()));
+
                     return dataSourceMap.get(randomKey);
                 }
-                //非负载均衡 key
+                // 非负载均衡 key
                 else {
                     dataSource = dataSourceMap.get(dataSourceKey);
+
+                    // 当找不到匹配的 key 时，尝试后备匹配
+                    if (dataSource == null && dataSourceMissingHandler != null) {
+                        Map<String, DataSource> dsMap = dataSourceMissingHandler.handle(dataSourceKey, dataSourceMap);
+
+                        if (dsMap != null && !dsMap.isEmpty()) {
+                            dataSource = dsMap.get(dataSourceKey);
+                        }
+                    }
+
                     if (dataSource == null) {
                         throw new IllegalStateException("Cannot get target dataSource by key: \"" + dataSourceKey + "\"");
                     }
                 }
             }
         }
+
         return dataSource;
     }
 
@@ -285,11 +326,11 @@ public class FlexDataSource extends AbstractDataSource {
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
             if (ArrayUtil.contains(proxyMethods, method.getName())
                 && isTransactional()) {
-                //do nothing
+                // do nothing
                 return null;
             }
 
-            //setAutoCommit: true
+            // setAutoCommit: true
             if ("close".equalsIgnoreCase(method.getName())) {
                 resetAutoCommit(original);
             }

mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java

@@ -513,18 +513,37 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
         if (values == null || values.length != 2) {
             throw new IllegalArgumentException("values is null or length is not 2");
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, values));
+        Object start = values[0], end = values[1];
+        return between_(start, end);
     }
 
     QueryCondition between_(Object start, Object end) {
+        if (start == null && end == null) {
+            return QueryCondition.createEmpty();
+        }
+
+        boolean smartConvertBetweenToLeOrGe = QueryColumnBehavior.isSmartConvertBetweenToLeOrGe();
+        if ((start == null || end == null) && !smartConvertBetweenToLeOrGe) {
+            return QueryCondition.createEmpty();
+        }
+
+        /* && end != null */
+        if (start == null) {
+            return le_(end);
+        }
+
+        /* && start != null */
+        if (end == null) {
+            return ge_(start);
+        }
         return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end}));
     }
 
     @Override
     public QueryCondition between(Object[] values) {
-        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
+//        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
-            return QueryCondition.createEmpty();
+//            return QueryCondition.createEmpty();
-        }
+//        }
         return between_(values);
     }
 
@@ -538,9 +557,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition between(Object start, Object end) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
+//        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
-            return QueryCondition.createEmpty();
+//            return QueryCondition.createEmpty();
-        }
+//        }
         return between_(start, end);
     }
 
@@ -576,9 +595,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notBetween(Object[] values) {
-        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
+//        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
-            return QueryCondition.createEmpty();
+//            return QueryCondition.createEmpty();
-        }
+//        }
         return notBetween_(values);
     }
 
@@ -592,9 +611,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notBetween(Object start, Object end) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
+//        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
-            return QueryCondition.createEmpty();
+//            return QueryCondition.createEmpty();
-        }
+//        }
         return notBetween_(start, end);
     }
 
@@ -892,7 +911,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
     }
 
 
-    ////order by ////
+    /// /order by ////
     public QueryOrderBy asc() {
         return new QueryOrderBy(this, SqlConsts.ASC);
     }

mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumnBehavior.java

@@ -94,7 +94,12 @@ public class QueryColumnBehavior {
     /**
      * 当 {@code IN(...)} 条件只有 1 个参数时，是否自动把的内容转换为相等。
      */
-    private static boolean smartConvertInToEquals = false;
+    private static boolean smartConvertInToEquals = true;
+
+    /**
+     * 当 {@code BETWEEN ... AND ...} 条件只有 1 个参数时，是否自动把的内容转换为小于等于或大于等于。
+     */
+    private static boolean smartConvertBetweenToLeOrGe = true;
 
     public static Predicate<Object> getIgnoreFunction() {
         return ignoreFunction;
@@ -112,6 +117,14 @@ public class QueryColumnBehavior {
         QueryColumnBehavior.smartConvertInToEquals = smartConvertInToEquals;
     }
 
+    public static boolean isSmartConvertBetweenToLeOrGe() {
+        return smartConvertBetweenToLeOrGe;
+    }
+
+    public static void setSmartConvertBetweenToLeOrGe(boolean smartConvertBetweenToLeOrGe) {
+        QueryColumnBehavior.smartConvertBetweenToLeOrGe = smartConvertBetweenToLeOrGe;
+    }
+
     static boolean shouldIgnoreValue(Object value) {
         return ignoreFunction.test(value);
     }

mybatis-flex-dependencies/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-dependencies</artifactId>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 
     <packaging>pom</packaging>
 
@@ -48,7 +48,7 @@
         </developer>
     </developers>
     <properties>
-        <mybatis-flex.version>1.10.9</mybatis-flex.version>
+        <mybatis-flex.version>1.11.0</mybatis-flex.version>
     </properties>
 
     <dependencyManagement>

mybatis-flex-loveqq-starter/pom.xml

@@ -6,9 +6,10 @@
     <parent>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>parent</artifactId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
 
+    <name>mybatis-flex-loveqq-starter</name>
     <artifactId>mybatis-flex-loveqq-starter</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-processor/pom.xml

@@ -5,13 +5,14 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-processor</name>
     <artifactId>mybatis-flex-processor</artifactId>
     <packaging>jar</packaging>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 
 
     <properties>
@@ -23,7 +24,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-annotation</artifactId>
-            <version>1.10.9</version>
+            <version>1.11.0</version>
         </dependency>
     </dependencies>
 

mybatis-flex-solon-plugin/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-solon-plugin</name>
     <artifactId>mybatis-flex-solon-plugin</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-spring-boot-starter/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-spring-boot-starter</name>
     <artifactId>mybatis-flex-spring-boot-starter</artifactId>
     <packaging>jar</packaging>
 
@@ -23,7 +24,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring</artifactId>
-            <version>1.10.9</version>
+            <version>1.11.0</version>
         </dependency>
 
         <dependency>
@@ -104,7 +105,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.10.9</version>
+            <version>1.11.0</version>
         </dependency>
 
     </dependencies>

mybatis-flex-spring-boot3-starter/pom.xml

@@ -6,10 +6,12 @@
     <parent>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>parent</artifactId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
 
+    <name>mybatis-flex-spring-boot3-starter</name>
     <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
+    <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -19,7 +21,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-            <version>1.10.9</version>
+            <version>1.11.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.mybatis</groupId>

mybatis-flex-spring/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-spring</name>
     <artifactId>mybatis-flex-spring</artifactId>
     <packaging>jar</packaging>
 
@@ -22,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.10.9</version>
+            <version>1.11.0</version>
         </dependency>
 
         <dependency>

mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml

@@ -6,9 +6,10 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
 
+    <name>mybatis-flex-loveqq-test</name>
     <artifactId>mybatis-flex-loveqq-test</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-test/mybatis-flex-native-test/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-native-test</name>
     <artifactId>mybatis-flex-native-test</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-test/mybatis-flex-seata-test/pom.xml

@@ -4,10 +4,11 @@
 	<parent>
 		<artifactId>mybatis-flex-test</artifactId>
 		<groupId>com.mybatis-flex</groupId>
-		<version>1.10.9</version>
+		<version>1.11.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
+	<name>mybatis-flex-seata-test</name>
 	<artifactId>mybatis-flex-seata-test</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-test/mybatis-flex-solon-test/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-solon-test</name>
     <artifactId>mybatis-flex-solon-test</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-spring-boot-test</name>
     <artifactId>mybatis-flex-spring-boot-test</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-spring-cloud-test</name>
     <artifactId>mybatis-flex-spring-cloud-test</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-test/mybatis-flex-spring-test/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-spring-test</name>
     <artifactId>mybatis-flex-spring-test</artifactId>
     <packaging>jar</packaging>
 

mybatis-flex-test/pom.xml

@@ -5,10 +5,11 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.9</version>
+        <version>1.11.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <name>mybatis-flex-test</name>
     <artifactId>mybatis-flex-test</artifactId>
     <packaging>pom</packaging>
 
@@ -20,7 +21,7 @@
         <module>mybatis-flex-spring-boot-test</module>
         <module>mybatis-flex-spring-cloud-test</module>
 <!--        <module>mybatis-flex-solon-test</module>-->
-        <module>mybatis-flex-loveqq-test</module>
+<!--        <module>mybatis-flex-loveqq-test</module>-->
     </modules>
 
     <properties>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.mybatis-flex</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.10.9</version>
+    <version>1.11.0</version>
 
     <name>mybatis-flex</name>
     <url>https://mybatis-flex.com</url>
@@ -51,6 +51,7 @@
         <module>mybatis-flex-annotation</module>
         <module>mybatis-flex-codegen</module>
         <module>mybatis-flex-core</module>
+        <module>mybatis-flex-dependencies</module>
         <module>mybatis-flex-spring</module>
         <module>mybatis-flex-spring-boot-starter</module>
         <module>mybatis-flex-spring-boot3-starter</module>
@@ -64,7 +65,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
 
-        <mybatis-flex.version>1.10.9</mybatis-flex.version>
+        <mybatis-flex.version>1.11.0</mybatis-flex.version>
 
         <mybatis.version>3.5.19</mybatis.version>
         <mybatis-spring.version>2.1.2</mybatis-spring.version>
@@ -325,6 +326,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
                 </configuration>
             </plugin>