Merge branch 'main' into front-sensitive-fix

Author: bertcai

.gitignore

@@ -28,3 +28,8 @@ streamis-appconn/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/
+/streamis-jobmanager/streamis-job-errorcode/target/
+/streamis-jobmanager/streamis-job-audit-log/target/
+
+**/._*
+**/.flattened-pom.xml

README-ZH.md

@@ -52,7 +52,7 @@ Dimension节点、Transform节点、Sink节点 和 [Visualis](https://github.com
 
 ## 依赖的生态组件
 
-| 依赖的应用工具    | 描述                                                         | Streamis 兼容版本                               |
+| 依赖的应用工具    | 描述                                                         | 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（已发布） |

README.md

@@ -52,7 +52,7 @@ The Dimension node, Transform node, Sink node and [Visualis](https://github.com/
 
 ## Depended ecosystems
 
-| Depended Component | Description | Streamis compatibility       |
+| 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) |
@@ -115,7 +115,7 @@ please refer to [Streamis Installation and Deployment Document](docs/en_US/0.3.0
 
        For any questions or suggestions, please kindly submit an [issue](https://github.com/WeBankFinTech/Streamis/issues).
 
-       You can scan the QR code below to join our WeChat group to get more immediate response.
+       You can scan the QR code below to join our WeChat and QQ group to get more immediate response.
 
 ![comminicate](images/zh_CN/readme/communication.png)
 

assembly/pom.xml

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

conf/config.sh

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

db/streamis_ddl.sql

@@ -222,6 +222,7 @@ CREATE TABLE `linkis_stream_task` (
   `submit_user` varchar(50) DEFAULT NULL,
   `linkis_job_id` varchar(200) DEFAULT NULL,
   `linkis_job_info` mediumtext,
+  `job_start_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'streamis job startup config',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='任务表';
 
@@ -252,9 +253,39 @@ CREATE TABLE `linkis_stream_project_privilege` (
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='项目权限表';
 
 
+DROP TABLE IF EXISTS `linkis_stream_error_code`;
+
+CREATE TABLE `linkis_stream_error_code` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `error_code` varchar(50) COLLATE utf8_bin NOT NULL,
+  `error_desc` varchar(1024) COLLATE utf8_bin NOT NULL,
+  `error_regex` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
+  `error_type` int(3) DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+DROP TABLE IF EXISTS `linkis_stream_audit_log`;
+
+CREATE TABLE `linkis_stream_audit_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `user` varchar(100) COLLATE utf8_bin DEFAULT NULL,
+  `proxy_user` varchar(100) COLLATE utf8_bin DEFAULT NULL,
+  `api_name` varchar(100) COLLATE utf8_bin DEFAULT NULL,
+  `api_desc` varchar(100) COLLATE utf8_bin DEFAULT NULL,
+  `api_type` varchar(100) COLLATE utf8_bin DEFAULT NULL,
+  `operate_time` datetime DEFAULT NULL,
+  `input_parameters` text COLLATE utf8_bin,
+  `output_parameters` text COLLATE utf8_bin,
+  `project_name` varchar(100) COLLATE utf8_bin DEFAULT NULL,
+  `client_ip` varchar(100) COLLATE utf8_bin DEFAULT NULL,
+  `cost_time_mills` bigint(20) NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+
 ALTER TABLE `linkis_stream_project` ADD create_time datetime DEFAULT NULL;
 ALTER TABLE `linkis_stream_project` ADD last_update_by varchar(50) DEFAULT NULL;
 ALTER TABLE `linkis_stream_project` ADD last_update_time datetime DEFAULT NULL;
 ALTER TABLE `linkis_stream_project` ADD is_deleted tinyint unsigned DEFAULT 0;
-
+ALTER TABLE linkis_stream_project_files ADD source varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL;
 SET FOREIGN_KEY_CHECKS = 1;