Skip to content

Commit 121a756

Browse files
Davidhua1996Davidhua1996
authored
Merge pull request #28 from WeDataSphere/dev-0.2.0
[Version Feature] Collection of features support in version 0.2.0
2 parents 7f8649d + 0e74ebf commit 121a756

215 files changed

Lines changed: 9934 additions & 2695 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ streamis-jobmanager/streamis-projectmanager-server/target
1515
streamis-project/streamis-project-common/target
1616
streamis-project/streamis-project-server/target
1717

18-
streamis-server/target
18+
streamis-server/target
19+
streamis-appconn/target

‎assembly/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>streamis</artifactId>
2222
<groupId>com.webank.wedatasphere.streamis</groupId>
23-
<version>0.1.0</version>
23+
<version>0.2.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎db/streamis_ddl.sql‎

Lines changed: 65 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,47 @@
22
SET NAMES utf8mb4;
33
SET FOREIGN_KEY_CHECKS = 0;
44

5-
-- ----------------------------
6-
-- Table structure for linkis_stream_configuration_config_key
7-
-- ----------------------------
8-
DROP TABLE IF EXISTS `linkis_stream_configuration_config_key`;
9-
CREATE TABLE `linkis_stream_configuration_config_key` (
10-
`id` bigint(20) NOT NULL,
11-
`key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
12-
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
13-
`description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
14-
`default_value` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
15-
`validate_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
16-
`validate_range` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
17-
`is_hidden` tinyint(1) NULL DEFAULT NULL,
18-
`is_advanced` tinyint(1) NULL DEFAULT NULL,
19-
`level` tinyint(1) NULL DEFAULT NULL,
20-
`treename` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
21-
`type` int(10) NULL DEFAULT NULL,
22-
`sort` int(10) NULL DEFAULT NULL,
23-
`status` tinyint(10) NULL DEFAULT NULL COMMENT '1 custom , 2 selected ',
24-
PRIMARY KEY (`id`) USING BTREE,
25-
UNIQUE INDEX `key_index`(`key`) USING BTREE
26-
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '配置信息' ROW_FORMAT = Compact;
27-
28-
29-
-- ----------------------------
30-
-- Table structure for linkis_stream_configuration_config_value
31-
-- ----------------------------
32-
DROP TABLE IF EXISTS `linkis_stream_configuration_config_value`;
33-
CREATE TABLE `linkis_stream_configuration_config_value` (
34-
`id` bigint(20) NOT NULL,
35-
`configkey_id` bigint(20) NULL DEFAULT NULL,
36-
`config_value` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
37-
`type` int(10) NULL DEFAULT NULL,
38-
`job_id` bigint(20) NULL DEFAULT NULL,
39-
`job_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
40-
`config_key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
41-
PRIMARY KEY (`id`) USING BTREE,
42-
INDEX `key`(`config_key`) USING BTREE,
43-
INDEX `keyid`(`configkey_id`) USING BTREE
44-
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '配置信息' ROW_FORMAT = Compact;
45-
46-
-- ----------------------------
47-
-- Records of linkis_stream_configuration_config_value
48-
-- ----------------------------
5+
--
6+
-- Table structure for table `linkis_stream_job_config_def`
7+
--
498

9+
DROP TABLE IF EXISTS `linkis_stream_job_config_def`;
10+
CREATE TABLE `linkis_stream_job_config_def` (
11+
`id` bigint(20) NOT NULL AUTO_INCREMENT,
12+
`key` varchar(100) COLLATE utf8_bin NOT NULL,
13+
`name` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT 'Equals option',
14+
`type` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT 'NONE' COMMENT 'def type, NONE: 0, INPUT: 1, SELECT: 2',
15+
`sort` int(10) DEFAULT '0' COMMENT 'In order to sort the configurations that have the same level',
16+
`description` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT 'Description of configuration',
17+
`validate_type` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT 'Method the validate the configuration',
18+
`validate_rule` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT 'Value of validation rule',
19+
`style` varchar(200) COLLATE utf8_bin DEFAULT '' COMMENT 'Display style',
20+
`visiable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0: hidden, 1: display',
21+
`level` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0: root, 1: leaf',
22+
`unit` varchar(25) COLLATE utf8_bin DEFAULT NULL COMMENT 'Unit symbol',
23+
`default_value` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT 'Default value',
24+
`ref_values` varchar(200) COLLATE utf8_bin DEFAULT '',
25+
`parent_ref` bigint(20) DEFAULT NULL COMMENT 'Parent key of configuration def',
26+
`required` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'If the value of configuration is necessary',
27+
`is_temp` tinyint(1) DEFAULT '0' COMMENT 'Temp configuration',
28+
PRIMARY KEY (`id`),
29+
UNIQUE KEY `config_def_key` (`key`)
30+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
31+
32+
--
33+
-- Table structure for table `linkis_stream_job_config`
34+
--
35+
36+
DROP TABLE IF EXISTS `linkis_stream_job_config`;
37+
CREATE TABLE `linkis_stream_job_config` (
38+
`job_id` bigint(20) NOT NULL,
39+
`job_name` varchar(200) COLLATE utf8_bin NOT NULL COMMENT 'Just store the job name',
40+
`key` varchar(100) COLLATE utf8_bin NOT NULL,
41+
`value` varchar(500) COLLATE utf8_bin NOT NULL,
42+
`ref_def_id` bigint(20) DEFAULT NULL COMMENT 'Refer to id in config_def table',
43+
PRIMARY KEY (`job_id`,`key`),
44+
KEY `config_def_id` (`ref_def_id`)
45+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
5046

5147
-- ----------------------------
5248
-- Table structure for linkis_stream_job_alarm_send_history
@@ -129,8 +125,8 @@ DROP TABLE IF EXISTS `linkis_stream_job`;
129125

130126
CREATE TABLE `linkis_stream_job` (
131127
`id` bigint(20) NOT NULL AUTO_INCREMENT,
132-
`project_name` varchar(50) DEFAULT NULL,
133-
`name` varchar(50) DEFAULT NULL,
128+
`project_name` varchar(100) DEFAULT NULL,
129+
`name` varchar(200) DEFAULT NULL,
134130
`status` tinyint(1) DEFAULT '0' COMMENT '1:已完成 ，2:等待重启 ，3:告警 ，4:慢任务 ，5:运行中 ，6:失败任务',
135131
`create_by` varchar(50) DEFAULT NULL,
136132
`create_time` datetime DEFAULT NULL,
@@ -139,7 +135,8 @@ CREATE TABLE `linkis_stream_job` (
139135
`job_type` varchar(30) DEFAULT NULL COMMENT '目前只支持flink.sql、flink.jar',
140136
`submit_user` varchar(100) DEFAULT NULL,
141137
`workspace_name` varchar(50) DEFAULT NULL,
142-
PRIMARY KEY (`id`) USING BTREE
138+
PRIMARY KEY (`id`) USING BTREE,
139+
UNIQUE KEY(`project_name`, `name`)
143140
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='作业表';
144141

145142
/*Table structure for table `linkis_stream_job_version` */
@@ -155,7 +152,8 @@ CREATE TABLE `linkis_stream_job_version` (
155152
`comment` varchar(255) DEFAULT NULL,
156153
`create_time` datetime DEFAULT NULL,
157154
`create_by` varchar(32) DEFAULT NULL,
158-
PRIMARY KEY (`id`) USING BTREE
155+
PRIMARY KEY (`id`) USING BTREE,
156+
UNIQUE KEY(`job_id`, `version`)
159157
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='作业表';
160158

161159
/*Table structure for table `linkis_stream_job_version_files` */
@@ -182,7 +180,7 @@ DROP TABLE IF EXISTS `linkis_stream_project`;
182180
CREATE TABLE `linkis_stream_project` (
183181
`id` bigint(20) NOT NULL AUTO_INCREMENT,
184182
`workspace_id` bigint(20) DEFAULT NULL,
185-
`name` varchar(50) DEFAULT NULL,
183+
`name` varchar(100) DEFAULT NULL,
186184
`create_by` varchar(50) DEFAULT NULL,
187185
PRIMARY KEY (`id`) USING BTREE
188186
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='项目表';
@@ -211,14 +209,14 @@ DROP TABLE IF EXISTS `linkis_stream_task`;
211209
CREATE TABLE `linkis_stream_task` (
212210
`id` int(11) NOT NULL AUTO_INCREMENT,
213211
`job_version_id` bigint(20) NOT NULL,
214-
`job_id` varchar(50) DEFAULT NULL,
212+
`job_id` varchar(200) DEFAULT NULL,
215213
`version` varchar(50) DEFAULT NULL,
216214
`status` int(3) DEFAULT NULL,
217215
`start_time` datetime DEFAULT NULL,
218216
`last_update_time` datetime DEFAULT NULL,
219217
`err_desc` varchar(10240) DEFAULT NULL,
220218
`submit_user` varchar(50) DEFAULT NULL,
221-
`linkis_job_id` varchar(50) DEFAULT NULL,
219+
`linkis_job_id` varchar(200) DEFAULT NULL,
222220
`linkis_job_info` mediumtext,
223221
PRIMARY KEY (`id`) USING BTREE
224222
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='任务表';
@@ -239,4 +237,20 @@ CREATE TABLE `linkis_stream_alert_record` (
239237
PRIMARY KEY (`id`)
240238
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
241239

240+
DROP TABLE IF EXISTS `linkis_stream_project_privilege`;
241+
242+
CREATE TABLE `linkis_stream_project_privilege` (
243+
`id` bigint(20) NOT NULL AUTO_INCREMENT,
244+
`project_id` bigint(20) NOT NULL,
245+
`user_name` varchar(100) NOT NULL,
246+
`privilege` tinyint(1) DEFAULT '0' NOT NULL COMMENT '1:发布权限 ，2:编辑权限 ，3:查看权限',
247+
PRIMARY KEY (`id`) USING BTREE
248+
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='项目权限表';
249+
250+
251+
ALTER TABLE `linkis_stream_project` ADD create_time datetime DEFAULT NULL;
252+
ALTER TABLE `linkis_stream_project` ADD last_update_by varchar(50) DEFAULT NULL;
253+
ALTER TABLE `linkis_stream_project` ADD last_update_time datetime DEFAULT NULL;
254+
ALTER TABLE `linkis_stream_project` ADD is_deleted tinyint unsigned DEFAULT 0;
255+
242256
SET FOREIGN_KEY_CHECKS = 1;

‎db/streamis_dml.sql‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
-- ----------------------------
2-
-- Records of linkis_stream_configuration_config_key
2+
-- Records of linkis_stream_job_config_def
33
-- ----------------------------
4-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (1, 'wds.linkis.flink.resource', '资源配置', '资源配置', NULL, 'None', NULL, 0, 0, 1, '资源配置', 1, 0, 1);
5-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (2, 'wds.linkis.flink.taskmanager.num', 'Task Managers数量', 'Task Managers数量', '4', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 1, 1);
6-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (3, 'wds.linkis.flink.jobmanager.memory', 'JobManager Memory', 'JobManager Memory', '1.5', 'Regex', '^([1-9]\\d{0,2}|1000)(G|g)$', 0, 0, 2, '资源配置', 1, 2, 1);
7-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (4, 'wds.linkis.flink.taskmanager.memory', 'TaskManager Memory', 'TaskManager Memory', '1.5', 'Regex', '^([1-9]\\d{0,2}|1000)(G|g)$', 0, 0, 2, '资源配置', 1, 3, 1);
8-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (5, 'wds.linkis.flink.jobmanager.cpus', 'JobManager CPUs', 'JobManager CPUs', '1', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 4, 1);
9-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (6, 'wds.linkis.flink.taskManager.cpus', 'TaskManager CPUs', 'TaskManager CPUs', '1', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 5, 1);
10-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (7, 'wds.linkis.flink.custom', '自定义参数', '自定义参数', NULL, 'None', NULL, 0, 0, 1, '自定义参数', 2, 0, 1);
11-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (8, 'wds.linkis.flink.produce', '生产配置', '生产配置', NULL, 'None', NULL, 0, 0, 1, '生产配置', 3, 0, 1);
12-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (9, 'wds.linkis.flink.checkpoint.interval', 'Checkpoint间隔', 'Checkpoint间隔', NULL, NULL, NULL, 0, 0, 2, '生产配置', 3, 1, 1);
13-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (10, 'wds.linkis.flink.reboot.strategy', '重启策略', '重启策略', '不重启,基于Checkpoint自动重启,无Checkpoint不重启', 'None', NULL, 0, 0, 2, '重启策略', 3, 2, 2);
14-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (11, 'wds.linkis.flink.alert', '告警设置', '告警设置', NULL, 'None', NULL, 0, 0, 1, '告警设置', 4, 0, 1);
15-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (12, 'wds.linkis.flink.alert.rule', '告警规则', '告警规则', '任务日志中出现ERROR/EXCEPTION,任务核心指标出现异常', 'None', NULL, 0, 0, 2, '告警规则', 4, 1, 2);
16-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (13, 'wds.linkis.flink.alert.user', '告警用户', '告警用户', NULL, NULL, NULL, 0, 0, 2, '告警用户', 4, 3, 1);
17-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (14, 'wds.linkis.flink.alert.leve', '告警级别', '告警级别', 'CLEARED,INDETERMINATE,WARNING,MINOR,MAJOR,CRITICAL', 'None', NULL, 0, 0, 2, '告警级别', 4, 2, 2);
18-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (15, 'wds.linkis.flink.alert.failure.level', '失败时告警级别', '失败时告警级别', 'CLEARED,INDETERMINATE,WARNING,MINOR,MAJOR,CRITICAL', 'None', NULL, 0, 0, 2, '失败时告警级别', 4, 4, 2);
19-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (16, 'wds.linkis.flink.alert.failure.user', '失败时告警用户', '失败时告警用户', NULL, 'None', NULL, 0, 0, 2, '失败时告警用户', 4, 5, 1);
20-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (17, 'wds.linkis.flink.authority', '权限设置', '权限设置', NULL, 'None', NULL, 0, 0, 1, '权限设置', 5, 0, 1);
21-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (18, 'wds.linkis.flink.authority.author', '授权模式', '授权模式', '私密,指定全员可见,指定人员可见', 'None', NULL, 0, 0, 2, '授权模式', 5, 1, 2);
22-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (19, 'wds.linkis.flink.authority.visible', '可见人员', '可见人员', NULL, 'None', NULL, 0, 0, 2, '可见人员', 5, 2, 1);
4+
5+
INSERT INTO `linkis_stream_job_config_def` VALUES (1,'wds.linkis.flink.resource','资源配置','NONE',0,'资源配置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
6+
INSERT INTO `linkis_stream_job_config_def` VALUES (2,'wds.linkis.flink.app.parallelism','Parallelism并行度','NUMBER',0,'Parallelism并行度','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'4','',1,1,0);
7+
INSERT INTO `linkis_stream_job_config_def` VALUES (3,'wds.linkis.flink.jobmanager.memory','JobManager Memory (M)','NUMBER',0,'JobManager Memory (M)','Regex','^([1-9]\\d{0,4}|100000)$','',1,1,'M','1024','',1,1,0);
8+
INSERT INTO `linkis_stream_job_config_def` VALUES (4,'wds.linkis.flink.taskmanager.memory','TaskManager Memory (M)','NUMBER',0,'JobManager Memory (M)','Regex','^([1-9]\\d{0,4}|100000)$','',1,1,'M','4096','',1,1,0);
9+
INSERT INTO `linkis_stream_job_config_def` VALUES (5,'wds.linkis.flink.taskmanager.numberOfTaskSlots','TaskManager Slot数量','NUMBER',0,'TaskManager Slot数量','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'2','',1,1,0);
10+
INSERT INTO `linkis_stream_job_config_def` VALUES (6,'wds.linkis.flink.taskmanager.cpus','TaskManager CPUs','NUMBER',0,'TaskManager CPUs','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'2','',1,1,0);
11+
INSERT INTO `linkis_stream_job_config_def` VALUES (7,'wds.linkis.flink.custom','Flink参数','NONE',0,'Flink自定义参数','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
12+
INSERT INTO `linkis_stream_job_config_def` VALUES (8,'wds.linkis.flink.produce','生产配置','NONE',0,'生产配置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
13+
INSERT INTO `linkis_stream_job_config_def` VALUES (9,'wds.linkis.flink.checkpoint.switch','Checkpoint开关','SELECT',0,'Checkpoint开关',NULL,NULL,'',1,1,'','OFF','ON,OFF',8,0,0);
14+
INSERT INTO `linkis_stream_job_config_def` VALUES (10,'wds.linkis.flink.savepoint.path','快照(Savepoint)文件位置【仅需恢复任务时指定】','INPUT',4,'快照(Savepoint)文件位置','None',NULL,'',1,1,NULL,NULL,'',8,0,1);
15+
INSERT INTO `linkis_stream_job_config_def` VALUES (11,'wds.linkis.flink.alert','告警设置','NONE',0,'告警设置','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
16+
INSERT INTO `linkis_stream_job_config_def` VALUES (12,'wds.linkis.flink.alert.rule','告警规则','NONE',0,'告警规则','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
17+
INSERT INTO `linkis_stream_job_config_def` VALUES (13,'wds.linkis.flink.alert.user','告警用户','NONE',0,'告警用户',NULL,NULL,'',1,1,NULL,NULL,'',NULL,0,0);
18+
INSERT INTO `linkis_stream_job_config_def` VALUES (14,'wds.linkis.flink.alert.level','告警级别','NONE',0,'告警级别','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
19+
INSERT INTO `linkis_stream_job_config_def` VALUES (15,'wds.linkis.flink.alert.failure.level','失败时告警级别','NONE',0,'失败时告警级别','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
20+
INSERT INTO `linkis_stream_job_config_def` VALUES (16,'wds.linkis.flink.alert.failure.user','失败时告警用户','NONE',0,'失败时告警用户','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
21+
INSERT INTO `linkis_stream_job_config_def` VALUES (32,'wds.linkis.flink.authority','权限设置','NONE',0,'权限设置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
22+
INSERT INTO `linkis_stream_job_config_def` VALUES (33,'wds.linkis.flink.authority.visible','可见人员','INPUT',0,'可见人员','None',NULL,'',1,1,NULL,NULL,'',32,0,0);
23+
INSERT INTO `linkis_stream_job_config_def` VALUES (34,'wds.linkis.rm.yarnqueue','使用Yarn队列','INPUT',0,'使用Yarn队列','None',NULL,'',1,1,NULL,NULL,'',1,0,0);
24+
INSERT INTO `linkis_stream_job_config_def` VALUES (35,'wds.linkis.flink.app.fail-restart.switch','作业失败自动拉起开关','SELECT',1,'作业失败自动拉起开关','None',NULL,'',1,1,NULL,'OFF','ON,OFF',8,0,0);
25+
INSERT INTO `linkis_stream_job_config_def` VALUES (36,'wds.linkis.flink.app.start-auto-restore.switch','作业启动状态自恢复','SELECT',2,'作业启动状态自恢复','None',NULL,'',1,1,NULL,'ON','ON,OFF',8,0,0);

‎pom.xml‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<groupId>com.webank.wedatasphere.streamis</groupId>
2323
<artifactId>streamis</artifactId>
24-
<version>0.1.0</version>
24+
<version>0.2.0</version>
2525
<packaging>pom</packaging>
2626

2727
<name>Streamis Project Parent POM</name>
@@ -38,14 +38,16 @@
3838

3939
<modules>
4040
<module>streamis-jobmanager</module>
41-
<module>streamis-server</module>
4241
<module>streamis-project</module>
42+
<module>streamis-server</module>
4343
<module>assembly</module>
44+
<module>streamis-appconn</module>
4445
</modules>
4546

4647
<properties>
47-
<linkis.version>1.0.3</linkis.version>
48-
<streamis.version>0.1.0</streamis.version>
48+
<linkis.version>1.1.1</linkis.version>
49+
<dss.version>1.1.0</dss.version>
50+
<streamis.version>0.2.0</streamis.version>
4951
<scala.version>2.11.12</scala.version>
5052
<jdk.compile.version>1.8</jdk.compile.version>
5153
<maven.version>3.3.3</maven.version>
@@ -67,8 +69,9 @@
6769
<jersey-bean-validation.version>2.21</jersey-bean-validation.version>
6870
<aspectj.version>1.9.5</aspectj.version>
6971
<xstream.version>1.4.19</xstream.version>
70-
<jobmanager.version>0.1.0</jobmanager.version>
72+
<jobmanager.version>0.2.0</jobmanager.version>
7173
<mysql.connector.version>5.1.47</mysql.connector.version>
74+
<validation.api.version>2.0.1.Final</validation.api.version>
7275
</properties>
7376

7477

@@ -105,6 +108,12 @@
105108
<artifactId>linkis-mybatis</artifactId>
106109
<version>${linkis.version}</version>
107110
</dependency>
111+
<!--scheduler module-->
112+
<dependency>
113+
<groupId>org.apache.linkis</groupId>
114+
<artifactId>linkis-scheduler</artifactId>
115+
<version>${linkis.version}</version>
116+
</dependency>
108117
<dependency>
109118
<groupId>org.apache.linkis</groupId>
110119
<artifactId>linkis-module</artifactId>
@@ -152,6 +161,11 @@
152161
<groupId>com.thoughtworks.xstream</groupId>
153162
<version>${xstream.version}</version>
154163
</dependency>
164+
<dependency>
165+
<groupId>javax.validation</groupId>
166+
<artifactId>validation-api</artifactId>
167+
<version>${validation.api.version}</version>
168+
</dependency>
155169
</dependencies>
156170
</dependencyManagement>
157171

0 commit comments

Comments
 (0)