merge code

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,7 +12,7 @@ and session management.
 
 ### Related issues/PRs
 
-Related issues: #590
+Related issues: close #590 close #591
 Related pr:#591
 
 

.github/workflows/check-license.yml

@@ -36,7 +36,7 @@ jobs:
           echo "rat_file=$rat_file"
           if [[ -n "$rat_file" ]];then  echo "check error!" && cat $rat_file && exit 123;else echo "check success!" ;fi
       - name: Upload the report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: license-check-report
           path: "**/target/rat.txt"

.github/workflows/integration-test.yml

@@ -45,7 +45,7 @@ jobs:
       TAG: ${{ github.sha }}
       SKIP_TEST: true
       HUB: ghcr.io/apache/linkis
-      LINKIS_VERSION: 1.5.0-SNAPSHOT
+      LINKIS_VERSION: 1.6.0
     steps:
       - name: Free up disk space
         run: |

.github/workflows/publish-docker.yaml

@@ -34,7 +34,7 @@ jobs:
       TAG: ${{ github.sha }}
       SKIP_TEST: true
       HUB: ghcr.io/apache/linkis
-      LINKIS_VERSION: 1.5.0-SNAPSHOT
+      LINKIS_VERSION: 1.6.0
     steps:
     - name: Checkout
       uses: actions/checkout@v2

.github/workflows/publish-snapshot.yml

@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         branch:
-          - dev-1.4.0
+          - dev-1.6.0
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

LICENSE

@@ -241,6 +241,7 @@ The following file are provided under the Apache 2.0 License.
     linkis-engineconn-plugins/hbase/hbase-shims-1.4.3/src/main/resources/hbase-ruby/*
     linkis-engineconn-plugins/hbase/hbase-shims-2.2.6/src/main/resources/hbase-ruby/*
     linkis-engineconn-plugins/hbase/hbase-shims-2.5.3/src/main/resources/hbase-ruby/*
+    linkis-engineconn-plugins/spark/src/main/java/org/apache/linkis/engineplugin/spark/executor/SecureRandomStringUtils.java
 
 The files:
     .mvn/wrapper/MavenWrapperDownloader.java

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/FatalException.java

@@ -17,7 +17,7 @@
 
 package org.apache.linkis.common.exception;
 
-public class FatalException extends LinkisRuntimeException {
+public class FatalException extends LinkisException {
   private ExceptionLevel level = ExceptionLevel.FATAL;
 
   public FatalException(int errCode, String desc) {

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java

@@ -44,6 +44,8 @@ public interface Fs extends Closeable {
 
   boolean canRead(FsPath dest) throws IOException;
 
+  boolean canRead(FsPath dest, String user) throws IOException;
+
   boolean canWrite(FsPath dest) throws IOException;
 
   boolean exists(FsPath dest) throws IOException;

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/JobHistoryInfo.java

@@ -0,0 +1,215 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.common.utils;
+
+import java.util.Date;
+
+public class JobHistoryInfo {
+  private String jobReqId;
+  private String submitUser;
+  private String executeUser;
+  private String source;
+  private String labels;
+  private String params;
+  private String progress;
+  private String status;
+  private String logPath;
+  private Integer errorCode;
+  private String errorDesc;
+  private Date createdTime;
+  private Date updatedTime;
+  private String instances;
+  private String metrics;
+  private String engineType;
+  private String executionCode;
+
+  public String getJobReqId() {
+    return jobReqId;
+  }
+
+  public void setJobReqId(String jobReqId) {
+    this.jobReqId = jobReqId;
+  }
+
+  public String getSubmitUser() {
+    return submitUser;
+  }
+
+  public void setSubmitUser(String submitUser) {
+    this.submitUser = submitUser;
+  }
+
+  public String getExecuteUser() {
+    return executeUser;
+  }
+
+  public void setExecuteUser(String executeUser) {
+    this.executeUser = executeUser;
+  }
+
+  public String getSource() {
+    return source;
+  }
+
+  public void setSource(String source) {
+    this.source = source;
+  }
+
+  public String getLabels() {
+    return labels;
+  }
+
+  public void setLabels(String labels) {
+    this.labels = labels;
+  }
+
+  public String getParams() {
+    return params;
+  }
+
+  public void setParams(String params) {
+    this.params = params;
+  }
+
+  public String getProgress() {
+    return progress;
+  }
+
+  public void setProgress(String progress) {
+    this.progress = progress;
+  }
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public String getLogPath() {
+    return logPath;
+  }
+
+  public void setLogPath(String logPath) {
+    this.logPath = logPath;
+  }
+
+  public Integer getErrorCode() {
+    return errorCode;
+  }
+
+  public void setErrorCode(Integer errorCode) {
+    this.errorCode = errorCode;
+  }
+
+  public String getErrorDesc() {
+    return errorDesc;
+  }
+
+  public void setErrorDesc(String errorDesc) {
+    this.errorDesc = errorDesc;
+  }
+
+  public Date getCreatedTime() {
+    return createdTime;
+  }
+
+  public void setCreatedTime(Date createdTime) {
+    this.createdTime = createdTime;
+  }
+
+  public Date getUpdatedTime() {
+    return updatedTime;
+  }
+
+  public void setUpdatedTime(Date updatedTime) {
+    this.updatedTime = updatedTime;
+  }
+
+  public String getInstances() {
+    return instances;
+  }
+
+  public void setInstances(String instances) {
+    this.instances = instances;
+  }
+
+  public String getMetrics() {
+    return metrics;
+  }
+
+  public void setMetrics(String metrics) {
+    this.metrics = metrics;
+  }
+
+  public String getEngineType() {
+    return engineType;
+  }
+
+  public void setEngineType(String engineType) {
+    this.engineType = engineType;
+  }
+
+  public String getExecutionCode() {
+    return executionCode;
+  }
+
+  public void setExecutionCode(String executionCode) {
+    this.executionCode = executionCode;
+  }
+
+  public JobHistoryInfo(
+      String jobReqId,
+      String submitUser,
+      String executeUser,
+      String source,
+      String labels,
+      String params,
+      String progress,
+      String status,
+      String logPath,
+      Integer errorCode,
+      String errorDesc,
+      Date createdTime,
+      Date updatedTime,
+      String instances,
+      String metrics,
+      String engineType,
+      String executionCode) {
+    this.jobReqId = jobReqId;
+    this.submitUser = submitUser;
+    this.executeUser = executeUser;
+    this.source = source;
+    this.labels = labels;
+    this.params = params;
+    this.progress = progress;
+    this.status = status;
+    this.logPath = logPath;
+    this.errorCode = errorCode;
+    this.errorDesc = errorDesc;
+    this.createdTime = createdTime;
+    this.updatedTime = updatedTime;
+    this.instances = instances;
+    this.metrics = metrics;
+    this.engineType = engineType;
+    this.executionCode = executionCode;
+  }
+
+  public JobHistoryInfo() {}
+}