Merge pull request #79 from WeBankFinTech/1.1.1

Merge branch 1.1.1 to main

Author: zqburde

en_US/Development_Documentation/AppConn_Development_Guide.md

@@ -260,7 +260,7 @@ The ```ProjectResponseRef``` is relatively simple, only requires the user to ret
 
 Among them, only ```ProjectCreationOperation``` and ```ProjectSearchOperation``` require a ```ProjectResponseRef``` containing a ```refProjectId```, while ```ProjectUpdateOperation``` and ` ``ProjectDeletionOperation``` is only required to return a ```ResponseRef```, which simply tells the DSS framework whether the delete and update operations were successful.
 
-You can also refer to the implementation of VisualisAppConn: [Please click me to view](https://github.com/WeDataSphere/DataSphereStudio/tree/dev-1.1.0/dss-appconn/appconns/dss-visualis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/visualis/project)
+You can also refer to the implementation of VisualisAppConn: [Please click me to view](https://github.com/WeBankFinTech/Visualis/tree/master/visualis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/visualis/project)
 
 ### 2.3 OnlyDevelopmentAppConn - access to DSS development process specification
 

en_US/Development_Documentation/Compilation_Documentation.md

@@ -6,8 +6,8 @@
 
 ```xml
   <properties>
-          <dss.version>1.0.0</dss.version>
-          <linkis.version>1.0.2</linkis.version>
+          <dss.version>1.1.1</dss.version>
+          <linkis.version>1.1.1</linkis.version>
           <scala.version>2.11.12</scala.version>
           <jdk.compile.version>1.8</jdk.compile.version>
           <maven.version>3.3.3</maven.version>

en_US/Installation_and_Deployment/DSS&Linkis_one-click_deployment_document_stand-alone_version.md

@@ -66,7 +66,7 @@
 
 ### 3. Prepare the installation package
 
-- Users can compile their own or go to the release page to download the installation package：[DSS Release-1.1.0](https://github.com/WeBankFinTech/DataSphereStudio/releases/tag/1.1.0)
+- Users can compile their own or go to the release page to download the installation package：[DSS Release-1.1.1](https://github.com/WeBankFinTech/DataSphereStudio/releases/tag/1.1.1)
 
   **Please note: In order to use Visualis1.0.0 and Exchangis1.0.0 normally, please go to the releases page to download the latest one-click installation deployment package. **
 

en_US/Installation_and_Deployment/DSS_1.0.1_upgrade_to_1.1.0_using_documentation.md

@@ -1,4 +1,4 @@
-# DataSphere Studio 1.0.1 upgrade to 1.1.0 using documentation
+# DataSphere Studio 1.0.1 upgrade to 1.1.0 using documentation(apply to 1.01 to 1.1.1)
 
 ### The upgrade steps are mainly divided into:
 - service stopped
@@ -23,7 +23,7 @@ How to get the upgrade sql script:
 
 Then log in to the dss database and execute the source command:
 
-```roomsql
+```shell
 source ${your_path}/from_v101_to_v110.sql
 ```
 It can be executed successfully under normal circumstances.

en_US/Installation_and_Deployment/DolphinScheduler_Plugin_Installation_Documentation.md

@@ -10,7 +10,7 @@ For the installation and deployment of `DolphinScheduler`, please refer to：[`D
 
 ## 2. Download and compile
 
-The `DolphinSchedulerAppConn` plugin installation package can be downloaded from here: [Click me to download the `DolphinSchedulerAppConn` plugin installation package]().
+The `DolphinSchedulerAppConn` plugin installation package can be downloaded from here: [Click me to download the `DolphinSchedulerAppConn` plugin installation package](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dolphinscheduler-appconn.zip)
 
 If you want to compile `DolphinSchedulerAppConn` yourself, the specific compilation steps are as follows:
 
@@ -72,6 +72,8 @@ Please note: Do not enter `localhost` or `127.0.0.1` for the ip of dolphinschedu
 ### 3.2 Modify the jar package
 #### 3.2.1 Put dss-dolphinscheduler-token.jar under lib of dss-framework-project
 
+The plugin installation package can be downloaded from here: [Click me to download plugin installation package](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dss-dolphinscheduler-token-1.1.1.jar)
+
 The role of this Jar package is to provide the `/api/rest_j/v1/dss/framework/project/ds/token` interface, which is used to request the interface of DolphinScheduler without password.
 
 How to obtain the Jar package: After DSS is compiled, it can be obtained from the `plugins/dolphinscheduler` directory:
@@ -84,11 +86,13 @@ Upload the Jar package to the DSS deployment directory: `${DSS_HOME}/lib/dss-fra
 sh sbin/dss-daemon.sh restart project-server
 ```
 
-#### 3.2.2 Put dolphinscheduler-prod-metrics.jar into DolphinScheduler's lib directory
+#### 3.2.2 Put dolphinscheduler-prod-metrics-with-dependencies.jar into DolphinScheduler's lib directory
+
+The plugin installation package can be downloaded from here: [Click me to download plugin installation package](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dolphinscheduler-prod-metrics-1.1.1-jar-with-dependencies.jar)
 
 This step is to add the custom interface implementation Jar package of DolphinScheduler to the lib directory of the DolphinScheduler service, and restart the DolphinScheduler service to make it effective.
 
-Jar acquisition method: There are dolphinscheduler related plug-in packages in the plugins directory compiled from DSS, as shown in the figure:
+Jar acquisition method: There are dolphinscheduler related plugin packages in the plugins directory compiled from DSS, as shown in the figure:
 
 ![img_6.png](../Images/Install_and_Deploy/DolphinschedulerAppConn_deployment/img_6.png)
 
@@ -150,7 +154,7 @@ In order for `DolphinScheduler` to normally schedule workflow node jobs in DataS
 
 ### 4.1 Installation package preparation
 
-The `dss-dolphinscheduler-client` plugin installation package can be downloaded from here: [Click me to download the plugin installation package](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/dss-dolphinscheduler-client.zip)
+The `dss-dolphinscheduler-client` plugin installation package can be downloaded from here: [Click me to download the plugin installation package](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dss-dolphinscheduler-client.zip)
 
 If you want to compile `dss-dolphinscheduler-client` yourself, the specific compilation steps are as follows:
 

en_US/Installation_and_Deployment/SchedulisAppConn_Plugin_Installation_Documentation.md

@@ -9,7 +9,7 @@
 - You need to install and run Schedulis first, you can refer to: [Schedulis deployment documentation](https://github.com/WeBankFinTech/Schedulis/blob/master/docs/schedulis_deploy_cn.md)
 
 # 2. Compile the AppConn plugin package separately
-- The user first needs to check whether the schedulis directory exists under the xx/dss_linkis/dss/dss-appconns directory. If the user does not exist, the user needs to download the schedulis plugin
+- The user first needs to check whether the schedulis directory exists under the xx/dss_linkis/dss/dss-appconns directory. If the user does not exist, the user needs to download the schedulis plugin. [click me to download](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/Schedulis/schedulis_appconn_DSS1.1.1/schedulis-appconn.zip)
 - The user installs Schedulis AppConn by executing the script appconn-install.sh, and only needs to enter the specific IP and Port of the machine where Schedulis WEB is deployed, and the AppConn plug-in installation can be completed. When the script is executed, the init.sql script under the corresponding AppConn will be executed, and the corresponding database information will be inserted into the DSS table
 ```shell
 ## Change directory to the installation directory of DSS

zh_CN/安装部署/DSS&Linkis一键部署文档单机版.md

@@ -79,7 +79,7 @@
 
 ### 三、准备安装包
 
-- 用户可以自行编译或者去 release 页面下载安装包：[DSS Release-1.1.0](https://github.com/WeBankFinTech/DataSphereStudio/releases/tag/1.1.0)
+- 用户可以自行编译或者去 release 页面下载安装包：[DSS Release-1.1.1](https://github.com/WeBankFinTech/DataSphereStudio/releases/tag/1.1.1)
 
   **请注意：为了能正常使用 Visualis1.0.0 和 Exchangis1.0.0，请去 releases 页面下载最新的一键安装部署包。**
 
@@ -147,7 +147,7 @@ DSS_NGINX_IP=127.0.0.1
 DSS_WEB_PORT=8085
 
 ### DSS VERSION
-DSS_VERSION=1.1.0
+DSS_VERSION=1.1.1
 
 
 ############## linkis的其他默认配置信息 start ############## 

zh_CN/安装部署/DSS1.0.1到1.1.0升级文档.md

@@ -23,7 +23,7 @@ sh sbin/dss-stop-all.sh
 
 然后登陆dss数据库执行source命令：
 
-```roomsql
+```shell
 source ${your_path}/from_v101_to_v110.sql
 ```
 正常情况下可以执行成功。

zh_CN/安装部署/DSS1.1.0到1.1.1升级文档.md

@@ -0,0 +1,54 @@
+# DataSphere Studio 1.1.0 升级到 1.1.1 使用文档
+
+### 升级步骤主要分为：
+- 服务停止
+- 执行数据库升级脚本
+- 替换相关jar包
+- 替换前端包
+- 服务启动
+
+### 1. 服务停止
+进入到dss的部署目录，在目录下执行命令停止dss的所有服务：
+```shell
+cd ${DSS_DEPLOY_PATH}
+
+sh sbin/dss-stop-all.sh
+```
+### 2. 执行数据库升级sql脚本
+
+升级sql脚本获取方式：
+
+- dss1.1.1的安装包解压后的目录：db/version_update/from_v110_to_v111.sql
+
+然后登陆dss数据库执行source命令：
+
+```shell
+source ${your_path}/from_v110_to_v111.sql
+```
+正常情况下可以执行成功。
+
+### 3. 替换相关jar包
+
+#### 3.1 替换DSS的jar包
+- 用户可以自行编译DSS1.1.1后端代码或参考文档 [DSS&Linkis一键部署文档单机版](DSS&Linkis一键部署文档单机版.md) 来获取DSS1.1.1的全量包
+- 使用DSS1.1.1的lib去全量替换掉原有1.1.0 xxx/dss/目录下的的lib
+
+#### 3.2 DolphinScheduler涉及到的jar包替换
+- `DolphinSchedulerAppConn` 插件安装包替换，可从此处下载：[点我下载插件安装包](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dolphinscheduler-appconn.zip) 解压该zip包后用将其中的lib和db全量替换原有的`${DSS_HOME}/dss-appconns/dss-dolphinscheduler/`目录下的lib和db
+- 下载 dss-dolphinscheduler-token-1.1.1.jar [点我下载](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dss-dolphinscheduler-token-1.1.1.jar) 将该jar包放到`${DSS_HOME}/lib/dss-framework/dss-framework-project-server/`目录下
+- 下载`dss-dolphinscheduler-client` 插件安装包，可从此处下载：[点我下载插件安装包](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dss-dolphinscheduler-client.zip) 解压该zip包后用将其中的lib全量替换原有的dss-dolphinscheduler-client安装目录下的lib
+- 下载 dolphinscheduler-prod-metrics-with-dependencies.jar [点我下载](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dolphinscheduler-prod-metrics-1.1.1-jar-with-dependencies.jar) 将该jar包放到dolphinscheduler安装目录的lib目录下，删除之前的 dolphinscheduler-prod-metrics-1.1.0.jar
+
+### 4. 替换前端包
+- 用户可自行编译前端包或者从 [DSS&Linkis一键部署文档单机版](DSS&Linkis一键部署文档单机版.md) 来获取DSS1.1.1的全量包并将前端包拿出，替换掉`${DSS_HOME}/web/`下的dist即可
+### 5. 服务启动
+- 重启DSS服务，在**dss部署目录下**执行命令启动所有服务：
+
+```shell
+sh sbin/dss-start-all.sh 
+```
+- 重启dolphinschduler服务
+- 重启nginx
+
+
+

zh_CN/安装部署/DolphinScheduler插件安装文档.md

@@ -4,13 +4,13 @@
 
 您在部署 `DolphinSchedulerAppConn` 之前，必须先将 `DolphinScheduler` 部署启动并保证 `DolphinScheduler` 可用。
 
-**请注意：目前 `DolphinSchedulerAppConn` 只支持适配 DolphinScheduler1.3.X。**
+**请注意：目前 `DolphinSchedulerAppConn` 只支持适配 DolphinScheduler1.3.X。在代码中默认配置的是1.3.9，用户若安装的是其他1.3.x版本就需要修改 dolphinscheduler module下的pom.xml中的dolphinscheuduler.version到相应版本**
 
 关于 `DolphinScheduler` 的安装部署，请参考：`DolphinScheduler` [安装部署文档](https://dolphinscheduler.apache.org/zh-cn/docs/1.3.8/user_doc/standalone-deployment.html)
 
 ## 2. 下载和编译
 
-`DolphinSchedulerAppConn` 插件安装包，可从此处下载：[点我下载插件安装包](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/dolphinscheduler-appconn.zip)
+`DolphinSchedulerAppConn` 插件安装包，可从此处下载：[点我下载插件安装包](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dolphinscheduler-appconn.zip)
 
 如果您想自己编译 `DolphinSchedulerAppConn`，具体编译步骤如下:
 
@@ -74,7 +74,7 @@ sh install-appconn.sh
 
 这个 Jar 包的作用是提供 `/api/rest_j/v1/dss/framework/project/ds/token` 接口，用于免密请求 DolphinScheduler 的接口。
 
-Jar 包获取方式：DSS 编译后从 `plugins/dolphinscheduler` 目录中可以获取或 [点我下载](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/dss-dolphinscheduler-token-1.1.0.jar)
+Jar 包获取方式：DSS 编译后从 `plugins/dolphinscheduler` 目录中可以获取或 [点我下载](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dss-dolphinscheduler-token-1.1.1.jar)
 
 ![img_9.png](../Images/安装部署/DolphinschedulerAppConn部署/img_9.png)
 
@@ -84,11 +84,11 @@ Jar 包获取方式：DSS 编译后从 `plugins/dolphinscheduler` 目录中可
 sh sbin/dss-daemon.sh restart project-server
 ```
 
-#### 3.2.2 将 dolphinscheduler-prod-metrics.jar 放入到 DolphinScheduler 的 lib 目录
+#### 3.2.2 将 dolphinscheduler-prod-metrics-with-dependencies.jar 放入到 DolphinScheduler 的 lib 目录
 
 这一步是将 DolphinScheduler 的自定义接口实现 Jar 包添加到 DolphinScheduler 服务的 lib 目录，并重启 DolphinScheduler 服务使之生效。
 
-Jar获取方式：从 DSS 编译后的 plugins 目录下有 dolphinscheduler 相关插件包或 [点我下载](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/dolphinscheduler-prod-metrics-1.1.0.jar)
+Jar获取方式：从 DSS 编译后的 plugins 目录下有 dolphinscheduler 相关插件包或 [点我下载](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dolphinscheduler-prod-metrics-1.1.1-jar-with-dependencies.jar)
 
 ![img_6.png](../Images/安装部署/DolphinschedulerAppConn部署/img_6.png)
 
@@ -148,7 +148,7 @@ sh sbin/dss-daemon.sh restart workflow-server
 
 ### 4.1 安装包准备
 
-`dss-dolphinscheduler-client` 插件安装包，可从此处下载：[点我下载插件安装包](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/dss-dolphinscheduler-client.zip)
+`dss-dolphinscheduler-client` 插件安装包，可从此处下载：[点我下载插件安装包](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/DolphinScheduler/DSS1.1.1_dolphinscheduler/dss-dolphinscheduler-client.zip)
 
 如果您想自己编译 `dss-dolphinscheduler-client`，具体编译步骤如下: