From dedbd62d8f669118205751a6ff446fc51624e2ef Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Wed, 7 Sep 2022 14:04:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A70.0.2=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fluent-sql-annotations/pom.xml                 | 18 ++++++++++++++++++
 .../group/flyfish/fluent/binding/Alias.java    |  0
 .../flyfish/fluent/binding/JSONInject.java     |  0
 fluent-sql-core/pom.xml                        |  4 ++++
 .../pom.xml                                    |  2 +-
 .../fluent/mapping/SQLMappedRowMapper.java     |  0
 .../JdbcTemplateFluentSQLOperations.java       |  0
 .../flyfish/framework/FluentJdbcTest.java      |  0
 .../group/flyfish/framework/entity/Po.java     |  0
 .../flyfish/framework/entity/Property.java     |  0
 .../flyfish/framework/entity/SaasOrder.java    |  0
 .../flyfish/framework/entity/SaasPlan.java     |  0
 .../flyfish/framework/entity/SaasQuota.java    |  0
 .../flyfish/framework/entity/SaasTenant.java   |  0
 .../flyfish/framework/vo/TenantContext.java    |  0
 pom.xml                                        |  8 +++++++-
 16 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 fluent-sql-annotations/pom.xml
 rename {fluent-sql-core => fluent-sql-annotations}/src/main/java/group/flyfish/fluent/binding/Alias.java (100%)
 rename {fluent-sql-core => fluent-sql-annotations}/src/main/java/group/flyfish/fluent/binding/JSONInject.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/pom.xml (96%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/main/java/group/flyfish/fluent/mapping/SQLMappedRowMapper.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/main/java/group/flyfish/fluent/operations/JdbcTemplateFluentSQLOperations.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/test/java/group/flyfish/framework/FluentJdbcTest.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/test/java/group/flyfish/framework/entity/Po.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/test/java/group/flyfish/framework/entity/Property.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/test/java/group/flyfish/framework/entity/SaasOrder.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/test/java/group/flyfish/framework/entity/SaasPlan.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/test/java/group/flyfish/framework/entity/SaasQuota.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/test/java/group/flyfish/framework/entity/SaasTenant.java (100%)
 rename {fluent-sql-jdbctemplate => fluent-sql-spring-jdbc}/src/test/java/group/flyfish/framework/vo/TenantContext.java (100%)

diff --git a/fluent-sql-annotations/pom.xml b/fluent-sql-annotations/pom.xml
new file mode 100644
index 0000000..0664523
--- /dev/null
+++ b/fluent-sql-annotations/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>fluent-sql</artifactId>
+        <groupId>group.flyfish.framework</groupId>
+        <version>0.0.1</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>
+    </properties>
+</project>
diff --git a/fluent-sql-core/src/main/java/group/flyfish/fluent/binding/Alias.java b/fluent-sql-annotations/src/main/java/group/flyfish/fluent/binding/Alias.java
similarity index 100%
rename from fluent-sql-core/src/main/java/group/flyfish/fluent/binding/Alias.java
rename to fluent-sql-annotations/src/main/java/group/flyfish/fluent/binding/Alias.java
diff --git a/fluent-sql-core/src/main/java/group/flyfish/fluent/binding/JSONInject.java b/fluent-sql-annotations/src/main/java/group/flyfish/fluent/binding/JSONInject.java
similarity index 100%
rename from fluent-sql-core/src/main/java/group/flyfish/fluent/binding/JSONInject.java
rename to fluent-sql-annotations/src/main/java/group/flyfish/fluent/binding/JSONInject.java
diff --git a/fluent-sql-core/pom.xml b/fluent-sql-core/pom.xml
index 7d7dfb2..296ab95 100644
--- a/fluent-sql-core/pom.xml
+++ b/fluent-sql-core/pom.xml
@@ -17,6 +17,10 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>group.flyfish.framework</groupId>
+            <artifactId>fluent-sql-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/fluent-sql-jdbctemplate/pom.xml b/fluent-sql-spring-jdbc/pom.xml
similarity index 96%
rename from fluent-sql-jdbctemplate/pom.xml
rename to fluent-sql-spring-jdbc/pom.xml
index 2de158a..dd27b33 100644
--- a/fluent-sql-jdbctemplate/pom.xml
+++ b/fluent-sql-spring-jdbc/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>fluent-sql-jdbctemplate</artifactId>
+    <artifactId>fluent-sql-spring-jdbc</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/fluent-sql-jdbctemplate/src/main/java/group/flyfish/fluent/mapping/SQLMappedRowMapper.java b/fluent-sql-spring-jdbc/src/main/java/group/flyfish/fluent/mapping/SQLMappedRowMapper.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/main/java/group/flyfish/fluent/mapping/SQLMappedRowMapper.java
rename to fluent-sql-spring-jdbc/src/main/java/group/flyfish/fluent/mapping/SQLMappedRowMapper.java
diff --git a/fluent-sql-jdbctemplate/src/main/java/group/flyfish/fluent/operations/JdbcTemplateFluentSQLOperations.java b/fluent-sql-spring-jdbc/src/main/java/group/flyfish/fluent/operations/JdbcTemplateFluentSQLOperations.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/main/java/group/flyfish/fluent/operations/JdbcTemplateFluentSQLOperations.java
rename to fluent-sql-spring-jdbc/src/main/java/group/flyfish/fluent/operations/JdbcTemplateFluentSQLOperations.java
diff --git a/fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/FluentJdbcTest.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/FluentJdbcTest.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/FluentJdbcTest.java
rename to fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/FluentJdbcTest.java
diff --git a/fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/Po.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/Po.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/Po.java
rename to fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/Po.java
diff --git a/fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/Property.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/Property.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/Property.java
rename to fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/Property.java
diff --git a/fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/SaasOrder.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/SaasOrder.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/SaasOrder.java
rename to fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/SaasOrder.java
diff --git a/fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/SaasPlan.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/SaasPlan.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/SaasPlan.java
rename to fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/SaasPlan.java
diff --git a/fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/SaasQuota.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/SaasQuota.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/SaasQuota.java
rename to fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/SaasQuota.java
diff --git a/fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/SaasTenant.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/SaasTenant.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/entity/SaasTenant.java
rename to fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/entity/SaasTenant.java
diff --git a/fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/vo/TenantContext.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/vo/TenantContext.java
similarity index 100%
rename from fluent-sql-jdbctemplate/src/test/java/group/flyfish/framework/vo/TenantContext.java
rename to fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/vo/TenantContext.java
diff --git a/pom.xml b/pom.xml
index acfeec6..256aec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,8 @@
 
     <modules>
         <module>fluent-sql-core</module>
-        <module>fluent-sql-jdbctemplate</module>
+        <module>fluent-sql-spring-jdbc</module>
+        <module>fluent-sql-annotations</module>
     </modules>
 
     <properties>
@@ -78,6 +79,11 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>group.flyfish.framework</groupId>
+                <artifactId>fluent-sql-annotations</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>group.flyfish.framework</groupId>
                 <artifactId>fluent-sql-core</artifactId>