Merge pull request #93 from WeDataSphere/dev-0.3.0

Add Streamis 0.3.0

Author: wushengyeyouya

.gitignore

@@ -20,4 +20,11 @@ streamis-appconn/target
 /logs/streamis-server.log
 /logs/linkis.log
 /test/target
-/test/src
+/test/src
+/streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/target/
+/streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector/target/
+/streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector1x/target/
+/streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector-core/target/
+/streamis-jobmanager/streamis-job-log/job-log-collector/xspark-streamis-log-collector/target/
+/streamis-jobmanager/streamis-job-log/streamis-job-log-common/target/
+/streamis-jobmanager/streamis-job-log/streamis-job-log-server/target/

README-ZH.md

@@ -46,16 +46,16 @@ Dimension节点、Transform节点、Sink节点 和 [Visualis](https://github.com
 ![流式应用配置](docs/images/stream_job_config_1.png)
 ![流式应用配置](docs/images/stream_job_config_2.png)
 
-       更多功能，请参考：[Streamis 用户手册](docs/zh_CN/0.2.0/使用文档/Streamis用户手册.md)。
+       更多功能，请参考：[Streamis 用户手册](docs/zh_CN/使用文档/Streamis用户手册.md)。
 
 ----
 
 ## 依赖的生态组件
 
-| 依赖的应用工具    | 描述                                                         | Streamis 兼容版本 |
-|--------------|---------------------------------------------------------------|--------------|
-| [DataSphereStudio](https://github.com/WeBankFinTech/DataSphereStudio) | 数据应用开发管理集成框架。以工作流式的图形化拖拽开发体验，将满足从数据交换、脱敏清洗、分析挖掘、质量检测、可视化展现、定时调度到数据输出应用等，数据应用开发全流程场景需求。 | >= DSS1.1.0（已发布）|
-| [Linkis](https://github.com/apache/incubator-linkis) | 计算中间件 Apache Linkis，通过提供 REST/WebSocket/JDBC/SDK 等标准接口，上层应用可以方便地连接访问 MySQL/Spark/Hive/Presto/Flink 等底层引擎。 | >= Linkis1.1.1（已发布），部分功能需要Linkis 1.1.2支持 |
+| 依赖的应用工具    | 描述                                                         | Streamis 兼容版本                               |
+|--------------|---------------------------------------------------------------|---------------------------------------------|
+| [DataSphereStudio](https://github.com/WeBankFinTech/DataSphereStudio) | 数据应用开发管理集成框架。以工作流式的图形化拖拽开发体验，将满足从数据交换、脱敏清洗、分析挖掘、质量检测、可视化展现、定时调度到数据输出应用等，数据应用开发全流程场景需求。 | >= DSS1.1.2（已发布）                         |
+| [Linkis](https://github.com/apache/incubator-linkis) | 计算中间件 Apache Linkis，通过提供 REST/WebSocket/JDBC/SDK 等标准接口，上层应用可以方便地连接访问 MySQL/Spark/Hive/Presto/Flink 等底层引擎。 | >= Linkis1.4.0（已发布） |
 
 ----
 
@@ -73,14 +73,14 @@ Dimension节点、Transform节点、Sink节点 和 [Visualis](https://github.com
 
 ## 编译和安装部署
 
-       请参考 [Streamis 安装部署文档](docs/zh_CN/0.2.0/Streamis安装文档.md) ，用于安装部署 Streamis 及其依赖环境。
+       请参考 [Streamis 安装部署文档](docs/zh_CN/安装文档/Streamis安装文档.md) ，用于安装部署 Streamis 及其依赖环境。
 
 
 ----
 
 ## 示例和使用指引
 
-       请到 [用户使用文档](docs/zh_CN/0.2.0/使用文档/Streamis用户手册.md) ，了解如何快速使用 Streamis。
+       请到 [用户使用文档](docs/zh_CN/使用文档/Streamis用户手册.md) ，了解如何快速使用 Streamis。
 
 ----
 

README.md

@@ -52,10 +52,10 @@ The Dimension node, Transform node, Sink node and [Visualis](https://github.com/
 
 ## Depended ecosystems
 
-| Depended Component | Description | Streamis compatibility |
-| -------------- | -------------------------------------------------------------- | --------------|
-| [DataSphereStudio](https://github.com/WeBankFinTech/DataSphereStudio) | Data application development management framework. With a unified UI, the workflow-like graphical drag-and-drop development experience meets the entire lifecycle of data application development from data import, desensitization cleaning, data analysis, data mining, quality inspection, visualization, scheduling to data output applications, etc. | >= DSS1.1.0 (Released) |
-| [Linkis](https://github.com/apache/incubator-linkis) | Apache Linkis, builds a layer of computation middleware, by using standard interfaces such as REST/WS/JDBC provided by Linkis, the upper applications can easily access the underlying engines such as MySQL/Spark/Hive/Presto/Flink, etc. | >= Linkis1.1.1 (Released),some functions need to be supported by linkis 1.1.2 |
+| Depended Component | Description | Streamis compatibility       |
+| -------------- | -------------------------------------------------------------- |------------------------------|
+| [DataSphereStudio](https://github.com/WeBankFinTech/DataSphereStudio) | Data application development management framework. With a unified UI, the workflow-like graphical drag-and-drop development experience meets the entire lifecycle of data application development from data import, desensitization cleaning, data analysis, data mining, quality inspection, visualization, scheduling to data output applications, etc. | >= DSS1.1.2 (Released)    |
+| [Linkis](https://github.com/apache/linkis) | Apache Linkis, builds a layer of computation middleware, by using standard interfaces such as REST/WS/JDBC provided by Linkis, the upper applications can easily access the underlying engines such as MySQL/Spark/Hive/Presto/Flink, etc. | >= Linkis1.4.0 (Released) |
 
 ## Demo Trial environment
 
@@ -71,7 +71,7 @@ The Dimension node, Transform node, Sink node and [Visualis](https://github.com/
 
 ## Compile and install deployment
 
-please refer to [Streamis Installation and Deployment Document](docs/en_US/0.2.0/StreamisDeployment.md) for installing and deploying Streamis.
+please refer to [Streamis Installation and Deployment Document](docs/en_US/0.3.0/StreamisDeployment.md) for installing and deploying Streamis.
 
 ----
 

assembly/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.2.0</version>
+        <version>0.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bin/upgrade.sh

@@ -40,6 +40,6 @@ GATEWAY_PORT=9001
 STREAMIS_SERVER_INSTALL_IP=127.0.0.1
 STREAMIS_SERVER_INSTALL_PORT=9400
 
-STREAMIS_VERSION=0.2.0
+STREAMIS_VERSION=0.3.0
 
 STREAMIS_FILE_NAME="STREAMIS-$STREAMIS_VERSION"

conf/config.sh

@@ -1,8 +1,6 @@
-### for DSS-Server and Eventchecker APPCONN
+### for Streamis-Server
 MYSQL_HOST=
 MYSQL_PORT=
 MYSQL_DB=
 MYSQL_USER=
-MYSQL_PASSWORD=
-
-
+MYSQL_PASSWORD=

conf/db.sh

@@ -132,9 +132,10 @@ CREATE TABLE `linkis_stream_job` (
   `create_time` datetime DEFAULT NULL,
   `label` varchar(200) DEFAULT NULL,
   `description` varchar(200) DEFAULT NULL,
-  `job_type` varchar(30) DEFAULT NULL COMMENT '目前只支持flink.sql、flink.jar',
+  `job_type` varchar(30) DEFAULT NULL COMMENT '目前只支持flink.sql、flink.jar、spark.jar',
   `submit_user` varchar(100) DEFAULT NULL,
   `workspace_name` varchar(50) DEFAULT NULL,
+  `current_version` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY(`project_name`, `name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='作业表';
@@ -149,6 +150,7 @@ CREATE TABLE `linkis_stream_job_version` (
   `version` varchar(20) DEFAULT NULL,
   `source` varchar(255) DEFAULT NULL COMMENT '这个版本的来源，比如：用户上传，由某个历史版本回退回来的',
   `job_content` text COMMENT '内容为meta.json',
+  `manage_mode` varchar(30) DEFAULT 'EngineConn' COMMENT 'Manage mode',
   `comment` varchar(255) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
   `create_by` varchar(32) DEFAULT NULL,
@@ -199,6 +201,8 @@ CREATE TABLE `linkis_stream_project_files` (
   `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
   `create_by` varchar(32) DEFAULT NULL,
   `comment` varchar(255) DEFAULT NULL COMMENT '说明',
+  `update_time` datetime DEFAULT NULL,
+  `md5` varchar(100) DEFAULT NULL COMMENT '文件md5',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='项目表';