From 11cc4fb3eec5d8ec5d07fa4635134f57ac1f3b10 Mon Sep 17 00:00:00 2001
From: Michael Yang <fuhai999@gmail.com>
Date: Thu, 28 Nov 2024 09:52:29 +0800
Subject: [PATCH] build: v1.10.2 release (^.^)YYa!!

---
 .gitee/ISSUE_TEMPLATE/bug.yml                  |  2 +-
 changes.md                                     |  9 +++++++++
 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 +-
 .../java/com/mybatisflex/core/query/If.java    |  7 ++++---
 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-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, 61 insertions(+), 51 deletions(-)

diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml
index 937df35d..07ff3ea7 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.1，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
+                -   label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.10.2，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
                     required: true
     -   type: textarea
         attributes:
diff --git a/changes.md b/changes.md
index da35cb78..6f1d5cf3 100644
--- a/changes.md
+++ b/changes.md
@@ -2,6 +2,15 @@
 
 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
 
+
+## v1.10.2 20241128
+- 优化：删除 DataSource 不必要的类型转换，集成第三方框架时，dataSource 可能为 FlexDataSource 的包装类，从而导致类型转换错误
+- 优化：优化 If.java 添加更多的方法
+- 优化：升级 mybatis 到 3.5.17 最新版本
+- 修复：代码生成器主键定义在父实体类，可能出错的问题
+
+
+
 ## v1.10.1 20241112
 - 修复：代码生成器 在禁用Service接口生成时，serviceImpl去除Service接口
 - 修复：在使用 QueryColumn 的 ge 方法时, 大于等于会实际仅是大于的问题
diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md
index 40ee0068..f1c1aa33 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'),
     <dependency>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        <version>1.10.1</version>
+        <version>1.10.2</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.1</version>
+        <version>1.10.2</version>
     </dependency>
     <dependency>
         <groupId>com.mysql</groupId>
diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md
index 0918d396..c268e242 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.1")
+    implementation("com.mybatis-flex:mybatis-flex-core:1.10.2")
 }
 ```
 
@@ -18,7 +18,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-core:1.10.1'
+    implementation 'com.mybatis-flex:mybatis-flex-core:1.10.2'
 }
 ```
 
@@ -28,7 +28,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-spring:1.10.1")
+    implementation("com.mybatis-flex:mybatis-flex-spring:1.10.2")
 }
 ```
 
@@ -36,7 +36,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.1'
+    implementation 'com.mybatis-flex:mybatis-flex-spring:1.10.2'
 }
 ```
 
@@ -46,7 +46,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.1")
+    implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.2")
 }
 ```
 
@@ -54,7 +54,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.1'
+    implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.10.2'
 }
 ```
 
@@ -70,7 +70,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.1")
+    annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.10.2")
 }
 ```
 
@@ -78,6 +78,6 @@ dependencies {
 
 ```groovy
 dependencies {
-    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.1'
+    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.2'
 }
 ```
diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md
index 21338119..973f2228 100644
--- a/docs/zh/intro/maven.md
+++ b/docs/zh/intro/maven.md
@@ -12,12 +12,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-core</artifactId>
-    <version>1.10.1</version>
+    <version>1.10.2</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.1</version>
+    <version>1.10.2</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -28,12 +28,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-spring</artifactId>
-    <version>1.10.1</version>
+    <version>1.10.2</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.1</version>
+    <version>1.10.2</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.1</version>
+    <version>1.10.2</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.1</version>
+    <version>1.10.2</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.1</version>
+    <version>1.10.2</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.10.1</version>
+    <version>1.10.2</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -88,7 +88,7 @@
             <path>
                 <groupId>com.mybatis-flex</groupId>
                 <artifactId>mybatis-flex-processor</artifactId>
-                <version>1.10.1</version>
+                <version>1.10.2</version>
             </path>
         </annotationProcessorPaths>
     </configuration>
diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md
index 2139bd45..7f56cc89 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.1'
+    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.10.2'
 }
 ```
 
diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml
index 7fae96a1..56435b7f 100644
--- a/mybatis-flex-annotation/pom.xml
+++ b/mybatis-flex-annotation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml
index 57902d28..abc38455 100644
--- a/mybatis-flex-codegen/pom.xml
+++ b/mybatis-flex-codegen/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.10.1</version>
+            <version>1.10.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.mybatis-flex</groupId>
diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml
index 9523b5bd..d5c96d59 100644
--- a/mybatis-flex-core/pom.xml
+++ b/mybatis-flex-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-annotation</artifactId>
-            <version>1.10.1</version>
+            <version>1.10.2</version>
             <scope>compile</scope>
         </dependency>
 
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 1362c326..d446d9e9 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.1";
+    public static final String VERSION = "1.10.2";
 
 
     public static final String SQL = "$$sql";
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/If.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/If.java
index dd091671..e558b44a 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/If.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/If.java
@@ -78,11 +78,12 @@ public class If {
         return !isEmpty(collection);
     }
 
-    /**
-     * 查看某个 string 对象是否有文本内容
-     */
     public static boolean hasText(String string) {
         return StringUtil.hasText(string);
     }
 
+    public static boolean noText(String string) {
+        return StringUtil.noText(string);
+    }
+
 }
diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml
index 5a2a4278..45284e80 100644
--- a/mybatis-flex-dependencies/pom.xml
+++ b/mybatis-flex-dependencies/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-dependencies</artifactId>
-    <version>1.10.1</version>
+    <version>1.10.2</version>
 
     <packaging>pom</packaging>
 
@@ -48,7 +48,7 @@
         </developer>
     </developers>
     <properties>
-        <mybatis-flex.version>1.10.1</mybatis-flex.version>
+        <mybatis-flex.version>1.10.2</mybatis-flex.version>
     </properties>
 
     <dependencyManagement>
diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml
index 77a32b7c..67571432 100644
--- a/mybatis-flex-processor/pom.xml
+++ b/mybatis-flex-processor/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>mybatis-flex-processor</artifactId>
     <packaging>jar</packaging>
-    <version>1.10.1</version>
+    <version>1.10.2</version>
 
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-annotation</artifactId>
-            <version>1.10.1</version>
+            <version>1.10.2</version>
         </dependency>
     </dependencies>
 
diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml
index 4812cc57..c0aeb516 100644
--- a/mybatis-flex-solon-plugin/pom.xml
+++ b/mybatis-flex-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml
index a36ec8fb..c0fa13e5 100644
--- a/mybatis-flex-spring-boot-starter/pom.xml
+++ b/mybatis-flex-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring</artifactId>
-            <version>1.10.1</version>
+            <version>1.10.2</version>
         </dependency>
 
         <dependency>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.10.1</version>
+            <version>1.10.2</version>
         </dependency>
 
     </dependencies>
diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml
index 06c24d8a..7742a9c1 100644
--- a/mybatis-flex-spring-boot3-starter/pom.xml
+++ b/mybatis-flex-spring-boot3-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>parent</artifactId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
 
     <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-            <version>1.10.1</version>
+            <version>1.10.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.mybatis</groupId>
diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml
index ef30dbc5..3cb51cf2 100644
--- a/mybatis-flex-spring/pom.xml
+++ b/mybatis-flex-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.10.1</version>
+            <version>1.10.2</version>
         </dependency>
 
         <dependency>
diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml
index 635e515a..b5662328 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 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml
index be53d5c6..86dd680b 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 @@
 	<parent>
 		<artifactId>mybatis-flex-test</artifactId>
 		<groupId>com.mybatis-flex</groupId>
-		<version>1.10.1</version>
+		<version>1.10.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
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 eb424c52..1ea9d7e7 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 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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 5431ece1..21088789 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 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml
index 0fffd37e..e0257d16 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 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml
index dd5e801c..2755bbd2 100644
--- a/mybatis-flex-test/pom.xml
+++ b/mybatis-flex-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.10.1</version>
+        <version>1.10.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 0e08bdc9..0a7deaf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.mybatis-flex</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.10.1</version>
+    <version>1.10.2</version>
 
     <name>mybatis-flex</name>
     <url>https://mybatis-flex.com</url>
@@ -63,7 +63,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
 
-        <mybatis-flex.version>1.10.1</mybatis-flex.version>
+        <mybatis-flex.version>1.10.2</mybatis-flex.version>
 
         <mybatis.version>3.5.17</mybatis.version>
         <mybatis-spring.version>2.1.2</mybatis-spring.version>