Merge remote-tracking branch 'origin/dev-1.3.2-mongodb' into dev-1.3.…

…2-mongodb

.github/workflows/build-backend.yml

@@ -37,7 +37,7 @@ jobs:
     - name: Build backend by maven
       run:
         ./mvnw clean package
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v3.0.0
+#    - name: Upload coverage to Codecov
+#      uses: codecov/codecov-action@v3.0.0
 #      with:
 #        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/publish-docker.yaml

@@ -19,7 +19,7 @@ name: Publish Docker
 on: 
   push:
     branches:
-      - dev-1.3.0
+      - dev-1.3.1
 jobs:
   publish-docker:
     runs-on: ubuntu-latest
@@ -31,7 +31,7 @@ jobs:
       TAG: ${{ github.sha }}
       SKIP_TEST: true
       HUB: ghcr.io/apache/incubator-linkis
-      LINKIS_VERSION: 1.3.0
+      LINKIS_VERSION: 1.3.1
     steps:
     - name: Checkout
       uses: actions/checkout@v2

README.md

@@ -3,9 +3,8 @@
 </h2>
 
 <p align="center">
-  <strong>Linkis builds a computation middleware layer to decouple the upper applications and the underlying data engines,
-  provides standardized interfaces (REST, JDBC, WebSocket etc.) to easily connect to various underlying engines (Spark, Presto, Flink, etc.),
-  while enables cross engine context sharing, unified job& engine governance and orchestration.</strong>
+  <strong> Linkis builds a computation middleware layer to facilitate connection, 
+    governance and orchestration between the upper applications and the underlying data engines. </strong>
 </p>
 <p align="center">
   <a href="https://linkis.apache.org/">https://linkis.apache.org/</a>
@@ -31,7 +30,7 @@
         <img src="https://img.shields.io/badge/JDK-8-green.svg" />
     </a>
     <a target="_blank" href="https://github.com/apache/incubator-linkis/actions">
-        <img src="https://github.com/apache/incubator-linkis/actions/workflows/build.yml/badge.svg" />
+        <img src="https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg" />
     </a>
 
    <a target="_blank" href='https://github.com/apache/incubator-linkis'>
@@ -43,9 +42,6 @@
    <a target="_blank" href='https://github.com/apache/incubator-linkis'>
         <img src="https://img.shields.io/github/contributors/apache/incubator-linkis.svg" alt="github contributors"/>
    </a>
-   <a target="_blank" href="https://codecov.io/gh/apache/incubator-linkis">
-        <img src="https://codecov.io/gh/apache/incubator-linkis/branch/master/graph/badge.svg" />
-   </a>
   <a target="_blank" href="https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT">
        <img src="https://badges.toozhao.com/badges/01G7TRNN1PH9PMSCYWDF3EK4QT/green.svg" />
   </a>
@@ -113,8 +109,8 @@ Please go to the [Linkis Releases Page](https://linkis.apache.org/download/main)
 # Compile and Deploy
 
 > For more detailed guidance see:
->- [[Backend Compile]](https://linkis.apache.org/docs/latest/development/linkis-compile-and-package)
->- [[Management Console Build]](https://linkis.apache.org/docs/latest/development/web-build)
+>- [[Backend Compile]](https://linkis.apache.org/docs/latest/development/build)
+>- [[Management Console Build]](https://linkis.apache.org/docs/latest/development/build-console)
 
 ```shell
 
@@ -159,12 +155,12 @@ To solve this problem, we provide a script which can help to creating an custom
 linkis image by yourself, the image created by this tool will be tagged as `linkis:with-jdbc` by default.
 
 ```shell
-$> LINKIS_IMAGE=linkis:1.3.0 
+$> LINKIS_IMAGE=linkis:1.3.1 
 $> ./linkis-dist/docker/scripts/make-linikis-image-with-mysql-jdbc.sh
 ```
 
 
-Please refer to [Quick Deployment](https://linkis.apache.org/docs/latest/deployment/quick-deploy) to do the deployment.
+Please refer to [Quick Deployment](https://linkis.apache.org/docs/latest/deployment/deploy-quick/) to do the deployment.
 
 # Examples and Guidance
 - [User Manual](https://linkis.apache.org/docs/latest/user-guide/overview)

README_CN.md

@@ -3,8 +3,7 @@
 </h2>
 
 <p align="center">
-  <strong>Linkis 在上层应用和底层引擎之间构建了一层计算中间件。通过使用Linkis 提供的REST/WebSocket/JDBC 等标准接口，
-  上层应用可以方便地连接访问Spark, Presto, Flink 等底层引擎,同时实现跨引擎上下文共享、统一的计算任务和引擎治理与编排能力</strong>
+  <strong>Linkis 构建了一层计算中间件，方便上层应用与底层数据引擎之间的连接、治理和编排 </strong>
 </p>
 <p align="center">
   <a href="https://linkis.apache.org/">https://linkis.apache.org/</a>
@@ -42,9 +41,6 @@
    <a target="_blank" href='https://github.com/apache/incubator-linkis'>
         <img src="https://img.shields.io/github/contributors/apache/incubator-linkis.svg" alt="github contributors"/>
    </a>
-   <a target="_blank" href="https://codecov.io/gh/apache/incubator-linkis">
-        <img src="https://codecov.io/gh/apache/incubator-linkis/branch/master/graph/badge.svg" />
-   </a>
   <a target="_blank" href="https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT">
        <img src="https://badges.toozhao.com/badges/01G7TRNN1PH9PMSCYWDF3EK4QT/green.svg" />
   </a>
@@ -109,8 +105,8 @@ Linkis 自 2019 年开源发布以来，已累计积累了 700 多家试验企
 # 编译和安装部署
 
 > 更详细的步骤参见:
->- [后端编译打包 ](https://linkis.apache.org/zh-CN/docs/latest/development/linkis-compile-and-package)
->- [管理台编译 ](https://linkis.apache.org/zh-CN/docs/latest/development/web-build)
+>- [后端编译打包 ](https://linkis.apache.org/zh-CN/docs/latest/development/build)
+>- [管理台编译 ](https://linkis.apache.org/zh-CN/docs/latest/development/build-console)
 
 
 
@@ -151,11 +147,11 @@ npm run build
 我们提供了一个脚本，它可以帮助你快速的基于官方的 Linkis 镜像创建一个集成了MySQL JDBC 的自定义镜像。 这个工具创建的镜像默认的名称是 `linkis:with-jdbc`。
 
 ```shell
-$> LINKIS_IMAGE=linkis:1.3.0 
+$> LINKIS_IMAGE=linkis:1.3.1 
 $> ./linkis-dist/docker/scripts/make-linikis-image-with-mysql-jdbc.sh
 ```
 
-请参考[快速安装部署 ](https://linkis.apache.org/zh-CN/docs/latest/deployment/quick-deploy) 来部署 Linkis
+请参考[快速安装部署 ](https://linkis.apache.org/zh-CN/docs/latest/deployment/deploy-quick/) 来部署 Linkis
 
 # 示例和使用指引
 

docs/errorcode/linkis-engineconn-plugin-core-errorcode.md

@@ -8,8 +8,9 @@
 |linkis-engineconn-plugin-core |20000|Cannot find default ExecutorFactory(找不到默认的 ExecutorFactory)|CANNOT_DEFAULT_EF|EngineconnCoreErrorCodeSummary|
 |linkis-engineconn-plugin-core |20000|EngineTypeLabel is not exists(EngineTypeLabel 不存在)|ETL_NOT_EXISTS|EngineconnCoreErrorCodeSummary|
 |linkis-engineconn-plugin-core |20000|UserCreatorLabel is not exists(UserCreatorLabel 不存在)|UCL_NOT_EXISTS|EngineconnCoreErrorCodeSummary|
+|linkis-engineconn-plugin-core |20001|The dist of EngineConn is empty,engineConnType(EngineConn 的 dist 为空,engineConnType):{0}|DIST_IS_EMPTY|EngineconnCoreErrorCodeSummary|
 |linkis-engineconn-plugin-core |20001|Cannot find the home path of engineConn(找不到engineConn的home路径)|CANNOT_HOME_PATH_EC|EngineconnCoreErrorCodeSummary|
-|linkis-engineconn-plugin-core |20001|Cannot find the home path of engineconn dist(找不到 engineconn dist 的home路径)|CANNOT_HOME_PATH_DIST|EngineconnCoreErrorCodeSummary|
+|linkis-engineconn-plugin-core |20001|Cannot find the path of engineConn with specified version: {0} and engineConnType: {1}(找不到版本为：{0} engineConnType 为:{1}的engineConn路径|ENGIN_VERSION_NOT_FOUND|EngineconnCoreErrorCodeSummary|
 |linkis-engineconn-plugin-core |20001|The dist of EngineConn is empty,engineConnType(EngineConn 的 dist 为空,engineConnType):{0}|DIST_IS_EMPTY|EngineconnCoreErrorCodeSummary|
 |linkis-engineconn-plugin-core |20001|The dist of EngineConn is irregular, both the version dir and non-version dir are exist,engineConnType(EngineConn的dist是不规则的，版本目录和非版本目录都存在,engineConnType):{0}|DIST_IRREGULAR_EXIST|EngineconnCoreErrorCodeSummary|
 |linkis-engineconn-plugin-core |20001|System have no permission to delete old engineConn file,File(系统无权删除旧的engineConn文件,File):{0}|NO_PERMISSION_FILE|EngineconnCoreErrorCodeSummary|

docs/info-1.1.7.md

@@ -0,0 +1,5 @@
+## 参数变化
+
+| 模块名(服务名)| 类型  |     参数名                                                | 默认值             | 描述                                                    |
+| ----------- | ----- | -------------------------------------------------------- | ---------------- | ------------------------------------------------------- |
+|cg-entrance | 新增  | wds.linkis.entrance.user.creator.ip.interceptor.switch=false  | false|是否开启ip地址拦截|

linkis-commons/linkis-common/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.linkis</groupId>
     <artifactId>linkis</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/ErrorCodeUtils.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisCommonsErrorCodeSummary.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisComputationGovernanceErrorCodeSummary.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisEngineConnErrorCodeSummary.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisErrorCodeSummary.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisExtensionErrorCodeSummary.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisFrameErrorCodeSummary.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisPublicEnhancementErrorCodeSummary.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisSpringCloudServiceErrorCodeSummary.java

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,7 +6,7 @@
  * (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
+ *    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,

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

@@ -6,14 +6,15 @@
  * (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
+ *    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 org.apache.linkis.common.exception.VariableOperationFailedException;

linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/ServiceInstance.scala

@@ -25,12 +25,9 @@ class ServiceInstance {
   def setInstance(instance: String): Unit = this.instance = instance
   def getInstance: String = instance
 
-  def canEqual(other: Any): Boolean = other.isInstanceOf[ServiceInstance]
-
   override def equals(other: Any): Boolean = other match {
     case that: ServiceInstance =>
-      (that canEqual this) &&
-        applicationName == that.applicationName &&
+      applicationName == that.applicationName &&
         instance == that.instance
     case _ => false
   }