WeBankFinTech · Alexkun · Feb 26, 2025 · Mar 3, 2025 · Mar 4, 2025 · Mar 4, 2025
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ streamis-appconn/target
 
 **/._*
 **/.flattened-pom.xml
+*.patch
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -54,7 +54,7 @@
                         </goals>
                         <configuration>
                             <skipAssembly>false</skipAssembly>
-                            <finalName>wedatasphere-streamis-${streamis.version}-dist</finalName>
+                            <finalName>wedatasphere-streamis-${project.version}-dist</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
                             <attach>false</attach>
                             <descriptors>

diff --git a/bin/install.sh b/bin/install.sh
@@ -119,12 +119,11 @@ cd $SERVER_HOME/;unzip $SERVERNAME.zip > /dev/null
 isSuccess "unzip  ${SERVERNAME}.zip"
 
 echo "$SERVERNAME-step3:subsitution conf"
-SERVER_CONF_PATH=$SERVER_HOME/$SERVERNAME/conf/application.yml
-sed -i  "s#port:.*#port: $SERVER_PORT#g" $SERVER_CONF_PATH
-sed -i  "s#defaultZone:.*#defaultZone: $EUREKA_URL#g" $SERVER_CONF_PATH
-sed -i  "s#hostname:.*#hostname: $SERVER_IP#g" $SERVER_CONF_PATH
-isSuccess "subsitution conf of $SERVERNAME"
-}
+SERVER_CONF_PATH=$SERVER_HOME/$SERVERNAME/conf/application.properties
+sed -i  "s#server.port.*#server.port=$SERVER_PORT#g" $SERVER_CONF_PATH
+sed -i  "s#eureka.client.serviceUrl.defaultZone.*#eureka.client.serviceUrl.defaultZone=$EUREKA_URL#g" $SERVER_CONF_PATH
+ isSuccess "subsitution conf of $SERVERNAME"
+ }
 
 function setDatasourcePassword(){
   PASSWORD=$MYSQL_PASSWORD
@@ -152,6 +151,8 @@ setDatasourcePassword
 sed -i  "s#wds.linkis.gateway.ip.*#wds.linkis.gateway.ip=$GATEWAY_INSTALL_IP#g" $SERVER_CONF_PATH
 sed -i  "s#wds.linkis.gateway.port.*#wds.linkis.gateway.port=$GATEWAY_PORT#g" $SERVER_CONF_PATH
 sed -i  "s#wds.linkis.gateway.url.*#wds.linkis.gateway.url=http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}#g" $SERVER_CONF_PATH
+sed -i  "s#\#wds.linkis.token=.*#wds.linkis.token=${STREAMIS_LINKIS_TOKEN}#g" $SERVER_CONF_PATH
+sed -i  "s#wds.linkis.flink.engine.version=.*#wds.linkis.flink.engine.version=${LINKIS_FLINK_VERSION}#g" $SERVER_CONF_PATH
 isSuccess "subsitution linkis.properties of $SERVERNAME"
 echo "<----------------$SERVERNAME:end------------------->"
 echo ""

diff --git a/conf/config.sh b/conf/config.sh
@@ -40,6 +40,12 @@ GATEWAY_PORT=9001
 STREAMIS_SERVER_INSTALL_IP=127.0.0.1
 STREAMIS_SERVER_INSTALL_PORT=9400
 
-STREAMIS_VERSION=0.3.1
+STREAMIS_VERSION=0.3.2
 
-STREAMIS_FILE_NAME="STREAMIS-$STREAMIS_VERSION"
+STREAMIS_FILE_NAME="STREAMIS-$STREAMIS_VERSION"
+
+# guarantee that the token is configured within the Linkis management console
+STREAMIS_LINKIS_TOKEN=streamis-auth
+
+# fill in the available Flink versions on Linkis.
+LINKIS_FLINK_VERSION=1.16.2
diff --git a/db/streamis_ddl.sql b/db/streamis_ddl.sql
@@ -132,10 +132,11 @@ 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、spark.jar',
+  `job_type` varchar(30) DEFAULT NULL COMMENT '目前只支持flink.sql、flink.jar',
   `submit_user` varchar(100) DEFAULT NULL,
   `workspace_name` varchar(50) DEFAULT NULL,
   `current_version` varchar(50) DEFAULT NULL,
+  `enable` tinyint(1) DEFAULT '1',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY(`project_name`, `name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='作业表';
@@ -148,14 +149,14 @@ CREATE TABLE `linkis_stream_job_version` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `job_id` varchar(50) DEFAULT NULL,
   `version` varchar(20) DEFAULT NULL,
-  `source` varchar(255) DEFAULT NULL COMMENT '这个版本的来源，比如：用户上传，由某个历史版本回退回来的',
+  `source` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin 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,
   PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE KEY(`job_id`, `version`)
+  UNIQUE KEY  `job_id`(`job_id`, `version`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='作业表';
 
 /*Table structure for table `linkis_stream_job_version_files` */
@@ -184,6 +185,10 @@ CREATE TABLE `linkis_stream_project` (
   `workspace_id` bigint(20) DEFAULT NULL,
   `name` varchar(100) DEFAULT NULL,
   `create_by` varchar(50) DEFAULT NULL,
+  `create_time` datetime DEFAULT NULL,
+  `last_update_by` varchar(50) DEFAULT NULL,
+  `last_update_time` datetime DEFAULT NULL,
+  `is_deleted` tinyint(3) unsigned DEFAULT 0,
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='项目表';
 
@@ -203,11 +208,47 @@ CREATE TABLE `linkis_stream_project_files` (
   `comment` varchar(255) DEFAULT NULL COMMENT '说明',
   `update_time` datetime DEFAULT NULL,
   `md5` varchar(100) DEFAULT NULL COMMENT '文件md5',
+  `source` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL,
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='项目表';
 
+
+/*Table structure for table `linkis_stream_project_job_template` */
+
+DROP TABLE IF EXISTS `linkis_stream_project_job_template`;
+
+CREATE TABLE `linkis_stream_project_job_template` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `store_path` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+  `name` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+  `meta_json` text COLLATE utf8_bin,
+  `version` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+  `date` datetime DEFAULT NULL,
+  `project_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
+  `enable` tinyint(1) DEFAULT '1',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+
+/*Table structure for table `linkis_stream_register_info` */
+
+
+DROP TABLE IF EXISTS `linkis_stream_register_info`;
+
+CREATE TABLE `linkis_stream_register_info` (
+   `id` bigint(20) NOT NULL AUTO_INCREMENT,
+   `job_id` bigint(20) DEFAULT NULL,
+   `application_name` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+   `password` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+   `register_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+   `heartbeat_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+   PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=171425 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+
 /*Table structure for table `linkis_stream_task` */
 
+
 DROP TABLE IF EXISTS `linkis_stream_task`;
 
 CREATE TABLE `linkis_stream_task` (
@@ -222,7 +263,10 @@ 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',
+  `server_instance` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'streamis server instance',
+  `job_start_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'streamis job startup config',
+  `solution` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'error code solution',
+  `template_id` bigint(20) DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='任务表';
 
@@ -261,6 +305,7 @@ CREATE TABLE `linkis_stream_error_code` (
   `error_desc` varchar(1024) COLLATE utf8_bin NOT NULL,
   `error_regex` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
   `error_type` int(3) DEFAULT '0',
+  `solution` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'error code solution',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 
@@ -279,13 +324,10 @@ CREATE TABLE `linkis_stream_audit_log` (
   `project_name` varchar(100) COLLATE utf8_bin DEFAULT NULL,
   `client_ip` varchar(100) COLLATE utf8_bin DEFAULT NULL,
   `cost_time_mills` bigint(20) NULL,
+  `job_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT 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;
diff --git a/db/upgrade/0.3.2/upgrade_ddl.sql b/db/upgrade/0.3.2/upgrade_ddl.sql
@@ -0,0 +1,15 @@
+
+ALTER TABLE linkis_stream_audit_log
+    ADD COLUMN `job_name` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL;
+
+ALTER TABLE linkis_stream_error_code
+    ADD COLUMN solution TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'error code solution';
+
+ALTER TABLE linkis_stream_job
+    ADD COLUMN enable tinyint(1) DEFAULT 1;
+
+ALTER TABLE linkis_stream_task
+    ADD COLUMN `solution` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'error code solution';
+
+ALTER TABLE linkis_stream_task
+    ADD COLUMN `template_id` bigint(20) DEFAULT NULL;
diff --git a/new-web/src/pages/auditLogs/index.vue b/new-web/src/pages/auditLogs/index.vue
@@ -35,6 +35,14 @@
                         >
                         </FInput>
                     </div>
+                    <div>
+                        <span class="condition-label">应用名称</span>
+                        <FInput
+                            v-model="searchForm.jobName"
+                            placeholder="搜索*，可显示所有项目级别审计记录"
+                        >
+                        </FInput>
+                    </div>
                     <div>
                         <span class="condition-label">时间范围</span>
                         <FDatePicker
@@ -92,6 +100,13 @@
                     :formatter="formatterEmptyValue"
                     ellipsis
                 />
+                <f-table-column
+                    prop="jobName"
+                    label="应用名称"
+                    :width="88"
+                    :formatter="formatterEmptyValue"
+                    ellipsis
+                />
                 <f-table-column
                     prop="operateTime"
                     label="操作时间"

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>com.webank.wedatasphere.streamis</groupId>
     <artifactId>streamis</artifactId>
-    <version>0.3.1</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <name>Streamis Project Parent POM</name>
@@ -45,16 +45,15 @@
     </modules>
 
     <properties>
-        <linkis.version>1.4.0</linkis.version>
+        <revision>0.3.2</revision>
+        <linkis.version>1.7.0</linkis.version>
         <junit.version>4.12</junit.version>
-        <dss.version>1.1.2</dss.version>
-        <streamis.version>0.3.1</streamis.version>
-        <scala.version>2.11.12</scala.version>
+        <dss.version>1.2.2</dss.version>
+        <scala.version>2.12.17</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>
         <gson.version>2.8.5</gson.version>
         <snakeyaml.version>1.31</snakeyaml.version>
-        <fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
         <math3.version>3.1.1</math3.version>
         <httpclient.version>4.5.4</httpclient.version>
         <httpmime.version>4.5.4</httpmime.version>
@@ -70,10 +69,11 @@
         <reflections.version>0.9.10</reflections.version>
         <jersey-bean-validation.version>2.21</jersey-bean-validation.version>
         <aspectj.version>1.9.5</aspectj.version>
-        <xstream.version>1.4.19</xstream.version>
-        <mysql.connector.version>5.1.47</mysql.connector.version>
+        <mysql.connector.version>8.0.28</mysql.connector.version>
         <validation.api.version>2.0.1.Final</validation.api.version>
-        <xstream.version>1.4.20</xstream.version>
+        <xstream.version>1.4.21</xstream.version>
+        <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
+        <jetty.version>9.4.54.v20240208</jetty.version>
     </properties>
 
 
@@ -152,11 +152,6 @@
                 <artifactId>gson</artifactId>
                 <version>${gson.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${fasterxml.jackson.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-math3</artifactId>
@@ -225,6 +220,31 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>flatten-maven-plugin</artifactId>
+                    <version>${flatten-maven-plugin.version}</version>
+                    <configuration>
+                        <updatePomFile>true</updatePomFile>
+                        <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>flatten</id>
+                            <goals>
+                                <goal>flatten</goal>
+                            </goals>
+                            <phase>process-resources</phase>
+                        </execution>
+                        <execution>
+                            <id>flatten.clean</id>
+                            <goals>
+                                <goal>clean</goal>
+                            </goals>
+                            <phase>clean</phase>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -276,7 +296,17 @@
                 <plugin>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>4.8.1</version>
+                    <configuration>
+                        <recompileMode>incremental</recompileMode>
+                        <args>
+                            <arg>-unchecked</arg>
+                            <arg>-deprecation</arg>
+                            <arg>-feature</arg>
+                            <arg>-explaintypes</arg>
+                            <arg>-target:jvm-8</arg>
+                        </args>
+                    </configuration>
                     <executions>
                         <execution>
                             <id>eclipse-add-source</id>
@@ -286,31 +316,19 @@
                         </execution>
                         <execution>
                             <id>scala-compile-first</id>
-                            <phase>process-resources</phase>
                             <goals>
                                 <goal>compile</goal>
                             </goals>
+                            <phase>process-resources</phase>
                         </execution>
                         <execution>
                             <id>scala-test-compile-first</id>
-                            <phase>process-test-resources</phase>
                             <goals>
                                 <goal>testCompile</goal>
                             </goals>
-                        </execution>
-                        <execution>
-                            <id>attach-scaladocs</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>doc-jar</goal>
-                            </goals>
+                            <phase>process-test-resources</phase>
                         </execution>
                     </executions>
-                    <configuration>
-                        <scalaVersion>${scala.version}</scalaVersion>
-                        <recompileMode>incremental</recompileMode>
-                        <useZincServer>true</useZincServer>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -319,5 +337,11 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 </project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,3 +33,4 @@ streamis-appconn/target

		*/._
		**/.flattened-pom.xml
		*.patch