Merge pull request #1507 from RichardShan/master

Beta.9 release
edp963 · Mar 2, 2020 · feb866a · feb866a
2 parents e8747bd + 5cb54db
commit feb866a
Show file tree

Hide file tree

Showing 678 changed files with 34,749 additions and 32,835 deletions.
diff --git a/README-CH.md b/README-CH.md
@@ -74,7 +74,7 @@ Please refer to [Davinci用户手册](https://edp963.github.io/davinci/).
 
 Latest Release
 =============
-Please download the latest [RELEASE](https://github.com/edp963/davinci/releases/download/v0.3.0-beta.8/davinci-assembly_3.0.1-0.3.1-SNAPSHOT-dist-beta.8.zip).
+Please download the latest [RELEASE](https://github.com/edp963/davinci/releases/download/v0.3.0-beta.9/davinci-assembly_3.0.1-0.3.1-SNAPSHOT-dist-beta.9.zip).
 
 Get Help
 ============

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ Davinci is oriented towards product managers, business people, data engineers, d
   * Integration of LDAP sign-in
 
 ## Latest Release
-Please download the latest [RELEASE](https://github.com/edp963/davinci/releases/download/v0.3.0-beta.8/davinci-assembly_3.0.1-0.3.1-SNAPSHOT-dist-beta.8.zip)
+Please download the latest [RELEASE](https://github.com/edp963/davinci/releases/download/v0.3.0-beta.9/davinci-assembly_3.0.1-0.3.1-SNAPSHOT-dist-beta.9.zip)
 
 ## Get Help
 The fastest way to get response from our developers is to send email to our mail list edp_support@groups.163.com, and welcome to join our WeChat group for online discussion.

diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
@@ -20,7 +20,7 @@
 
 
 <assembly>
-    <id>dist-beta.8</id>
+    <id>dist-beta.9</id>
     <formats>
         <format>zip</format>
     </formats>

diff --git a/bin/davinci.sql b/bin/davinci.sql
@@ -20,7 +20,7 @@ CREATE TABLE `cron_job`
     `exec_log`        text COLLATE utf8_unicode_ci,
     `create_by`       bigint(20)                          NOT NULL,
     `create_time`     timestamp                           NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `update_by`       varchar(20) COLLATE utf8_unicode_ci          DEFAULT NULL,
+    `update_by`       bigint(20)                                  DEFAULT NULL,
     `update_time`     timestamp                           NULL     DEFAULT NULL,
     `parent_id`       bigint(20)                                   DEFAULT NULL,
     `full_parent_id`  varchar(255) COLLATE utf8_unicode_ci         DEFAULT NULL,
@@ -89,6 +89,7 @@ CREATE TABLE `display`
     `project_id`  bigint(20)   NOT NULL,
     `avatar`      varchar(255) DEFAULT NULL,
     `publish`     tinyint(1)   NOT NULL,
+    `config`      text         NULL,
     `create_by`   bigint(20)   DEFAULT NULL,
     `create_time` datetime     DEFAULT NULL,
     `update_by`   bigint(20)   DEFAULT NULL,
@@ -629,7 +630,7 @@ CREATE TABLE `davinci_statistic_visitor_operation` (
   `groups` varchar(500) DEFAULT NULL,
   `create_time` timestamp NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 DROP TABLE IF EXISTS `davinci_statistic_terminal`;
 CREATE TABLE `davinci_statistic_terminal` (
@@ -648,18 +649,27 @@ CREATE TABLE `davinci_statistic_terminal` (
   `cpu_architecture` varchar(255) DEFAULT NULL,
   `create_time` timestamp NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
 DROP TABLE IF EXISTS `davinci_statistic_duration`;
-CREATE TABLE `davinci_statistic_duration` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `user_id` bigint(20) DEFAULT NULL,
-  `email` varchar(255) DEFAULT NULL,
-  `start_time` timestamp NULL DEFAULT NULL,
-  `end_time` timestamp NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `davinci_statistic_duration`
+(
+    `id`         bigint(20) NOT NULL AUTO_INCREMENT,
+    `user_id`    bigint(20)      DEFAULT NULL,
+    `email`      varchar(255)    DEFAULT NULL,
+    `org_id` bigint(20) DEFAULT NULL COMMENT '报表关联组织ID',
+    `project_id` bigint(20) DEFAULT NULL COMMENT '报表关联项目ID',
+    `project_name` varchar(255) DEFAULT NULL COMMENT '报表关联项目名称',
+    `viz_type` varchar(10) DEFAULT NULL COMMENT '报表关联应用类型（dashboard/display）',
+    `viz_id` bigint(20) DEFAULT NULL COMMENT '报表关联应用ID',
+    `viz_name` varchar(255) DEFAULT NULL COMMENT '报表关联应用名称',
+    `sub_viz_id` bigint(20) DEFAULT NULL COMMENT '报表ID',
+    `sub_viz_name` varchar(255) DEFAULT NULL COMMENT '报表名称',
+    `start_time` timestamp  NULL DEFAULT NULL,
+    `end_time`   timestamp  NULL DEFAULT NULL,
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
 
 DROP TABLE IF EXISTS `share_download_record`;
 CREATE TABLE `share_download_record` (

diff --git a/bin/patch/004_beta9.sql b/bin/patch/004_beta9.sql
@@ -0,0 +1,20 @@
+ALTER TABLE `davinci_statistic_duration`
+ADD COLUMN `org_id` BIGINT(20) NULL   COMMENT '报表关联组织ID' AFTER `email`;
+ALTER TABLE `davinci_statistic_duration`
+ADD COLUMN `project_id` BIGINT(20) NULL   COMMENT '报表关联项目ID' AFTER `org_id`;
+ALTER TABLE `davinci_statistic_duration`
+ADD COLUMN `project_name` VARCHAR(255) NULL   COMMENT '报表关联项目名称' AFTER `project_id`;
+ALTER TABLE `davinci_statistic_duration`
+ADD COLUMN `viz_type` VARCHAR(10) NULL   COMMENT '报表关联应用类型（dashboard/display）' AFTER `project_name`;
+ALTER TABLE `davinci_statistic_duration`
+ADD COLUMN `viz_id` BIGINT(20) NULL   COMMENT '报表关联应用ID' AFTER `viz_type`;
+ALTER TABLE `davinci_statistic_duration`
+ADD COLUMN `viz_name` VARCHAR(255) NULL   COMMENT '报表关联应用名称' AFTER `viz_id`;
+ALTER TABLE `davinci_statistic_duration`
+ADD COLUMN `sub_viz_id` BIGINT(20) NULL   COMMENT '报表ID' AFTER `viz_name`;
+ALTER TABLE `davinci_statistic_duration`
+ADD COLUMN `sub_viz_name` VARCHAR(255) NULL   COMMENT '报表名称' AFTER `sub_viz_id`;
+ALTER TABLE `display`
+ADD COLUMN `config` text NULL AFTER `publish`;
+ALTER TABLE `cron_job`
+MODIFY COLUMN `update_by` bigint(20) NULL DEFAULT NULL AFTER `create_time`;
diff --git a/config/application.yml.example b/config/application.yml.example
@@ -134,7 +134,21 @@ data-auth-center:
       auth-code:
 
 statistic:
-  enable: true
-  # You can use external elasticsearch storage [127.0.0.1:9300], default davinci datasouce
+  enable: false
+
+  # You can use external elasticsearch storage [127.0.0.1:9300]
   elastic_urls:
-  elastic_index_prefix:
+  elastic_user:
+  elastic_index_prefix:
+
+  # You can also use external mysql storage
+  mysql_url:
+  mysql_username:
+  mysql_password:
+
+  # You can also use external kafka
+  kafka.bootstrap.servers:
+  kafka.topic:
+  java.security.krb5.conf:
+  java.security.keytab:
+  java.security.principal:
diff --git a/davinci-ui/1.07df75f50ea533269e4d.chunk.js b/davinci-ui/1.07df75f50ea533269e4d.chunk.js
diff --git a/davinci-ui/1.07df75f50ea533269e4d.chunk.js.gz b/davinci-ui/1.07df75f50ea533269e4d.chunk.js.gz
diff --git a/davinci-ui/1.ef089c2c540a68051205.chunk.js b/davinci-ui/1.ef089c2c540a68051205.chunk.js
diff --git a/davinci-ui/1.ef089c2c540a68051205.chunk.js.gz b/davinci-ui/1.ef089c2c540a68051205.chunk.js.gz
diff --git a/davinci-ui/11.1a79af3372a8523f2994.chunk.js b/davinci-ui/11.1a79af3372a8523f2994.chunk.js
diff --git a/davinci-ui/11.1a79af3372a8523f2994.chunk.js.gz b/davinci-ui/11.1a79af3372a8523f2994.chunk.js.gz
diff --git a/davinci-ui/12.6a5e154d006bd4d2684b.chunk.js b/davinci-ui/12.6a5e154d006bd4d2684b.chunk.js
diff --git a/davinci-ui/12.6a5e154d006bd4d2684b.chunk.js.gz b/davinci-ui/12.6a5e154d006bd4d2684b.chunk.js.gz
diff --git a/davinci-ui/12.ec5598d827a614744dd8.chunk.js b/davinci-ui/12.ec5598d827a614744dd8.chunk.js
diff --git a/davinci-ui/12.ec5598d827a614744dd8.chunk.js.gz b/davinci-ui/12.ec5598d827a614744dd8.chunk.js.gz
diff --git a/davinci-ui/13.00acbd8e8a2cf2aa32b6.chunk.js b/davinci-ui/13.00acbd8e8a2cf2aa32b6.chunk.js
diff --git a/davinci-ui/13.00acbd8e8a2cf2aa32b6.chunk.js.gz b/davinci-ui/13.00acbd8e8a2cf2aa32b6.chunk.js.gz
diff --git a/davinci-ui/13.40a3d49542d63321b1be.chunk.js b/davinci-ui/13.40a3d49542d63321b1be.chunk.js
diff --git a/davinci-ui/13.40a3d49542d63321b1be.chunk.js.gz b/davinci-ui/13.40a3d49542d63321b1be.chunk.js.gz
diff --git a/davinci-ui/14.8a8be5956ebe055fb35c.chunk.js b/davinci-ui/14.8a8be5956ebe055fb35c.chunk.js
diff --git a/davinci-ui/14.8a8be5956ebe055fb35c.chunk.js.gz b/davinci-ui/14.8a8be5956ebe055fb35c.chunk.js.gz
diff --git a/davinci-ui/14.bc340f1551e1fbb72d08.chunk.js b/davinci-ui/14.bc340f1551e1fbb72d08.chunk.js
diff --git a/davinci-ui/14.bc340f1551e1fbb72d08.chunk.js.gz b/davinci-ui/14.bc340f1551e1fbb72d08.chunk.js.gz
diff --git a/davinci-ui/15.613deb8b25ef79256b96.chunk.js b/davinci-ui/15.613deb8b25ef79256b96.chunk.js
diff --git a/davinci-ui/15.613deb8b25ef79256b96.chunk.js.gz b/davinci-ui/15.613deb8b25ef79256b96.chunk.js.gz
diff --git a/davinci-ui/15.95563b928ac4bed8e308.chunk.js b/davinci-ui/15.95563b928ac4bed8e308.chunk.js
diff --git a/davinci-ui/15.95563b928ac4bed8e308.chunk.js.gz b/davinci-ui/15.95563b928ac4bed8e308.chunk.js.gz
diff --git a/davinci-ui/16.4193423443357ade7dc6.chunk.js b/davinci-ui/16.4193423443357ade7dc6.chunk.js
diff --git a/davinci-ui/16.4193423443357ade7dc6.chunk.js.gz b/davinci-ui/16.4193423443357ade7dc6.chunk.js.gz
diff --git a/davinci-ui/16.e861a9b2e89210c965b1.chunk.js b/davinci-ui/16.e861a9b2e89210c965b1.chunk.js
diff --git a/davinci-ui/16.e861a9b2e89210c965b1.chunk.js.gz b/davinci-ui/16.e861a9b2e89210c965b1.chunk.js.gz