Merge pull request #10 from lzk416/branch-0.6.0

howeye · web-flow · commit 23c81ab620b3 · 2019-12-11T20:01:02.000+08:00
Branch 0.6.0
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 English | [中文](docs/zh_CN/ch1)  
 
 ## Overview
-Qualitis is a one-stop data quality management platform that supports quality verification, notification, and management for various datasource. It is used to solve various data quality problems caused by data processing.
+Qualitis is a data quality management platform that supports quality verification, notification, and management for various datasource. It is used to solve various data quality problems caused by data processing.
 
 Based on Spring Boot, Qualitis submits quality model task to [Linkis](https://github.com/WeBankFinTech/Linkis) platform. It provides functions such as data quality model construction, data quality model execution, data quality verification, reports of data quality generation and so on.
 
diff --git a/core/analysis/src/main/java/com/webank/wedatasphere/qualitis/entity/TaskResult.java b/core/analysis/src/main/java/com/webank/wedatasphere/qualitis/entity/TaskResult.java
@@ -22,7 +22,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "application_task_result")
+@Table(name = "qualitis_application_task_result")
 public class TaskResult {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/project/entity/Project.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/project/entity/Project.java
@@ -25,7 +25,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "project")
+@Table(name = "qualitis_project")
 public class Project {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/project/entity/ProjectUser.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/project/entity/ProjectUser.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "project_user")
+@Table(name = "qualitis_project_user")
 public class ProjectUser {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/AlarmConfig.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/AlarmConfig.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "rule_alarm_config")
+@Table(name = "qualitis_rule_alarm_config")
 public class AlarmConfig {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/Rule.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/Rule.java
@@ -27,7 +27,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "rule", uniqueConstraints = @UniqueConstraint(columnNames = {"project_id", "name"}))
+@Table(name = "qualitis_rule", uniqueConstraints = @UniqueConstraint(columnNames = {"project_id", "name"}))
 public class Rule {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/RuleDataSource.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/RuleDataSource.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "rule_datasource")
+@Table(name = "qualitis_rule_datasource")
 public class RuleDataSource {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/RuleDataSourceMapping.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/RuleDataSourceMapping.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "rule_datasource_mapping")
+@Table(name = "qualitis_rule_datasource_mapping")
 public class RuleDataSourceMapping {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/RuleGroup.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/RuleGroup.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "rule_group")
+@Table(name = "qualitis_rule_group")
 public class RuleGroup {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/RuleVariable.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/RuleVariable.java
@@ -24,7 +24,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "rule_variable")
+@Table(name = "qualitis_rule_variable")
 public class RuleVariable {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/Template.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/Template.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "template")
+@Table(name = "qualitis_template")
 public class Template {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateMidTableInputMeta.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateMidTableInputMeta.java
@@ -24,7 +24,7 @@
  * @author howeye
  */
 @Table
-@Entity(name = "template_mid_table_input_meta")
+@Entity(name = "qualitis_template_mid_table_input_meta")
 public class TemplateMidTableInputMeta {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateOutputMeta.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateOutputMeta.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "template_output_meta")
+@Table(name = "qualitis_template_output_meta")
 public class TemplateOutputMeta {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateRegexpExpr.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateRegexpExpr.java
@@ -22,7 +22,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "template_regexp_expr")
+@Table(name = "qualitis_template_regexp_expr")
 public class TemplateRegexpExpr {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateStatisticsInputMeta.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateStatisticsInputMeta.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "template_statistic_input_meta")
+@Table(name = "qualitis_template_statistic_input_meta")
 public class TemplateStatisticsInputMeta {
 
     @Id
diff --git a/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateUser.java b/core/project/src/main/java/com/webank/wedatasphere/qualitis/rule/entity/TemplateUser.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "template_user")
+@Table(name = "qualitis_template_user")
 public class TemplateUser {
 
     @Id
diff --git a/core/sys_config/src/main/java/com/webank/wedatasphere/qualitis/entity/ClusterInfo.java b/core/sys_config/src/main/java/com/webank/wedatasphere/qualitis/entity/ClusterInfo.java
@@ -24,7 +24,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "config_cluster_info")
+@Table(name = "qualitis_config_cluster_info")
 public class ClusterInfo {
 
     @Id
diff --git a/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/Application.java b/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/Application.java
@@ -25,7 +25,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "application")
+@Table(name = "qualitis_application")
 public class Application {
 
     @Id
diff --git a/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/Task.java b/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/Task.java
@@ -25,7 +25,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "application_task")
+@Table(name = "qualitis_application_task")
 public class Task {
 
     @Id
diff --git a/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/TaskDataSource.java b/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/TaskDataSource.java
@@ -25,7 +25,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "application_task_datasource")
+@Table(name = "qualitis_application_task_datasource")
 public class TaskDataSource {
 
     @Id
diff --git a/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/TaskRuleAlarmConfig.java b/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/TaskRuleAlarmConfig.java
@@ -27,7 +27,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "application_task_rule_alarm_config")
+@Table(name = "qualitis_application_task_rule_alarm_config")
 public class TaskRuleAlarmConfig {
 
     @Id
diff --git a/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/TaskRuleSimple.java b/core/task/src/main/java/com/webank/wedatasphere/qualitis/entity/TaskRuleSimple.java
@@ -30,7 +30,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "application_task_rule_simple")
+@Table(name = "qualitis_application_task_rule_simple")
 public class TaskRuleSimple {
 
     @Id
diff --git a/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/Permission.java b/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/Permission.java
@@ -32,7 +32,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "auth_permission")
+@Table(name = "qualitis_auth_permission")
 public class Permission {
 
     @Id
diff --git a/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/ProxyUser.java b/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/ProxyUser.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "auth_proxy_user")
+@Table(name = "qualitis_auth_proxy_user")
 public class ProxyUser {
 
     @Id
diff --git a/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/Role.java b/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/Role.java
@@ -24,7 +24,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "auth_role")
+@Table(name = "qualitis_auth_role")
 public class Role {
 
     @Id
diff --git a/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/RolePermission.java b/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/RolePermission.java
@@ -22,7 +22,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "auth_role_permission")
+@Table(name = "qualitis_auth_role_permission")
 public class RolePermission {
 
     @Id
diff --git a/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/User.java b/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/User.java
@@ -36,7 +36,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "auth_user")
+@Table(name = "qualitis_auth_user")
 public class User {
 
     @Id
diff --git a/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/UserProxyUser.java b/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/UserProxyUser.java
@@ -23,7 +23,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "auth_user_proxy_user")
+@Table(name = "qualitis_auth_user_proxy_user")
 public class UserProxyUser {
 
     @Id
diff --git a/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/UserRole.java b/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/UserRole.java
@@ -22,7 +22,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "auth_user_role")
+@Table(name = "qualitis_auth_user_role")
 public class UserRole {
 
     @Id
diff --git a/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/UserSpecPermission.java b/core/user/src/main/java/com/webank/wedatasphere/qualitis/entity/UserSpecPermission.java
@@ -22,7 +22,7 @@
  * @author howeye
  */
 @Entity
-@Table(name = "auth_user_permission")
+@Table(name = "qualitis_auth_user_permission")
 public class UserSpecPermission {
 
     @Id
diff --git a/docs/en_US/ch1/Linkis Access Guide.md b/docs/en_US/ch1/Linkis Access Guide.md
@@ -0,0 +1,31 @@
+# How to get Linkis Token
+
+## Linkis Configuration
+### Add Linkis Token
+```
+cd $LINKIS_HOME/linkis-gateway/conf
+vim token.properties
+```
+
+Add line as follow:
+```
+QUALITIS-AUTH=*
+```
+
+### Modify Linkis Default Queue of User
+1. Login in DataSphere Studio using the user same as qualitis.
+
+2. Enter 'Linkis Console' -> Settings -> wds.linkis.yarnqueue, and then set a queue in yarn.
+
+### Add Lib of MySQL
+```
+cd $LINKIS_HOME/linkis-ujes-spark-enginemanager/lib
+```
+Add MySQL Lib in it.
+
+At last, restart Linkis.
+
+## Qualitis Configuration
+Type in 'QUALITIS-AUTH' in the blank of Linkis Token:  
+Here is an example：  
+![](../../../images/en_US/ch1/ClusterConfigurationDemo.png)
diff --git a/docs/en_US/ch1/QuickDeploy.md b/docs/en_US/ch1/QuickDeploy.md
@@ -7,8 +7,8 @@ JDK (1.8.0_141)
 Hadoop (2.7.2)  
 Hive (1.2.1)   
 Zookeeper (3.4.9)  
-Linkis (0.9.0), Spark engine required.[How to install Linkis?](https://github.com/WeBankFinTech/Linkis)  
-DataSphereStudio (0.5.0) Optional. If you want to use workflow, it it required. [How to install DataSphereStudio?](https://github.com/WeBankFinTech/DataSphereStudio)  
+Linkis (0.9.1), Spark engine required.[How to install Linkis?](https://github.com/WeBankFinTech/Linkis)  
+DataSphereStudio (0.6.0) Optional. If you want to use workflow, it it required. [How to install DataSphereStudio?](https://github.com/WeBankFinTech/DataSphereStudio)  
 
 ## 2. Download
 [Download](https://github.com/WeBankFinTech/Qualitis/releases)
@@ -83,10 +83,7 @@ Cluster type
 HiveMetaStore address  
 HiveServer2 address  
 Linkis address  
-Linkis Token  
-Hive database address  
-Hive database username  
-Hive database password
+Linkis Token(How to get Linkis Token：[Linkis Access Guide](Linkis Access Guide.md))  
 
 Here is an example:  
 ![](../../../images/en_US/ch1/ClusterConfigurationDemo.png)
diff --git a/docs/en_US/ch1/UpdateGuide.md b/docs/en_US/ch1/UpdateGuide.md
@@ -0,0 +1,10 @@
+# Update Guide
+
+## update from 0.5.0 to 0.6.0
+Download code of 0.6.0 version.
+
+Execute the following code below:
+```
+mysql -u {USERNAME} -p {PASSWORD} -h {IP} --default-character-set=utf8
+source conf/database/update/update_0.5.0-0.6.0.sql
+```
diff --git a/docs/zh_CN/ch1/升级指南.md b/docs/zh_CN/ch1/升级指南.md
@@ -0,0 +1,10 @@
+# 升级指南
+
+## 0.5.0 升级 0.6.0
+下载0.6.0版本代码，并解压。
+
+执行以下数据库脚本:
+   ```
+   mysql -u {USERNAME} -p {PASSWORD} -h {IP} --default-character-set=utf8
+   source conf/database/update/update_0.5.0-0.6.0.sql
+   ```
diff --git a/docs/zh_CN/ch1/快速搭建手册.md b/docs/zh_CN/ch1/快速搭建手册.md
@@ -7,8 +7,8 @@ JDK (1.8.0_141)
 Hadoop (2.7.2)  
 Hive (1.2.1)   
 Zookeeper (3.4.9)  
-Linkis（0.9.0), 必装Spark引擎。[如何安装Linkis](https://github.com/WeBankFinTech/Linkis)  
-DataSphereStudio (0.5.0) 可选. 如果你想使用工作流，必装DataSphereStudio [如何安装DataSphereStudio?](https://github.com/WeBankFinTech/DataSphereStudio)  
+Linkis（0.9.1), 必装Spark引擎。[如何安装Linkis](https://github.com/WeBankFinTech/Linkis)  
+DataSphereStudio (0.6.0) 可选. 如果你想使用工作流，必装DataSphereStudio [如何安装DataSphereStudio?](https://github.com/WeBankFinTech/DataSphereStudio)  
 
 ## 二、安装包下载
 [下载](https://github.com/WeBankFinTech/Qualitis/releases)
@@ -83,10 +83,7 @@ sh bin/start.sh
 HiveMetaStore地址  
 HiveServer2地址  
 Linkis地址  
-Linkis Token  
-Hive数据库地址(用于连接HiveMetaStore的MySQL数据库)  
-Hive数据库用户名(用于连接HiveMetaStore的MySQL数据库)  
-Hive数据库密码(用于连接HiveMetaStore的MySQL数据库)  
+Linkis Token(Linkis Token配置方式请查看文档：[接入Linkis文档](接入Linkis文档.md))  
 
 可参考以下例子：
 ![](../../../images/zh_CN/ch1/规则配置样例.png)
diff --git a/docs/zh_CN/ch1/接入Linkis文档.md b/docs/zh_CN/ch1/接入Linkis文档.md
diff --git a/images/en_US/ch1/ClusterConfigurationDemo.png b/images/en_US/ch1/ClusterConfigurationDemo.png
diff --git a/images/zh_CN/ch1/规则配置样例.png b/images/zh_CN/ch1/规则配置样例.png
diff --git a/web/app/src/main/resources/database/init.sql b/web/app/src/main/resources/database/init.sql
diff --git a/web/app/src/main/resources/database/update/update_0.5.0-0.6.0.sql b/web/app/src/main/resources/database/update/update_0.5.0-0.6.0.sql
diff --git a/web/scheduler/src/main/java/com/webank/wedatasphere/qualitis/entity/AuthList.java b/web/scheduler/src/main/java/com/webank/wedatasphere/qualitis/entity/AuthList.java
