From 0a1e08d98c80a8c7bee3059f827fec15adff6f56 Mon Sep 17 00:00:00 2001
From: zhzhenqin <zhzhenqin@163.com>
Date: Fri, 7 Jan 2022 11:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=A1=B9=E7=9B=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=90=A7=20data-providers?=
 =?UTF-8?q?=20=E4=BD=9C=E4=B8=BA=20pom=20module=20=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-providers/datart-data-provider/pom.xml   | 68 +++++++++++++++++++
 .../src/main}/codegen/Parser.jj               |  0
 .../data/provider/DefaultDataProvider.java    |  0
 .../datart/data/provider/ProviderManager.java |  0
 .../provider/base/DataProviderException.java  |  0
 .../calcite/DatartStdSqlFunction.java         |  0
 .../data/provider/calcite/SqlBuilder.java     |  0
 .../data/provider/calcite/SqlFragment.java    |  0
 .../calcite/SqlFunctionRegisterVisitor.java   |  0
 .../data/provider/calcite/SqlNodeUtils.java   |  0
 .../data/provider/calcite/SqlParserUtils.java |  0
 .../provider/calcite/SqlValidateUtils.java    |  0
 .../provider/calcite/SqlVariableVisitor.java  |  0
 .../custom/CustomSqlBetweenOperator.java      |  0
 .../custom/SqlSimpleStringLiteral.java        |  0
 .../dialect/ClickHouseSqlDialectSupport.java  |  0
 .../calcite/dialect/CustomSqlDialect.java     |  0
 .../dialect/FetchAndOffsetSupport.java        |  0
 .../provider/calcite/dialect/H2Dialect.java   |  0
 .../dialect/ImpalaSqlDialectSupport.java      |  0
 .../dialect/MsSqlStdOperatorSupport.java      |  0
 .../dialect/MysqlSqlStdOperatorSupport.java   |  0
 .../dialect/OracleSqlStdOperatorSupport.java  |  0
 .../dialect/SqlStdOperatorSupport.java        |  0
 .../freemarker/FreemarkerContext.java         |  0
 .../freemarker/StringTemplateLoader.java      |  0
 .../data/provider/jdbc/DataTypeUtils.java     |  0
 .../jdbc/FalseVariablePlaceholder.java        |  0
 .../data/provider/jdbc/JdbcDriverInfo.java    |  0
 .../data/provider/jdbc/JdbcProperties.java    |  0
 .../jdbc/PermissionVariablePlaceholder.java   |  0
 .../jdbc/QueryVariablePlaceholder.java        |  0
 .../data/provider/jdbc/ResultSetMapper.java   |  0
 .../data/provider/jdbc/SqlScriptRender.java   |  0
 .../data/provider/jdbc/SqlSplitter.java       |  0
 .../jdbc/TrueVariablePlaceholder.java         |  0
 .../datart/data/provider/local/LocalDB.java   |  0
 .../DataProviderExecuteOptimizer.java         |  0
 .../provider/optimize/DefaultLockFactory.java |  0
 .../data/provider/script/ReplacementPair.java |  0
 .../data/provider/script/ScriptRender.java    |  0
 .../provider/script/VariablePlaceholder.java  |  0
 data-providers/file-data-provider/pom.xml     |  3 +-
 data-providers/http-data-provider/pom.xml     |  3 +-
 data-providers/jdbc-data-provider/pom.xml     |  3 +-
 data-providers/pom.xml                        | 55 +++++----------
 pom.xml                                       | 27 +++++++-
 47 files changed, 112 insertions(+), 47 deletions(-)
 create mode 100644 data-providers/datart-data-provider/pom.xml
 rename data-providers/{src/main/java => datart-data-provider/src/main}/codegen/Parser.jj (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/DefaultDataProvider.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/ProviderManager.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/base/DataProviderException.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/DatartStdSqlFunction.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/SqlBuilder.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/SqlFragment.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/SqlFunctionRegisterVisitor.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/SqlNodeUtils.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/SqlParserUtils.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/SqlValidateUtils.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/SqlVariableVisitor.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/custom/CustomSqlBetweenOperator.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/custom/SqlSimpleStringLiteral.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/ClickHouseSqlDialectSupport.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/CustomSqlDialect.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/FetchAndOffsetSupport.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/H2Dialect.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/ImpalaSqlDialectSupport.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/MsSqlStdOperatorSupport.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/MysqlSqlStdOperatorSupport.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/OracleSqlStdOperatorSupport.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/calcite/dialect/SqlStdOperatorSupport.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/freemarker/FreemarkerContext.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/freemarker/StringTemplateLoader.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/DataTypeUtils.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/FalseVariablePlaceholder.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/JdbcDriverInfo.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/JdbcProperties.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/PermissionVariablePlaceholder.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/QueryVariablePlaceholder.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/ResultSetMapper.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/SqlScriptRender.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/SqlSplitter.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/jdbc/TrueVariablePlaceholder.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/local/LocalDB.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/optimize/DataProviderExecuteOptimizer.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/optimize/DefaultLockFactory.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/script/ReplacementPair.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/script/ScriptRender.java (100%)
 rename data-providers/{ => datart-data-provider}/src/main/java/datart/data/provider/script/VariablePlaceholder.java (100%)

diff --git a/data-providers/datart-data-provider/pom.xml b/data-providers/datart-data-provider/pom.xml
new file mode 100644
index 00000000..373ffb26
--- /dev/null
+++ b/data-providers/datart-data-provider/pom.xml
@@ -0,0 +1,68 @@
+<?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>data-providers</artifactId>
+        <groupId>datart</groupId>
+        <version>1.0.0-beta.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>datart-data-provider</artifactId>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.calcite</groupId>
+            <artifactId>calcite-core</artifactId>
+            <version>1.26.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>datart</groupId>
+            <artifactId>datart-core</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mybatis-spring-boot-starter</artifactId>
+                    <groupId>org.mybatis.spring.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- This must be run AFTER the fmpp-maven-plugin -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>javacc-maven-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <id>javacc</id>
+                        <goals>
+                            <goal>javacc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <sourceDirectory>src/main/codegen/</sourceDirectory>
+                    <outputDirectory>${project.build.directory}/generated-sources/javacc</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/data-providers/src/main/java/codegen/Parser.jj b/data-providers/datart-data-provider/src/main/codegen/Parser.jj
similarity index 100%
rename from data-providers/src/main/java/codegen/Parser.jj
rename to data-providers/datart-data-provider/src/main/codegen/Parser.jj
diff --git a/data-providers/src/main/java/datart/data/provider/DefaultDataProvider.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/DefaultDataProvider.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/DefaultDataProvider.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/DefaultDataProvider.java
diff --git a/data-providers/src/main/java/datart/data/provider/ProviderManager.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/ProviderManager.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/ProviderManager.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/ProviderManager.java
diff --git a/data-providers/src/main/java/datart/data/provider/base/DataProviderException.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/base/DataProviderException.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/base/DataProviderException.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/base/DataProviderException.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/DatartStdSqlFunction.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/DatartStdSqlFunction.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/DatartStdSqlFunction.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/DatartStdSqlFunction.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/SqlBuilder.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlBuilder.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/SqlBuilder.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlBuilder.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/SqlFragment.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlFragment.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/SqlFragment.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlFragment.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/SqlFunctionRegisterVisitor.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlFunctionRegisterVisitor.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/SqlFunctionRegisterVisitor.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlFunctionRegisterVisitor.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/SqlNodeUtils.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlNodeUtils.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/SqlNodeUtils.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlNodeUtils.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/SqlParserUtils.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlParserUtils.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/SqlParserUtils.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlParserUtils.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/SqlValidateUtils.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlValidateUtils.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/SqlValidateUtils.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlValidateUtils.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/SqlVariableVisitor.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlVariableVisitor.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/SqlVariableVisitor.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/SqlVariableVisitor.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/custom/CustomSqlBetweenOperator.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/custom/CustomSqlBetweenOperator.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/custom/CustomSqlBetweenOperator.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/custom/CustomSqlBetweenOperator.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/custom/SqlSimpleStringLiteral.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/custom/SqlSimpleStringLiteral.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/custom/SqlSimpleStringLiteral.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/custom/SqlSimpleStringLiteral.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/ClickHouseSqlDialectSupport.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/ClickHouseSqlDialectSupport.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/ClickHouseSqlDialectSupport.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/ClickHouseSqlDialectSupport.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/CustomSqlDialect.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/CustomSqlDialect.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/CustomSqlDialect.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/CustomSqlDialect.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/FetchAndOffsetSupport.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/FetchAndOffsetSupport.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/FetchAndOffsetSupport.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/FetchAndOffsetSupport.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/H2Dialect.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/H2Dialect.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/H2Dialect.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/H2Dialect.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/ImpalaSqlDialectSupport.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/ImpalaSqlDialectSupport.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/ImpalaSqlDialectSupport.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/ImpalaSqlDialectSupport.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/MsSqlStdOperatorSupport.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/MsSqlStdOperatorSupport.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/MsSqlStdOperatorSupport.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/MsSqlStdOperatorSupport.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/MysqlSqlStdOperatorSupport.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/MysqlSqlStdOperatorSupport.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/MysqlSqlStdOperatorSupport.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/MysqlSqlStdOperatorSupport.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/OracleSqlStdOperatorSupport.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/OracleSqlStdOperatorSupport.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/OracleSqlStdOperatorSupport.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/OracleSqlStdOperatorSupport.java
diff --git a/data-providers/src/main/java/datart/data/provider/calcite/dialect/SqlStdOperatorSupport.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/SqlStdOperatorSupport.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/calcite/dialect/SqlStdOperatorSupport.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/calcite/dialect/SqlStdOperatorSupport.java
diff --git a/data-providers/src/main/java/datart/data/provider/freemarker/FreemarkerContext.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/freemarker/FreemarkerContext.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/freemarker/FreemarkerContext.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/freemarker/FreemarkerContext.java
diff --git a/data-providers/src/main/java/datart/data/provider/freemarker/StringTemplateLoader.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/freemarker/StringTemplateLoader.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/freemarker/StringTemplateLoader.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/freemarker/StringTemplateLoader.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/DataTypeUtils.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/DataTypeUtils.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/DataTypeUtils.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/DataTypeUtils.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/FalseVariablePlaceholder.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/FalseVariablePlaceholder.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/FalseVariablePlaceholder.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/FalseVariablePlaceholder.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/JdbcDriverInfo.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/JdbcDriverInfo.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/JdbcDriverInfo.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/JdbcDriverInfo.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/JdbcProperties.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/JdbcProperties.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/JdbcProperties.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/JdbcProperties.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/PermissionVariablePlaceholder.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/PermissionVariablePlaceholder.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/PermissionVariablePlaceholder.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/PermissionVariablePlaceholder.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/QueryVariablePlaceholder.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/QueryVariablePlaceholder.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/QueryVariablePlaceholder.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/QueryVariablePlaceholder.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/ResultSetMapper.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/ResultSetMapper.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/ResultSetMapper.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/ResultSetMapper.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/SqlScriptRender.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/SqlScriptRender.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/SqlScriptRender.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/SqlScriptRender.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/SqlSplitter.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/SqlSplitter.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/SqlSplitter.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/SqlSplitter.java
diff --git a/data-providers/src/main/java/datart/data/provider/jdbc/TrueVariablePlaceholder.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/TrueVariablePlaceholder.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/jdbc/TrueVariablePlaceholder.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/jdbc/TrueVariablePlaceholder.java
diff --git a/data-providers/src/main/java/datart/data/provider/local/LocalDB.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/local/LocalDB.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/local/LocalDB.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/local/LocalDB.java
diff --git a/data-providers/src/main/java/datart/data/provider/optimize/DataProviderExecuteOptimizer.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/optimize/DataProviderExecuteOptimizer.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/optimize/DataProviderExecuteOptimizer.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/optimize/DataProviderExecuteOptimizer.java
diff --git a/data-providers/src/main/java/datart/data/provider/optimize/DefaultLockFactory.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/optimize/DefaultLockFactory.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/optimize/DefaultLockFactory.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/optimize/DefaultLockFactory.java
diff --git a/data-providers/src/main/java/datart/data/provider/script/ReplacementPair.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/script/ReplacementPair.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/script/ReplacementPair.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/script/ReplacementPair.java
diff --git a/data-providers/src/main/java/datart/data/provider/script/ScriptRender.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/script/ScriptRender.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/script/ScriptRender.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/script/ScriptRender.java
diff --git a/data-providers/src/main/java/datart/data/provider/script/VariablePlaceholder.java b/data-providers/datart-data-provider/src/main/java/datart/data/provider/script/VariablePlaceholder.java
similarity index 100%
rename from data-providers/src/main/java/datart/data/provider/script/VariablePlaceholder.java
rename to data-providers/datart-data-provider/src/main/java/datart/data/provider/script/VariablePlaceholder.java
diff --git a/data-providers/file-data-provider/pom.xml b/data-providers/file-data-provider/pom.xml
index 18ee2920..977f7967 100644
--- a/data-providers/file-data-provider/pom.xml
+++ b/data-providers/file-data-provider/pom.xml
@@ -3,10 +3,9 @@
          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>datart-parent</artifactId>
+        <artifactId>data-providers</artifactId>
         <groupId>datart</groupId>
         <version>1.0.0-beta.0</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/data-providers/http-data-provider/pom.xml b/data-providers/http-data-provider/pom.xml
index 5a564262..193c8a7d 100644
--- a/data-providers/http-data-provider/pom.xml
+++ b/data-providers/http-data-provider/pom.xml
@@ -3,10 +3,9 @@
          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>datart-parent</artifactId>
+        <artifactId>data-providers</artifactId>
         <groupId>datart</groupId>
         <version>1.0.0-beta.0</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/data-providers/jdbc-data-provider/pom.xml b/data-providers/jdbc-data-provider/pom.xml
index 8e5bdd35..fb0c485d 100644
--- a/data-providers/jdbc-data-provider/pom.xml
+++ b/data-providers/jdbc-data-provider/pom.xml
@@ -3,10 +3,9 @@
          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>datart-parent</artifactId>
+        <artifactId>data-providers</artifactId>
         <groupId>datart</groupId>
         <version>1.0.0-beta.0</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/data-providers/pom.xml b/data-providers/pom.xml
index 950981ee..0b91d7ff 100644
--- a/data-providers/pom.xml
+++ b/data-providers/pom.xml
@@ -9,58 +9,37 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>datart-data-provider</artifactId>
-    <packaging>jar</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
+    <artifactId>data-providers</artifactId>
+    <packaging>pom</packaging>
 
-        <dependency>
-            <groupId>org.apache.calcite</groupId>
-            <artifactId>calcite-core</artifactId>
-            <version>1.26.0</version>
-        </dependency>
+    <modules>
+        <module>datart-data-provider</module>
+        <module>file-data-provider</module>
+        <module>http-data-provider</module>
+        <module>jdbc-data-provider</module>
+    </modules>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>datart</groupId>
-            <artifactId>datart-core</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>mybatis-spring-boot-starter</artifactId>
-                    <groupId>org.mybatis.spring.boot</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+    <dependencies>
 
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <!-- This must be run AFTER the fmpp-maven-plugin -->
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.4</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
-                        <id>javacc</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>javacc</goal>
+                            <goal>jar</goal>
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <sourceDirectory>${basedir}/src/main/java/codegen/</sourceDirectory>
-                    <outputDirectory>${project.build.directory}/generated-sources/javacc</outputDirectory>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index 80540bca..7d288f1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,8 @@
 
     <properties>
         <java.version>1.8</java.version>
+
+        <swagger.version>2.10.5</swagger.version>
         <spring.cloud.version>2020.0.1</spring.cloud.version>
     </properties>
 
@@ -39,9 +41,6 @@
         <module>core</module>
         <module>security</module>
         <module>data-providers</module>
-        <module>data-providers/file-data-provider</module>
-        <module>data-providers/http-data-provider</module>
-        <module>data-providers/jdbc-data-provider</module>
         <module>server</module>
     </modules>
 
@@ -78,9 +77,29 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
                         <parameters>true</parameters>
                     </configuration>
                 </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.2.1</version>
+                    <configuration>
+                        <attach>true</attach>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>compile</phase>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
@@ -88,6 +107,7 @@
                         <generateBackupPoms>false</generateBackupPoms>
                     </configuration>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>
@@ -103,6 +123,7 @@
                                 <directory>${project.basedir}</directory>
                                 <includes>
                                     <include>datart-server-*-install.zip</include>
+                                    <include>datart-server-*-install.tar.gz</include>
                                 </includes>
                             </fileset>
                         </filesets>
-- 
Gitee