From da5443fed0851cfb7eee7dcd24ade8b00469d1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E6=96=87=E5=87=AF?= Date: Fri, 8 Nov 2019 10:15:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/{ => com/wugui}/database/ColumnInfo.java | 2 +- .../src/main/java/{ => com/wugui}/database/DasColumn.java | 2 +- .../src/main/java/{ => com/wugui}/database/TableInfo.java | 2 +- datax-web/db/datax_web.sql | 4 ++-- .../main/java/com/wugui/tool/meta/DatabaseInterface.java | 2 +- .../src/main/java/com/wugui/tool/query/BaseQueryTool.java | 6 +++--- .../main/java/com/wugui/tool/query/QueryToolInterface.java | 4 ++-- datax-web/src/main/java/com/wugui/tool/util/DasUtil.java | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename datax-common/src/main/java/{ => com/wugui}/database/ColumnInfo.java (93%) rename datax-common/src/main/java/{ => com/wugui}/database/DasColumn.java (93%) rename datax-common/src/main/java/{ => com/wugui}/database/TableInfo.java (92%) diff --git a/datax-common/src/main/java/database/ColumnInfo.java b/datax-common/src/main/java/com/wugui/database/ColumnInfo.java similarity index 93% rename from datax-common/src/main/java/database/ColumnInfo.java rename to datax-common/src/main/java/com/wugui/database/ColumnInfo.java index d54cfc24..02803b17 100644 --- a/datax-common/src/main/java/database/ColumnInfo.java +++ b/datax-common/src/main/java/com/wugui/database/ColumnInfo.java @@ -1,4 +1,4 @@ -package database; +package com.wugui.database; import lombok.Data; diff --git a/datax-common/src/main/java/database/DasColumn.java b/datax-common/src/main/java/com/wugui/database/DasColumn.java similarity index 93% rename from datax-common/src/main/java/database/DasColumn.java rename to datax-common/src/main/java/com/wugui/database/DasColumn.java index 5073027f..2b3abf79 100644 --- a/datax-common/src/main/java/database/DasColumn.java +++ b/datax-common/src/main/java/com/wugui/database/DasColumn.java @@ -1,4 +1,4 @@ -package database; +package com.wugui.database; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/datax-common/src/main/java/database/TableInfo.java b/datax-common/src/main/java/com/wugui/database/TableInfo.java similarity index 92% rename from datax-common/src/main/java/database/TableInfo.java rename to datax-common/src/main/java/com/wugui/database/TableInfo.java index 60790376..83000410 100644 --- a/datax-common/src/main/java/database/TableInfo.java +++ b/datax-common/src/main/java/com/wugui/database/TableInfo.java @@ -1,4 +1,4 @@ -package database; +package com.wugui.database; import lombok.Data; diff --git a/datax-web/db/datax_web.sql b/datax-web/db/datax_web.sql index c1a809d2..88577754 100644 --- a/datax-web/db/datax_web.sql +++ b/datax-web/db/datax_web.sql @@ -66,8 +66,8 @@ CREATE TABLE `job_config` ( -- ---------------------------- INSERT INTO `job_config` VALUES (1, NULL, 'test', 'test', NULL, NULL, NULL, '2019-06-17 21:10:31', 0, NULL, '2019-06-17 21:10:31', NULL); INSERT INTO `job_config` VALUES (2, NULL, 'testt', 'test', '{\n \"abc\": \"def\"\n}', NULL, NULL, '2019-06-17 22:22:03', 0, NULL, '2019-06-17 21:14:30', NULL); -INSERT INTO `job_config` VALUES (3, NULL, '示例', 'test', '{\n \"job\": {\n \"setting\": {\n \"speed\": {\n \"channel\": 3\n },\n \"errorLimit\": {\n \"record\": 0,\n \"percentage\": 0.02\n }\n },\n \"content\": [\n {\n \"reader\": {\n \"name\": \"mysqlreader\",\n \"parameter\": {\n \"username\": \"root\",\n \"password\": \"root\",\n \"column\": [\n \"id\",\n \"name\"\n ],\n \"splitPk\": \"db_id\",\n \"connection\": [\n {\n \"table\": [\n \"table\"\n ],\n \"jdbcUrl\": [\n \"jdbc:mysql://127.0.0.1:3306/database\"\n ]\n }\n ]\n }\n },\n \"writer\": {\n \"name\": \"streamwriter\",\n \"parameter\": {\n \"print\": true\n }\n }\n }\n ]\n }\n}', NULL, NULL, '2019-06-17 22:28:21', 1, NULL, '2019-06-17 22:05:31', NULL); -INSERT INTO `job_config` VALUES (4, NULL, 'test', '123', '{\n \"job\": {\n \"setting\": {\n \"speed\": {\n \"channel\": 3\n },\n \"errorLimit\": {\n \"record\": 0,\n \"percentage\": 0.02\n }\n },\n \"content\": [\n {\n \"reader\": {\n \"name\": \"mysqlreader\",\n \"parameter\": {\n \"username\": \"root\",\n \"password\": \"root\",\n \"column\": [\n \"id\",\n \"name\"\n ],\n \"splitPk\": \"db_id\",\n \"connection\": [\n {\n \"table\": [\n \"table\"\n ],\n \"jdbcUrl\": [\n \"jdbc:mysql://127.0.0.1:3306/database\"\n ]\n }\n ]\n }\n },\n \"writer\": {\n \"name\": \"streamwriter\",\n \"parameter\": {\n \"print\": true\n }\n }\n }\n ]\n }\n}', NULL, NULL, '2019-06-17 22:28:31', 1, NULL, '2019-06-17 22:28:31', NULL); +INSERT INTO `job_config` VALUES (3, NULL, '示例', 'test', '{\n \"job\": {\n \"setting\": {\n \"speed\": {\n \"channel\": 3\n },\n \"errorLimit\": {\n \"record\": 0,\n \"percentage\": 0.02\n }\n },\n \"content\": [\n {\n \"reader\": {\n \"name\": \"mysqlreader\",\n \"parameter\": {\n \"username\": \"root\",\n \"password\": \"root\",\n \"column\": [\n \"id\",\n \"name\"\n ],\n \"splitPk\": \"db_id\",\n \"connection\": [\n {\n \"table\": [\n \"table\"\n ],\n \"jdbcUrl\": [\n \"jdbc:mysql://127.0.0.1:3306/com.wugui.database\"\n ]\n }\n ]\n }\n },\n \"writer\": {\n \"name\": \"streamwriter\",\n \"parameter\": {\n \"print\": true\n }\n }\n }\n ]\n }\n}', NULL, NULL, '2019-06-17 22:28:21', 1, NULL, '2019-06-17 22:05:31', NULL); +INSERT INTO `job_config` VALUES (4, NULL, 'test', '123', '{\n \"job\": {\n \"setting\": {\n \"speed\": {\n \"channel\": 3\n },\n \"errorLimit\": {\n \"record\": 0,\n \"percentage\": 0.02\n }\n },\n \"content\": [\n {\n \"reader\": {\n \"name\": \"mysqlreader\",\n \"parameter\": {\n \"username\": \"root\",\n \"password\": \"root\",\n \"column\": [\n \"id\",\n \"name\"\n ],\n \"splitPk\": \"db_id\",\n \"connection\": [\n {\n \"table\": [\n \"table\"\n ],\n \"jdbcUrl\": [\n \"jdbc:mysql://127.0.0.1:3306/com.wugui.database\"\n ]\n }\n ]\n }\n },\n \"writer\": {\n \"name\": \"streamwriter\",\n \"parameter\": {\n \"print\": true\n }\n }\n }\n ]\n }\n}', NULL, NULL, '2019-06-17 22:28:31', 1, NULL, '2019-06-17 22:28:31', NULL); INSERT INTO `job_config` VALUES (5, NULL, NULL, NULL, '{}', NULL, NULL, '2019-06-25 10:28:51', 1, NULL, '2019-06-25 10:28:51', NULL); INSERT INTO `job_config` VALUES (6, NULL, NULL, NULL, '{}', NULL, NULL, '2019-06-25 10:47:59', 1, NULL, '2019-06-25 10:47:59', NULL); diff --git a/datax-web/src/main/java/com/wugui/tool/meta/DatabaseInterface.java b/datax-web/src/main/java/com/wugui/tool/meta/DatabaseInterface.java index fd5d80b8..7b929059 100644 --- a/datax-web/src/main/java/com/wugui/tool/meta/DatabaseInterface.java +++ b/datax-web/src/main/java/com/wugui/tool/meta/DatabaseInterface.java @@ -3,7 +3,7 @@ package com.wugui.tool.meta; public interface DatabaseInterface { /** - * Returns the minimal SQL to launch in order to determine the layout of the resultset for a given database table + * Returns the minimal SQL to launch in order to determine the layout of the resultset for a given com.wugui.database table * * @param tableName The name of the table to determine the layout for * @return The SQL to launch. diff --git a/datax-web/src/main/java/com/wugui/tool/query/BaseQueryTool.java b/datax-web/src/main/java/com/wugui/tool/query/BaseQueryTool.java index c454d3cf..ebcebdf8 100644 --- a/datax-web/src/main/java/com/wugui/tool/query/BaseQueryTool.java +++ b/datax-web/src/main/java/com/wugui/tool/query/BaseQueryTool.java @@ -8,9 +8,9 @@ import com.wugui.dataxweb.entity.JobJdbcDatasource; import com.wugui.tool.meta.DatabaseInterface; import com.wugui.tool.meta.DatabaseMetaFactory; import com.zaxxer.hikari.HikariDataSource; -import database.ColumnInfo; -import database.DasColumn; -import database.TableInfo; +import com.wugui.database.ColumnInfo; +import com.wugui.database.DasColumn; +import com.wugui.database.TableInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/datax-web/src/main/java/com/wugui/tool/query/QueryToolInterface.java b/datax-web/src/main/java/com/wugui/tool/query/QueryToolInterface.java index e9a8f06c..a32a7c44 100644 --- a/datax-web/src/main/java/com/wugui/tool/query/QueryToolInterface.java +++ b/datax-web/src/main/java/com/wugui/tool/query/QueryToolInterface.java @@ -1,7 +1,7 @@ package com.wugui.tool.query; -import database.ColumnInfo; -import database.TableInfo; +import com.wugui.database.ColumnInfo; +import com.wugui.database.TableInfo; import java.util.List; import java.util.Map; diff --git a/datax-web/src/main/java/com/wugui/tool/util/DasUtil.java b/datax-web/src/main/java/com/wugui/tool/util/DasUtil.java index f68fbd51..71649a81 100644 --- a/datax-web/src/main/java/com/wugui/tool/util/DasUtil.java +++ b/datax-web/src/main/java/com/wugui/tool/util/DasUtil.java @@ -3,7 +3,7 @@ package com.wugui.tool.util; import com.wugui.dataxweb.entity.JobJdbcDatasource; import com.wugui.tool.query.BaseQueryTool; import com.wugui.tool.query.QueryToolFactory; -import database.TableInfo; +import com.wugui.database.TableInfo; import lombok.extern.slf4j.Slf4j; /**