Skip to content

Commit 210e713

Browse files
qweqnotallowqweqnotallow
committed
Merge branch 'dev-1.5.0'
# Conflicts: # dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java # web/packages/apiServices/module/apiServicesExecute/result.vue # web/packages/shared/components/consoleComponent/toolbar.vue # web/packages/workflows/module/process/component/nodeparameter.vue
2 parents 655247d + df7702e commit 210e713

File tree

322 files changed

+15407
-537
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+15407
-537
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ dss-apps/dss-data-governance/dss-data-warehouse-dao/target
101101
dss-apps/dss-data-governance/dss-data-warehouse-service/target
102102
dss-apps/dss-data-governance/dss-data-warehouse-server/target
103103

104+
#dss-git
105+
dss-git/dss-git-common/target
106+
dss-git/dss-git-server/target
104107

105108
# plugins
106109
plugins/azkaban/linkis-jobtype/target

‎assembly/dss-package/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎assembly/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<packaging>pom</packaging>

‎db/dss_ddl.sql‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ CREATE TABLE `dss_orchestrator_info` (
5151
`orchestrator_level` varchar(32) DEFAULT NULL COMMENT '工作流级别',
5252
`update_user` varchar(100) DEFAULT NULL COMMENT '更新人',
5353
`update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
54+
`status` VARCHAR(64),
5455
PRIMARY KEY (`id`) USING BTREE,
5556
UNIQUE KEY `unique_idx_uuid` (`uuid`)
5657
) ENGINE=InnoDB AUTO_INCREMENT=326 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
@@ -70,6 +71,7 @@ CREATE TABLE `dss_orchestrator_version_info` (
7071
`content` varchar(255) DEFAULT NULL,
7172
`context_id` varchar(200) DEFAULT NULL COMMENT '上下文ID',
7273
`valid_flag` INT(1) DEFAULT '1' COMMENT '版本有效标示，0:无效；1：有效',
74+
`commit_id` varchar(64),
7375
PRIMARY KEY (`id`) USING BTREE
7476
) ENGINE=InnoDB AUTO_INCREMENT=422 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
7577

@@ -116,6 +118,7 @@ CREATE TABLE `dss_project` (
116118
`dev_process` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT '开发流程，多个以英文逗号分隔，取得的值是dss_workspace_dictionary中的dic_key(parent_key=p_develop_process)',
117119
`orchestrator_mode` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT '编排模式，多个以英文逗号分隔，取得的值是dss_workspace_dictionary中的dic_key(parent_key=p_arrangement_mode或下面一级)',
118120
`visible` tinyint(4) DEFAULT '1' COMMENT '0:已删除；1：未删除(默认)',
121+
`associate_git` TINYINT DEFAULT '0' COMMENT '0:未接入git，1:已接入git',
119122
PRIMARY KEY (`id`)
120123
) ENGINE=InnoDB AUTO_INCREMENT=313 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT;
121124

@@ -639,3 +642,33 @@ key `idx_limit_name` (`limit_name`)
639642
) ENGINE = InnoDB
640643
DEFAULT CHARSET = utf8mb4 COLLATE=utf8mb4_bin COMMENT ='dss用户限制表';
641644

645+
DROP TABLE IF EXISTS `dss_workspace_associate_git`;
646+
CREATE TABLE `dss_workspace_associate_git` (
647+
`id` bigint(20) NOT NULL AUTO_INCREMENT,
648+
`workspace_id` bigint(20) DEFAULT NULL,
649+
`git_user` varchar(64) DEFAULT NULL COMMENT 'git登录用户名',
650+
`git_password` VARCHAR(255) DEFAULT NULL COMMENT 'git登录密码，用于跳转',
651+
`git_token` varchar(255) COMMENT '用户配置的git token',
652+
`git_url` varchar(255),
653+
`create_time` datetime DEFAULT NULL,
654+
`update_time` datetime DEFAULT NULL,
655+
`create_by` varchar(128) DEFAULT NULL,
656+
`update_by` varchar(128) DEFAULT NULL,
657+
`type` varchar(32) DEFAULT NULL,
658+
`git_user_id` varchar(32) DEFAULT NULL,
659+
PRIMARY KEY (`id`)
660+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='工作空间绑定的git信息';
661+
662+
663+
DROP TABLE IF EXISTS `dss_orchestrator_submit_job_info`;
664+
CREATE TABLE `dss_orchestrator_submit_job_info` (
665+
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
666+
`orchestrator_id` bigint(20) NOT NULL,
667+
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
668+
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
669+
`instance_name` varchar(128) DEFAULT NULL COMMENT '提交任务的实例',
670+
`status` varchar(128) DEFAULT NULL COMMENT '提交任务状态',
671+
`error_msg` varchar(2048) DEFAULT NULL COMMENT '提交任务异常信息',
672+
PRIMARY KEY (`id`)
673+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='dss_orchestrator_submit_job_info表';
674+

‎dss-appconn/appconns/dss-datachecker-appconn/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.webank.wedatasphere.dss</groupId>
5656
<artifactId>dss-origin-sso-integration-standard</artifactId>
57-
<version>1.4.0-SNAPSHOT</version>
57+
<version>1.5.0-SNAPSHOT</version>
5858
<exclusions>
5959
<exclusion>
6060
<groupId>org.apache.linkis</groupId>

‎dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>dss</artifactId>
88
<groupId>com.webank.wedatasphere.dss</groupId>
9-
<version>1.4.0-SNAPSHOT</version>
9+
<version>1.5.0-SNAPSHOT</version>
1010
<relativePath>../../../pom.xml</relativePath>
1111
</parent>
1212
<modelVersion>4.0.0</modelVersion>

‎dss-appconn/appconns/dss-eventchecker-appconn/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎dss-appconn/appconns/dss-schedulis-appconn/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎dss-appconn/appconns/dss-scriptis-appconn/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎dss-appconn/appconns/dss-sendemail-appconn/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)