From e5b2fba2835fa7905316f15d532f55c5f06e48af Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Sat, 13 Jul 2024 13:54:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=AD=A3=E5=BC=8F=E7=89=88=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fluent-sql-annotations/pom.xml                   |  6 +++---
 fluent-sql-core/pom.xml                          |  6 +++---
 .../java/group/flyfish/fluent/chain/SQLImpl.java |  2 +-
 .../chain/execution/ReactiveBoundEntitySpec.java |  2 +-
 .../operations/ReactiveFluentSQLOperations.java  |  3 +--
 fluent-sql-spring-boot-starter/pom.xml           |  6 +++---
 fluent-sql-spring/pom.xml                        |  7 +++----
 .../operations/R2dbcFluentSQLOperations.java     |  2 +-
 pom.xml                                          | 16 +++++++++++-----
 9 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/fluent-sql-annotations/pom.xml b/fluent-sql-annotations/pom.xml
index d8069b0..ace661d 100644
--- a/fluent-sql-annotations/pom.xml
+++ b/fluent-sql-annotations/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>fluent-sql</artifactId>
         <groupId>group.flyfish.framework</groupId>
-        <version>0.1.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>fluent-sql-annotations</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 </project>
diff --git a/fluent-sql-core/pom.xml b/fluent-sql-core/pom.xml
index df59a2f..f62a65d 100644
--- a/fluent-sql-core/pom.xml
+++ b/fluent-sql-core/pom.xml
@@ -5,15 +5,15 @@
     <parent>
         <artifactId>fluent-sql</artifactId>
         <groupId>group.flyfish.framework</groupId>
-        <version>0.1.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>fluent-sql-core</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/fluent-sql-core/src/main/java/group/flyfish/fluent/chain/SQLImpl.java b/fluent-sql-core/src/main/java/group/flyfish/fluent/chain/SQLImpl.java
index b632ae1..fcc4894 100644
--- a/fluent-sql-core/src/main/java/group/flyfish/fluent/chain/SQLImpl.java
+++ b/fluent-sql-core/src/main/java/group/flyfish/fluent/chain/SQLImpl.java
@@ -369,7 +369,7 @@ final class SQLImpl extends ConcatSegment<SQLImpl> implements SQLOperations, Pre
         }
 
         @Override
-        public Mono<Integer> execute() {
+        public Mono<Long> execute() {
             return SHARED_REACTIVE_OPERATIONS.execute(entity);
         }
     }
diff --git a/fluent-sql-core/src/main/java/group/flyfish/fluent/chain/execution/ReactiveBoundEntitySpec.java b/fluent-sql-core/src/main/java/group/flyfish/fluent/chain/execution/ReactiveBoundEntitySpec.java
index 075be2d..192ab76 100644
--- a/fluent-sql-core/src/main/java/group/flyfish/fluent/chain/execution/ReactiveBoundEntitySpec.java
+++ b/fluent-sql-core/src/main/java/group/flyfish/fluent/chain/execution/ReactiveBoundEntitySpec.java
@@ -44,5 +44,5 @@ public interface ReactiveBoundEntitySpec<T> {
      *
      * @return 更新行数
      */
-    Mono<Integer> execute();
+    Mono<Long> execute();
 }
diff --git a/fluent-sql-core/src/main/java/group/flyfish/fluent/operations/ReactiveFluentSQLOperations.java b/fluent-sql-core/src/main/java/group/flyfish/fluent/operations/ReactiveFluentSQLOperations.java
index a42c94f..9f8ebf2 100644
--- a/fluent-sql-core/src/main/java/group/flyfish/fluent/operations/ReactiveFluentSQLOperations.java
+++ b/fluent-sql-core/src/main/java/group/flyfish/fluent/operations/ReactiveFluentSQLOperations.java
@@ -2,7 +2,6 @@ package group.flyfish.fluent.operations;
 
 import group.flyfish.fluent.entity.BoundSQLEntity;
 import group.flyfish.fluent.entity.DataPage;
-import group.flyfish.fluent.entity.SQLEntity;
 import org.springframework.lang.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -50,5 +49,5 @@ public interface ReactiveFluentSQLOperations {
      * @param entity sql实体
      * @return 更新行数
      */
-    <T> Mono<Integer> execute(BoundSQLEntity<T> entity);
+    <T> Mono<Long> execute(BoundSQLEntity<T> entity);
 }
diff --git a/fluent-sql-spring-boot-starter/pom.xml b/fluent-sql-spring-boot-starter/pom.xml
index cc78f47..b5a9c93 100644
--- a/fluent-sql-spring-boot-starter/pom.xml
+++ b/fluent-sql-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fluent-sql</artifactId>
         <groupId>group.flyfish.framework</groupId>
-        <version>0.1.0</version>
+        <version>1.0.0</version>
     </parent>
     <description>spring boot 快速集成组件</description>
     <modelVersion>4.0.0</modelVersion>
@@ -13,8 +13,8 @@
     <artifactId>fluent-sql-spring-boot-starter</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/fluent-sql-spring/pom.xml b/fluent-sql-spring/pom.xml
index 1d9632a..c281206 100644
--- a/fluent-sql-spring/pom.xml
+++ b/fluent-sql-spring/pom.xml
@@ -5,15 +5,15 @@
     <parent>
         <artifactId>fluent-sql</artifactId>
         <groupId>group.flyfish.framework</groupId>
-        <version>0.1.0</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>fluent-sql-spring</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>io.asyncer</groupId>
             <artifactId>r2dbc-mysql</artifactId>
-            <version>0.9.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/fluent-sql-spring/src/main/java/group/flyfish/fluent/operations/R2dbcFluentSQLOperations.java b/fluent-sql-spring/src/main/java/group/flyfish/fluent/operations/R2dbcFluentSQLOperations.java
index b27ef08..9916cc0 100644
--- a/fluent-sql-spring/src/main/java/group/flyfish/fluent/operations/R2dbcFluentSQLOperations.java
+++ b/fluent-sql-spring/src/main/java/group/flyfish/fluent/operations/R2dbcFluentSQLOperations.java
@@ -61,7 +61,7 @@ public class R2dbcFluentSQLOperations implements ReactiveFluentSQLOperations {
      * @return 更新行数
      */
     @Override
-    public <T> Mono<Integer> execute(BoundSQLEntity<T> entity) {
+    public <T> Mono<Long> execute(BoundSQLEntity<T> entity) {
         return resolve(entity).fetch().rowsUpdated();
     }
 
diff --git a/pom.xml b/pom.xml
index 5230e4d..4bd8cac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>group.flyfish.framework</groupId>
     <artifactId>fluent-sql</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.0</version>
+    <version>1.0.0</version>
 
     <name>fluent-sql</name>
     <description>A very fast sql generation engine using fluent-style api. Help you start your work without mybatis！</description>
@@ -35,12 +35,12 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <lombok.version>1.18.24</lombok.version>
         <jackson.version>2.17.2</jackson.version>
-        <spring-boot.version>2.7.18</spring-boot.version>
-        <spring.version>5.3.22</spring.version>
+        <spring-boot.version>3.3.1</spring-boot.version>
+        <spring.version>6.1.10</spring.version>
     </properties>
 
     <!-- 开发人员信息 -->
@@ -158,6 +158,12 @@
                 <version>8.0.29</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>io.asyncer</groupId>
+                <artifactId>r2dbc-mysql</artifactId>
+                <version>1.1.3</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>io.projectreactor</groupId>
                 <artifactId>reactor-core</artifactId>