Skip to content

Commit 2e995b0

Browse files
authored
Merge pull request #133 from WeDataSphere/1.0.1
1.0.1
2 parents fa8ce90 + 4f783af commit 2e995b0

122 files changed

Lines changed: 3063 additions & 469 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.

assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>visualis</artifactId>
88
<groupId>com.webank.wedatasphere.dss</groupId>
9-
<version>1.0.0</version>
9+
<version>1.0.1</version>
1010
</parent>
1111

1212
<artifactId>visualis-assembly</artifactId>

db/ddl.sql

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,27 @@ CREATE TABLE `visualis_config` (
88
PRIMARY KEY (`id`)
99
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1010

11+
-- visualis使用这个表
12+
DROP TABLE IF EXISTS `visualis_user`;
13+
CREATE TABLE `visualis_user` (
14+
`id` bigint(20) NOT NULL AUTO_INCREMENT,
15+
`email` varchar(255) DEFAULT NULL,
16+
`username` varchar(255) NOT NULL,
17+
`password` varchar(255) DEFAULT NULL,
18+
`admin` tinyint(1) DEFAULT NULL COMMENT 'If it is an administrator',
19+
`active` tinyint(1) DEFAULT NULL COMMENT 'If it is active',
20+
`name` varchar(255) DEFAULT NULL COMMENT 'User name',
21+
`description` varchar(255) DEFAULT NULL,
22+
`department` varchar(255) DEFAULT NULL,
23+
`avatar` varchar(255) DEFAULT NULL COMMENT 'Path of the avator',
24+
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
25+
`create_by` bigint(20) DEFAULT '0',
26+
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
27+
`update_by` bigint(20) DEFAULT '0',
28+
`is_first_login` bit(1) DEFAULT NULL COMMENT 'If it is the first time to log in',
29+
PRIMARY KEY (`id`)
30+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
31+
1132
DROP TABLE IF EXISTS `visualis_project`;
1233
CREATE TABLE `visualis_project` (
1334
`id` bigint(20) NOT NULL AUTO_INCREMENT,
@@ -29,23 +50,17 @@ CREATE TABLE `visualis_project` (
2950
PRIMARY KEY (`id`)
3051
) ENGINE=InnoDB AUTO_INCREMENT=313 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT;
3152

32-
-- visualis使用该表做权限管理
33-
DROP TABLE IF EXISTS `visualis_user`;
34-
CREATE TABLE `visualis_user` (
53+
54+
DROP TABLE IF EXISTS `visualis_preview_result`;
55+
CREATE TABLE `visualis_preview_result` (
3556
`id` bigint(20) NOT NULL AUTO_INCREMENT,
36-
`email` varchar(255) DEFAULT NULL,
37-
`username` varchar(255) NOT NULL,
38-
`password` varchar(255) DEFAULT NULL,
39-
`admin` tinyint(1) DEFAULT NULL COMMENT 'If it is an administrator',
40-
`active` tinyint(1) DEFAULT NULL COMMENT 'If it is active',
41-
`name` varchar(255) DEFAULT NULL COMMENT 'User name',
42-
`description` varchar(255) DEFAULT NULL,
43-
`department` varchar(255) DEFAULT NULL,
44-
`avatar` varchar(255) DEFAULT NULL COMMENT 'Path of the avator',
57+
`execId` varchar(128) COLLATE utf8_bin NOT NULL UNIQUE,
58+
`name` varchar(200) COLLATE utf8_bin DEFAULT NULL,
59+
`status` varchar(32) COLLATE utf8_bin DEFAULT NULL,
60+
`description` varchar(200) COLLATE utf8_bin DEFAULT NULL, -- [组件名称]_[组件ID]:display_57
61+
`result` longblob DEFAULT NULL,
62+
`create_by` varchar(32) COLLATE utf8_bin DEFAULT NULL,
4563
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
46-
`create_by` bigint(20) DEFAULT '0',
47-
`update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
48-
`update_by` bigint(20) DEFAULT '0',
49-
`is_first_login` bit(1) DEFAULT NULL COMMENT 'If it is the first time to log in',
64+
`isArchive` bit(1) DEFAULT b'0' COMMENT 'If it is archived',
5065
PRIMARY KEY (`id`)
51-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
66+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT;

pom.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>visualis</artifactId>
77
<groupId>com.webank.wedatasphere.dss</groupId>
8-
<version>1.0.0</version>
8+
<version>1.0.1</version>
99
<packaging>pom</packaging>
1010

1111
<licenses>
@@ -32,10 +32,11 @@
3232
<scala.binary.version>2.12</scala.binary.version>
3333
<plugin.scala.version>2.15.2</plugin.scala.version>
3434
<jdk.compile.version>1.8</jdk.compile.version>
35+
<json4s.version>3.6.0</json4s.version>
3536
<skipTests>true</skipTests>
3637

37-
<apache.linkis.version>1.1.1</apache.linkis.version>
38-
<opensource.dss.version>1.1.0</opensource.dss.version>
38+
<apache.linkis.version>1.3.2</apache.linkis.version>
39+
<opensource.dss.version>1.1.1</opensource.dss.version>
3940

4041
<elasticsearch.version>5.1.2</elasticsearch.version>
4142
<spring.boot.version>2.3.7.RELEASE</spring.boot.version>
@@ -53,6 +54,14 @@
5354
<id>alimaven</id>
5455
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
5556
</repository>
57+
<repository>
58+
<id>apache.snapshots</id>
59+
<name>Apache Snapshot Repository</name>
60+
<url>https://repository.apache.org/content/repositories/snapshots/</url>
61+
<snapshots>
62+
<enabled>true</enabled>
63+
</snapshots>
64+
</repository>
5665
<repository>
5766
<id>central</id>
5867
<name>Maven Repository</name>

0 commit comments

Comments
 (0)