Skip to content

Commit

Permalink
Merge pull request #306 from WeBankFinTech/dev-1.0.0
Browse files Browse the repository at this point in the history
LGTM.
  • Loading branch information
FinalTarget authored Jun 21, 2022
2 parents b5cf18d + 9e04ddd commit 6a0ea1f
Show file tree
Hide file tree
Showing 110 changed files with 959 additions and 3,682 deletions.
2 changes: 1 addition & 1 deletion assembly-package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>exchangis</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>assembly-package</artifactId>
Expand Down
17 changes: 7 additions & 10 deletions db/exchangis_ddl.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- exchangis_v4.exchangis_job_ds_bind definition

DROP TABLE IF EXISTS `exchangis_job_ds_bind`;
CREATE TABLE `exchangis_job_ds_bind` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`job_id` bigint(20) NOT NULL,
Expand All @@ -11,7 +11,7 @@ CREATE TABLE `exchangis_job_ds_bind` (


-- exchangis_v4.exchangis_job_entity definition

DROP TABLE IF EXISTS `exchangis_job_entity`;
CREATE TABLE `exchangis_job_entity` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`name` varchar(100) NOT NULL,
Expand All @@ -33,7 +33,7 @@ CREATE TABLE `exchangis_job_entity` (


-- exchangis_v4.exchangis_job_param_config definition

DROP TABLE IF EXISTS `exchangis_job_param_config`;
CREATE TABLE `exchangis_job_param_config` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`config_key` varchar(64) NOT NULL,
Expand Down Expand Up @@ -63,7 +63,7 @@ CREATE TABLE `exchangis_job_param_config` (
) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8;

-- exchangis_v4.exchangis_project_info definition

DROP TABLE IF EXISTS `exchangis_project_info`;
CREATE TABLE `exchangis_project_info` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`name` varchar(64) NOT NULL,
Expand All @@ -81,11 +81,8 @@ CREATE TABLE `exchangis_project_info` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1497870871035973934 DEFAULT CHARSET=utf8;

-- exchangis_v4.exchangis_job_entity definition


-- exchangis_v4.exchangis_launchable_task definition

DROP TABLE IF EXISTS `exchangis_launchable_task`;
CREATE TABLE `exchangis_launchable_task` (
`id` bigint(13) NOT NULL,
`name` varchar(100) NOT NULL,
Expand All @@ -103,7 +100,7 @@ CREATE TABLE `exchangis_launchable_task` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- exchangis_v4.exchangis_launched_job_entity definition

DROP TABLE IF EXISTS `exchangis_launched_job_entity`;
CREATE TABLE `exchangis_launched_job_entity` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`name` varchar(100) NOT NULL,
Expand All @@ -127,7 +124,7 @@ CREATE TABLE `exchangis_launched_job_entity` (
) ENGINE=InnoDB AUTO_INCREMENT=8380 DEFAULT CHARSET=utf8;

-- exchangis_v4.exchangis_launched_task_entity definition

DROP TABLE IF EXISTS `exchangis_launched_task_entity`;
CREATE TABLE `exchangis_launched_task_entity` (
`id` bigint(20) NOT NULL,
`name` varchar(100) NOT NULL,
Expand Down
2 changes: 1 addition & 1 deletion exchangis-dao/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions exchangis-datasource/exchangis-datasource-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-dao</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>


Expand Down
4 changes: 2 additions & 2 deletions exchangis-datasource/exchangis-datasource-linkis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-core</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions exchangis-datasource/exchangis-datasource-loader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-core</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions exchangis-datasource/exchangis-datasource-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,13 +20,13 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-service</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>

<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-loader</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>

</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions exchangis-datasource/exchangis-datasource-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -21,14 +21,14 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-linkis</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>

<!--Job common module-->
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-job-common</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions exchangis-datasource/exchangis-datasource-streamis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-core</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>

</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -22,17 +22,17 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-dao</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-linkis</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-dao</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -21,17 +21,17 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-dao</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-linkis</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-core</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-datasource</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -21,17 +21,17 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-dao</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-linkis</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-core</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions exchangis-datasource/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<artifactId>exchangis</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>exchangis-datasource</artifactId>
<packaging>pom</packaging>
<version>1.0.0-RC1</version>
<version>1.0.0</version>

<modules>
<module>exchangis-datasource-core</module>
Expand Down
6 changes: 3 additions & 3 deletions exchangis-job/exchangis-job-builder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-job</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-job-common</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-datasource-service</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions exchangis-job/exchangis-job-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-job</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-dao</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
Expand Down
6 changes: 3 additions & 3 deletions exchangis-job/exchangis-job-launcher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-job</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,12 +15,12 @@
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-job-common</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<artifactId>exchangis-job-builder</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
Expand Down
2 changes: 1 addition & 1 deletion exchangis-job/exchangis-job-metrics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>exchangis-job</artifactId>
<groupId>com.webank.wedatasphere.exchangis</groupId>
<version>1.0.0-RC1</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading

0 comments on commit 6a0ea1f

Please sign in to comment.