diff --git a/.github/workflows/dead-link-checker.yml b/.github/workflows/dead-link-checker.yml
new file mode 100644
index 000000000..8de24aac8
--- /dev/null
+++ b/.github/workflows/dead-link-checker.yml
@@ -0,0 +1,17 @@
+name: Dead Link Check
+
+on: [push]
+
+jobs:
+ dead-links-check:
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ if: (github.repository == 'WeBankFinTech/Exchangis')
+ steps:
+ - uses: actions/checkout@v3
+ - uses: gaurav-nelson/github-action-markdown-link-check@v1
+ with:
+ use-quiet-mode: 'no'
+ use-verbose-mode: 'yes'
+ folder-path: '../'
+ config-file: '.github/workflows/dlc.json'
diff --git a/Dockerfile b/Dockerfile
index 294e26a9e..50fd364a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
FROM harbor.local.hching.com/library/jdk:8u301
-ADD assembly-package/target/wedatasphere-exchangis-1.0.0-RC1.tar.gz /opt/wedatasphere-exchangis.tar.gz
+ADD assembly-package/target/wedatasphere-exchangis-1.1.2.tar.gz /opt/wedatasphere-exchangis.tar.gz
-RUN cd /opt/wedatasphere-exchangis.tar.gz/packages/ && tar -zxf exchangis-server_1.0.0-RC1.tar.gz && cd /opt/wedatasphere-exchangis.tar.gz/sbin
+RUN cd /opt/wedatasphere-exchangis.tar.gz/packages/ && tar -zxf exchangis-server_1.1.2.tar.gz && cd /opt/wedatasphere-exchangis.tar.gz/sbin
WORKDIR /opt/wedatasphere-exchangis.tar.gz/sbin
diff --git a/README-ZH.md b/README-ZH.md
index 19e680fc0..ffdc9911f 100644
--- a/README-ZH.md
+++ b/README-ZH.md
@@ -6,7 +6,7 @@
## 介绍
-Exchangis 1.0.0 是微众银行大数据平台 WeDataSphere 与社区用户共同研发的的新版数据交换工具，支持异构数据源之间的结构化和非结构化数据传输同步。
+Exchangis是微众银行大数据平台 WeDataSphere 与社区用户共同研发的的新版数据交换工具，支持异构数据源之间的结构化和非结构化数据传输同步。
Exchangis 抽象了一套统一的数据源和同步作业定义插件，允许用户快速接入新的数据源，并只需在数据库中简单配置即可在页面中使用。
@@ -16,7 +16,7 @@ Exchangis 抽象了一套统一的数据源和同步作业定义插件，允许
### 界面预览
-
+
## 核心特点
@@ -42,26 +42,29 @@ Exchangis 抽象了一套统一的数据源和同步作业定义插件，允许
### 3. 与DSS工作流打通，一站式大数据开发的门户
- 实现DSS AppConn包括一级 SSO 规范，二级组织结构规范，三级开发流程规范在内的三级规范；
-
- 作为DSS工作流的数据交换节点，是整个工作流链路中的门户流程，为后续的工作流节点运行提供稳固的数据基础；
+### 4. 支持多种导数引擎
+
+- 支持Sqoop和DataX引擎进行多种异构数据源之间的导数
+
## 整体设计
### 架构设计
-
+
## 相关文档
-[安装部署文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/zh_CN/ch1/exchangis_deploy_cn.md)
-[用户手册](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/zh_CN/ch1/exchangis_user_manual_cn.md)
+[安装部署文档](docs/zh_CN/ch1/exchangis_deploy_cn.md)
+[用户手册](docs/zh_CN/ch1/exchangis_user_manual_cn.md)
## 交流贡献
如果您想得到最快的响应，请给我们提 issue，或者扫码进群：
-
+
## License
-Exchangis is under the Apache 2.0 License. See the [License](../../../LICENSE) file for details.
+Exchangis is under the Apache 2.0 License. See the [License](./LICENSE) file for details.
diff --git a/README.md b/README.md
index 8bd867ded..5e211e77a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ English | [中文](README-ZH.md)
## Introduction
-Exchangis 1.0.0 is a new version of data exchange tool jointly developed by WeDataSphere, a big data platform of WeBank, and community users, which supports the synchronization of structured and unstructured data transmission between heterogeneous data sources.
+Exchangis is a new version of data exchange tool jointly developed by WeDataSphere, a big data platform of WeBank, and community users, which supports the synchronization of structured and unstructured data transmission between heterogeneous data sources.
Exchangis abstracts a unified set of data source and synchronization job definition plugins, allowing users to quickly access new data sources and use them on pages with simple configuration in the database.
@@ -14,7 +14,7 @@ With the help of [Linkis](https://github.com/apache/incubator-linkis) computing
### Interface preview
-
+
## Core characteristics
@@ -47,21 +47,21 @@ With the help of [Linkis](https://github.com/apache/incubator-linkis) computing
### Architecture Design
-
+
## Documents
-[Quick Deploy](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/en_US/ch1/exchangis_deploy_en.md)
-[User Manual](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/en_US/ch1/exchangis_user_manual_en.md)
+[Quick Deploy](docs/en_US/ch1/exchangis_deploy_en.md)
+[User Manual](docs/en_US/ch1/exchangis_user_manual_en.md)
## Communication and contribution
If you want to get the fastest response, please mention issue to us, or scan the code into the group ：
-
+
## License
-Exchangis is under the Apache 2.0 License. See the [License](../../../LICENSE) file for details.
+Exchangis is under the Apache 2.0 License. See the [License](./LICENSE) file for details.
diff --git a/assembly-package/config/dss-exchangis-server.properties b/assembly-package/config/dss-exchangis-server.properties
new file mode 100644
index 000000000..a8aa9a830
--- /dev/null
+++ b/assembly-package/config/dss-exchangis-server.properties
@@ -0,0 +1,67 @@
+#
+# Copyright 2019 WeBank
+#
+# Licensed 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.
+#
+#
+
+wds.linkis.test.mode=false
+wds.linkis.server.mybatis.datasource.url=jdbc:mysql://{IP}:{PORT}/{database}?useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true
+wds.linkis.server.mybatis.datasource.username={username}
+wds.linkis.server.mybatis.datasource.password={password}
+
+wds.linkis.gateway.ip={LINKIS_IP}
+wds.linkis.gateway.port={LINKIS_PORT}
+wds.linkis.gateway.url=http://{LINKIS_IP}:{LINKIS_PORT}/
+wds.linkis.log.clear=true
+wds.linkis.server.version=v1
+
+# datasource client
+wds.exchangis.datasource.client.serverurl=http://{LINKIS_IP}:{LINKIS_PORT}/
+wds.exchangis.datasource.client.authtoken.key=EXCHANGIS-AUTH
+wds.exchangis.datasource.client.authtoken.value=EXCHANGIS-AUTH
+wds.exchangis.datasource.client.dws.version=v1
+
+# launcher client
+wds.exchangis.client.linkis.server-url=http://{LINKIS_IP}:{LINKIS_PORT}/
+wds.exchangis.client.linkis.token.value=EXCHANGIS-AUTH
+wds.exchangis.datasource.extension.dir=exchangis-extds/
+
+##restful
+wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.exchangis.datasource.server.restful.api,\
+ com.webank.wedatasphere.exchangis.project.server.restful,\
+ com.webank.wedatasphere.exchangis.job.server.restful
+
+wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/exchangis/job/server/mapper/impl/*.xml,\
+classpath*:com/webank/wedatasphere/exchangis/project/server/mapper/impl/*.xml,\
+classpath*:com/webank/wedatasphere/exchangis/project/provider/mapper/impl/*.xml,\
+classpath*:com/webank/wedatasphere/exchangis/engine/server/mapper/*.xml
+
+wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.exchangis.dao,\
+ com.webank.wedatasphere.exchangis.project.server.mapper,\
+ com.webank.wedatasphere.exchangis.project.provider.mapper,\
+ com.webank.wedatasphere.linkis.configuration.dao,\
+ com.webank.wedatasphere.linkis.metadata.dao,\
+ com.webank.wedatasphere.exchangis.job.server.mapper,\
+ com.webank.wedatasphere.exchangis.job.server.dao,\
+ com.webank.wedatasphere.exchangis.engine.dao
+
+wds.exchangis.job.task.scheduler.load-balancer.flexible.segments.min-occupy=0.25
+wds.exchangis.job.task.scheduler.load-balancer.flexible.segments.max-occupy=0.5
+#wds.exchangis.job.scheduler.group.max.running-jobs=4
+
+wds.linkis-session.ticket.key=bdp-user-ticket-id
+wds.exchangis.limit.interface.value=false
+
+wds.exchangis.publicKeyStr=
+wds.exchangis.privateKeyStr=
diff --git a/assembly-package/sbin/daemon.sh b/assembly-package/sbin/daemon.sh
index a21ccfab6..45f931b91 100644
--- a/assembly-package/sbin/daemon.sh
+++ b/assembly-package/sbin/daemon.sh
@@ -22,6 +22,7 @@ else
source ./launcher.sh
source ./common.sh
fi
+load_env_definitions ${ENV_FILE}
usage(){
echo "Usage is [start|stop|restart {server}]"
diff --git a/assembly-package/sbin/install.sh b/assembly-package/sbin/install.sh
index 2d362038c..a9f23aa66 100644
--- a/assembly-package/sbin/install.sh
+++ b/assembly-package/sbin/install.sh
@@ -125,7 +125,7 @@ interact_echo(){
# Initalize database
init_database(){
- BOOTSTRAP_PROP_FILE="${CONF_PATH}/exchangis-server.properties"
+ BOOTSTRAP_PROP_FILE="${CONF_PATH}/dss-exchangis-server.properties"
if [ "x${SQL_SOURCE_PATH}" != "x" ] && [ -f "${SQL_SOURCE_PATH}" ]; then
`mysql --version >/dev/null 2>&1`
DATASOURCE_URL="jdbc:mysql:\/\/${MYSQL_HOST}:${MYSQL_PORT}\/${DATABASE}\?useSSL=false\&characterEncoding=UTF-8\&allowMultiQueries=true"
@@ -142,7 +142,7 @@ init_database(){
}
init_properties(){
- BOOTSTRAP_PROP_FILE="${CONF_PATH}/exchangis-server.properties"
+ BOOTSTRAP_PROP_FILE="${CONF_PATH}/dss-exchangis-server.properties"
APPLICATION_YML="${CONF_PATH}/application-exchangis.yml"
LINKIS_GATEWAY_URL="http:\/\/${LINKIS_GATEWAY_HOST}:${LINKIS_GATEWAY_PORT}\/"
if [ "x${LINKIS_SERVER_URL}" == "x" ]; then
diff --git a/docs/en_US/ch1/component_upgrade_en.md b/docs/en_US/ch1/component_upgrade_en.md
index c3aa23379..3bc6e3b47 100644
--- a/docs/en_US/ch1/component_upgrade_en.md
+++ b/docs/en_US/ch1/component_upgrade_en.md
@@ -1,5 +1,5 @@
# Exchangis Component Upgrade Documentation
-This article mainly introduces the upgrade steps for adapting DSS1.1.2 and Linkis1.4.0 on the basis of the original installation of the Exchangis service. The biggest difference between the Exchangis1.0.0 and the Exchangis1.0.0-rc1 version is the installation of the ExchangisAppconn, which needs to be replaced by the entire Exchangisappconn. and load### 1.升级Exchangis前的工作
+This article mainly introduces the upgrade steps for adapting DSS1.1.2 and Linkis1.4.0 on the basis of the original installation of the Exchangis service. The biggest difference between the Exchangis1.1.2 and the Exchangis1.0.0 version is the installation of the ExchangisAppconn, which needs to be replaced by the entire Exchangisappconn. and load### 1.升级Exchangis前的工作
Before you upgrade Exchangis, please follow the[DSS1.1.2Install and deploy documentation](https://github.com/WeBankFinTech/DataSphereStudio-Doc/tree/main/zh_CN/%E5%AE%89%E8%A3%85%E9%83%A8%E7%BD%B2)
and [Linkis1.4.0Install and deploy documentation](https://linkis.staged.apache.org/zh-CN/docs/1.4.0/deployment/deploy-quick)Complete the installation and upgrade of DSS and Linkis
@@ -13,7 +13,7 @@ Go to the following directory and find exchangis appconn folder and delete:
```
#### 2）Download binary package
-We provide the upgrade material package of ExchangisAppconn, which you can download and use directly.[Click to jump Release interface](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/Exchangis/exchangis1.0.0-rc/exchangis-appconn.zip)
+We provide the upgrade material package of ExchangisAppconn, which you can download and use directly.[Click to jump Release interface](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/Exchangis/exchangis1.1.2/Exchangis1.1.2_install_package.zip)
#### 3） Compile and package
@@ -72,4 +72,4 @@ After the installation and deployment of exchangis-appconn is completed, you can
2. Check whether the project is created synchronously on the exchange side. If the creation is successful, the appconn installation is successful.
-For more usage, please refer to[Exchangis1.0 User Manual](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.1-rc/docs/zh_CN/ch1/exchangis_user_manual_cn.md)
+For more usage, please refer to[Exchangis User Manual](docs/zh_CN/ch1/exchangis_user_manual_cn.md)
diff --git a/docs/en_US/ch1/exchangis_appconn_deploy_en.md b/docs/en_US/ch1/exchangis_appconn_deploy_en.md
index a5012b2f0..1b195c0c0 100644
--- a/docs/en_US/ch1/exchangis_appconn_deploy_en.md
+++ b/docs/en_US/ch1/exchangis_appconn_deploy_en.md
@@ -3,7 +3,7 @@
This paper mainly introduces the deployment, configuration and installation of ExchangisAppConn in DSS(DataSphere Studio)1.0.1.
### 1. Preparations for the deployment of ExchangisAppConn
-Before you deploy ExchangisAppConn, please follow the [Exchangis1.0.0 to install the deployment document](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/en_US/ch1/exchangis_deploy_en.md) to complete the installation of Exchangis1.0.0 and other related components, and ensure that the basic functions of the project are available.
+Before you deploy ExchangisAppConn, please follow the [Exchangis to install the deployment document](docs/en_US/ch1/exchangis_deploy_en.md) to complete the installation of Exchangis and other related components, and ensure that the basic functions of the project are available.
### 2. Download and compilation of the ExchangisAppConn plugin
#### 1） Download binary package
@@ -67,7 +67,7 @@ After the exchangis-appconn is installed and deployed, the following steps can b
2. Check whether the project is created synchronously on Exchangis. Successful creation means successful installation of appconn
-For more operation, please refer to [Exchangis 1.0 User Manual](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0-rc/docs/zh_CN/ch1/exchangis_user_manual_cn.md)
+For more operation, please refer to [Exchangis User Manual](docs/zh_CN/ch1/exchangis_user_manual_cn.md)
### 5.Exchangis AppConn installation principle
diff --git a/docs/en_US/ch1/exchangis_datax_deploy_en.md b/docs/en_US/ch1/exchangis_datax_deploy_en.md
new file mode 100644
index 000000000..7458e8212
--- /dev/null
+++ b/docs/en_US/ch1/exchangis_datax_deploy_en.md
@@ -0,0 +1,84 @@
+# DataX engine uses documentation
+
+### Prepare the environment
+
+The DataX engine is an indispensable component for executing Exchangis data synchronization tasks. Data synchronization tasks can be performed only after the DataX engine is installed and deployed. Also, ensure that DataX is installed on the deployed machine.
+
+Before you install and deploy DataX engine, Please complete the installation of Exchangis and related components according to the [Exchangis installation and deployment document](docs/en_US/ch1/exchangis_deploy_en.md), and ensure that the basic functions of the project are available.
+
+It is strongly recommended that you use the native DataX to perform the test task on this node before performing the DataX task, so as to check whether the environment of this node is normal.
+
+| Environment variable name | Environment variable content | Remark |
+| :-----------------------: | :--------------------------: | ------------ |
+| JAVA_HOME | JDK installation path | Required |
+| DATAX_HOME | DataX installation path | Not Required |
+| DATAX_CONF_DIR | DataX config path | Not Required |
+
+### Prepare installation package
+
+#### 1）Download binary package
+
+Exchangis1.1.2 and Linkis 1.4.0 support the mainstream DataX versions 1.4.6 and 1.4.7, and later versions may need to modify some codes for recompilation.
+
+[Click to jump to Release interface](https://github.com/WeBankFinTech/Exchangis/releases/tag/release-1.1.2)
+
+#### 2）Compile and package
+
+If you want to develop and compile datax engine yourself, the specific compilation steps are as follows:
+
+1.clone Exchangis's source code
+
+2.Under exchangis-plugins module, find sqoop engine and compile sqoop separately, as follows :
+
+```
+cd {EXCHANGIS_CODE_HOME}/exchangis-plugins/engine/datax
+mvn clean install
+```
+
+Then the datax engine installation package will be found in this path.
+
+```
+{EXCHANGIS_CODE_HOME}\exchangis-plugins\datax\target\out\datax
+```
+
+
+### Start deployment
+
+#### 1）DataX engine installation
+
+1、Get the packed datax.zip material package, the directory structure is
+
+```shell
+datax
+-- dist
+-- plugin
+```
+
+2、Place in the following directory in the linkis installation path
+
+```shell
+cd {LINKIS_HOME}/linkis/lib/linkis-engineconn-plugins
+```
+
+(Note that depending on which users the current datax engine has permissions for, they are generally hadoop user groups and hadoop users)
+
+
+#### 2）Restart linkis-engineplugin service to make datax engine take effect
+
+New engines joining linkis will not take effect until the engineplugin service of linkis is restarted, and the restart script is. /linkis-daemon.sh in the Linkis installation directory. The specific steps are as follows :
+
+```
+cd {LINKIS_INSTALL_HOME}/links/sbin/
+./linkis-daemon.sh restart cg-engineplugin
+```
+
+After the service is successfully started, check whether the datax engine is installed in the linkis database
+
+```shell
+select * from linkis_cg_engine_conn_plugin_bml_resources where engine_conn_type='datax';
+```
+
+At this point, the datax installation and deployment is complete.
+
+For a more detailed introduction of engineplugin, please refer to the following article.
+https://linkis.apache.org/zh-CN/docs/latest/deployment/install-engineconn
\ No newline at end of file
diff --git a/docs/en_US/ch1/exchangis_deploy_en.md b/docs/en_US/ch1/exchangis_deploy_en.md
index 65ecb03f1..bcef1232d 100644
--- a/docs/en_US/ch1/exchangis_deploy_en.md
+++ b/docs/en_US/ch1/exchangis_deploy_en.md
@@ -14,7 +14,7 @@ Exchangis installation is mainly divided into the following four steps ：
| Dependent components | Must be installed | Install through train |
|------------------------------------------------------------------------------| ------ | --------------- |
| JDK (1.8.0_141) | yes | [How to install JDK](https://www.oracle.com/java/technologies/downloads/) |
-| MySQL (5.5+) | yes | [How to install mysql](https://www.mysql.com/downloads/) |
+| MySQL (5.5+) | yes | [How to install mysql](https://mysql.net.cn/) |
| Hadoop(3.3.4，Other versions of Hadoop need to compile Linkis by themselves.) | yes | [Hadoop deployment](https://www.apache.org/dyn/closer.cgi/hadoop/common/hadoop-3.3.4/hadoop-3.3.4.tar.gz) |
| Hive(2.3.3，Other versions of Hive need to compile Linkis by themselves.) | yes | [Hive quick installation](https://www.apache.org/dyn/closer.cgi/hive/) |
| SQOOP (1.4.6) | yes | [How to install Sqoop](https://sqoop.apache.org/docs/1.4.6/SqoopUserGuide.html) |
@@ -28,7 +28,7 @@ $\color{#FF0000}{Note: be sure to reinstall dss1.1.2, and linkis1.4.0. Please re
[linkis1.4.0 code address ](https://github.com/apache/incubator-linkis/tree/release-1.4.0)
-[DSS1.1.2 code address ](https://github.com/WeBankFinTech/DataSphereStudio/tree/dev-1.1.2)
+[DSS1.1.2 code address ](https://github.com/WeBankFinTech/DataSphereStudio)
datasource enabled
@@ -67,7 +67,7 @@ Please ensure that DSS1.1.2 and Linkis1.4.0 are basically available. HiveQL scri
#### 2.1.1 Download binary package
-Download the latest installation package from the Released release of Exchangis [click to jump to the release interface](https://github.com/WeBankFinTech/Exchangis/releases/tag/release-1.1.2).
+Download the latest installation package from the Released release of Exchangis [click to jump to the release interface](https://github.com/WeBankFinTech/Exchangis/releases).
#### 2.1.2 Compile and package
@@ -214,7 +214,7 @@ As shown in the figure below:
#### 2.7.1 Get the front-end installation package
-Exchangis has provided compiled front-end installation package by default, which can be downloaded and used directly ：[Click to jump to the Release interface](https://github.com/WeBankFinTech/Exchangis/releases/download/release-1.0.0-rc1/web-dist.zip)
+Exchangis has provided compiled front-end installation package by default, which can be downloaded and used directly ：[Click to jump to the Release interface](https://github.com/WeBankFinTech/Exchangis/releases)
You can also compile the exchange front-end by yourself and execute the following command in the exchanise root directory:
@@ -296,12 +296,12 @@ Please visit the Exchange front-end page at http://${EXCHANGIS_INSTALL_IP}:8098
## 3. DSS ExchangisAppConn installation and deployment
-If you want to use Exchangis1.0.0 front-end, you also need to install the DSS ExchangisAppConn plugin. Please refer to: [ExchangisAppConn installation documentation for plugins ](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/en_US/ch1/exchangis_appconn_deploy_en.md)
+If you want to use Exchangis front-end, you also need to install the DSS ExchangisAppConn plugin. Please refer to: [ExchangisAppConn installation documentation for plugins ](docs/en_US/ch1/exchangis_appconn_deploy_en.md)
## 4. Linkis Sqoop engine installation and deployment
-If you want to execute the Sqoop operation of Exchangis1.0.0 normally, you also need to install the Linkis Sqoop engine. Please refer to: : [Linkis Sqoop engine installation documentation ](https://linkis.apache.org/zh-CN/docs/1.1.2/engine-usage/sqoop/)
+If you want to execute the Sqoop operation of Exchangis normally, you also need to install the Linkis Sqoop engine. Please refer to: : [Linkis Sqoop engine installation documentation ](https://linkis.apache.org/zh-CN/docs/1.1.2/engine-usage/sqoop/)
## 5. How to log in and use Exchangis
-Exchangis1.0 for more instructions, please refer to the user manual.[Exchangis1.0 user manual](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/en_US/ch1/exchangis_user_manual_en.md)
+Exchangis for more instructions, please refer to the user manual.[Exchangis user manual](docs/en_US/ch1/exchangis_user_manual_en.md)
diff --git a/docs/en_US/ch1/exchangis_sqoop_deploy_en.md b/docs/en_US/ch1/exchangis_sqoop_deploy_en.md
index b84e3f7cf..062f797d0 100644
--- a/docs/en_US/ch1/exchangis_sqoop_deploy_en.md
+++ b/docs/en_US/ch1/exchangis_sqoop_deploy_en.md
@@ -2,7 +2,7 @@
### Prepare the environment
Sqoop engine is an indispensable component to perform Exchange IS data synchronization task, and only after the installation and deployment of Sqoop engine can it successfully perform data synchronization task. At the same time, make sure sqoop is installed on the deployed machine.
-Before you install and deploy Sqoop engine, Please complete the installation of Exchangis 1.0.0 and related components according to the [Exchangis 1.0.0 installation and deployment document](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/en_US/ch1/exchangis_deploy_en.md), and ensure that the basic functions of the project are available.
+Before you install and deploy Sqoop engine, Please complete the installation of Exchangis and related components according to the [Exchangis installation and deployment document](docs/en_US/ch1/exchangis_deploy_en.md), and ensure that the basic functions of the project are available.
Sqoop engine mainly depends on Hadoop basic environment. If this node needs to deploy Sqoop engine, it needs to deploy Hadoop client environment.
@@ -28,7 +28,7 @@ It is strongly recommended that you use the native Sqoop to perform the test tas
Exchangis1.1.2 and Linkis 1.4.0 support the mainstream Sqoop versions 1.4.6 and 1.4.7, and later versions may need to modify some codes for recompilation.
-[Click to jump to Release interface](https://github.com/WeBankFinTech/Exchangis/releases/tag/release-1.0.0)
+[Click to jump to Release interface](https://github.com/WeBankFinTech/Exchangis/releases)
#### 2）Compile and package
If you want to develop and compile sqoop engine yourself, the specific compilation steps are as follows:
@@ -74,4 +74,4 @@ cd {LINKIS_INSTALL_HOME}/links/sbin/
After the service is successfully started, the installation and deployment of sqoop will be completed.
For a more detailed introduction of engineplugin, please refer to the following article.
-https://linkis.apache.org/zh-CN/docs/latest/deployment/engine-conn-plugin-installation
\ No newline at end of file
+https://linkis.apache.org/zh-CN/docs/latest/deployment/install-engineconn
\ No newline at end of file
diff --git a/docs/en_US/ch1/exchangis_user_manual_en.md b/docs/en_US/ch1/exchangis_user_manual_en.md
index 7ad3b9e6a..bdd0856f9 100644
--- a/docs/en_US/ch1/exchangis_user_manual_en.md
+++ b/docs/en_US/ch1/exchangis_user_manual_en.md
@@ -6,7 +6,7 @@
## 二、Login Exchangis1.0
- Exchangis1.0 is currently a part of DSS**data exchange component**, and it can be accessed in the component list by logging in to DSS. Therefore, before using Exchangis 1.0, please make basic deployment of DSS, Exchange IS 1.0, Linkis and other related components to ensure that the components' functions are available. This article will not go into details. See for details:[exchangis_deploy_en](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/en_US/ch1/exchangis_deploy_en.md)和[exchangis-appconn_deploy_en](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/en_US/ch1/exchangis_appconn_deploy_en.md)
+ Exchangis1.0 is currently a part of DSS**data exchange component**, and it can be accessed in the component list by logging in to DSS. Therefore, before using Exchangis 1.0, please make basic deployment of DSS, Exchange IS 1.0, Linkis and other related components to ensure that the components' functions are available. This article will not go into details. See for details:[exchangis_deploy_en](docs/en_US/ch1/exchangis_deploy_en.md)和[exchangis-appconn_deploy_en](docs/en_US/ch1/exchangis_appconn_deploy_en.md)
### 1、Login DSS
diff --git a/docs/zh_CN/ch1/component_upgrade_cn.md b/docs/zh_CN/ch1/component_upgrade_cn.md
index 7858b31b3..94ca8e7f2 100644
--- a/docs/zh_CN/ch1/component_upgrade_cn.md
+++ b/docs/zh_CN/ch1/component_upgrade_cn.md
@@ -1,5 +1,5 @@
Exchangis 升级文档
-本文主要介绍在原有安装Exchangis服务的基础上适配DSS1.1.2和Linkis1.4.0的升级步骤，Exchangis1.1.2相对与Exchangis1.0.0-rc1版本最大的区别在于ExchangisAppconn的安装，需要对整个Exchangisappconn进行重新替换和加载
+本文主要介绍在原有安装Exchangis服务的基础上适配DSS1.1.2和Linkis1.4.0的升级步骤，Exchangis1.1.2相对与Exchangis1.0.0版本最大的区别在于ExchangisAppconn的安装，需要对整个Exchangisappconn进行重新替换和加载
### 1.升级Exchangis前的工作
您在升级Exchangis之前，请按照[DSS1.1.2安装部署文档](https://github.com/WeBankFinTech/DataSphereStudio-Doc/tree/main/zh_CN/%E5%AE%89%E8%A3%85%E9%83%A8%E7%BD%B2)
和[Linkis1.4.0安装部署文档](https://linkis.staged.apache.org/zh-CN/docs/1.4.0/deployment/deploy-quick)完成DSS和Linkis的安装升级
@@ -14,7 +14,7 @@ Exchangis 升级文档
```
#### 2）下载二进制包
-我们提供ExchangisAppconn的升级物料包，您可直接下载使用。[点击跳转 Release 界面](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/Exchangis/exchangis1.0.0-rc/exchangis-appconn.zip)（TODO：待发版时更新）
+我们提供ExchangisAppconn的升级物料包，您可直接下载使用。[点击跳转 Release 界面](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/Exchangis/exchangis1.1.2/Exchangis1.1.2_install_package.zip)
#### 3） 编译打包
@@ -66,7 +66,7 @@ sh ./appconn-refresh.sh
#### 4.2）更新Exchangis安装目录下的lib包
-将从下载链接中得到的exchangis-project-server-1.0.0.jar和exchangis-server-1.0.0.jar两个包放入以下Exchangis安装目录的文件路径下(先删除原有旧的这两个包)：
+将从下载链接中得到的exchangis-project-server-1.1.2.jar和exchangis-server-1.1.2.jar两个包放入以下Exchangis安装目录的文件路径下(先删除原有旧的这两个包)：
```$xslt
lib/exchangis-server
@@ -77,9 +77,9 @@ lib/exchangis-server
```shell script
./sbin/daemon.sh restart server
```
-# 4.3）更新exchangis-server.propertis文件
+# 4.3）更新dss-exchangis-server.propertis文件
-将exchangis-server.propertis文件中的最后一行进行替换，替换内容如下
+将dss-exchangis-server.propertis文件中的最后一行进行替换，替换内容如下
```$xslt
wds.linkis-session.ticket.key=bdp-user-ticket-id
@@ -94,4 +94,4 @@ wds.linkis-session.ticket.key=bdp-user-ticket-id
- 更多使用操作可参照[Exchangis用户手册](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.1.2/docs/zh_CN/ch1/exchangis_user_manual_cn.md)
+ 更多使用操作可参照[Exchangis用户手册](docs/zh_CN/ch1/exchangis_user_manual_cn.md)
diff --git a/docs/zh_CN/ch1/exchangis_appconn_deploy_cn.md b/docs/zh_CN/ch1/exchangis_appconn_deploy_cn.md
index 9144ad166..5225fc180 100644
--- a/docs/zh_CN/ch1/exchangis_appconn_deploy_cn.md
+++ b/docs/zh_CN/ch1/exchangis_appconn_deploy_cn.md
@@ -1,11 +1,11 @@
ExchangisAppConn安装文档
本文主要介绍在DSS(DataSphere Studio)1.0.1中ExchangisAppConn的部署、配置以及安装
### 1.部署ExchangisAppConn的准备工作
-您在部署ExchangisAppConn之前，请按照[Exchangis1.0.0安装部署文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/zh_CN/ch1/exchangis_deploy_cn.md)安装完成Exchangis1.0.0及其他相关组件的安装，并确保工程基本功能可用。
+您在部署ExchangisAppConn之前，请按照[Exchangis安装部署文档](docs/zh_CN/ch1/exchangis_deploy_cn.md)安装完成Exchangis及其他相关组件的安装，并确保工程基本功能可用。
### 2.ExchangisAppConn插件的下载和编译
#### 1）下载二进制包
-我们提供ExchangisAppconn的物料包，您可直接下载使用。[点击跳转 Release 界面](https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeDatasphere/Exchangis/exchangis1.0.0/exchangis-appconn.zip)
+我们提供ExchangisAppconn的物料包，您可直接下载使用。[点击跳转 Release 界面](https://github.com/WeBankFinTech/Exchangis/releases)
#### 2） 编译打包
如果您想自己开发和编译ExchangisAppConn，具体编译步骤如下：
@@ -64,7 +64,7 @@ sh ./dss-start-all.sh
2. 在exchangis端查看是否同步创建项目，创建成功说明appconn安装成功
-更多使用操作可参照[Exchangis1.0用户手册](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/zh_CN/ch1/exchangis_user_manual_cn.md)
+更多使用操作可参照[Exchangis用户手册](docs/zh_CN/ch1/exchangis_user_manual_cn.md)
### 5.Exchangis AppConn安装原理
diff --git a/docs/zh_CN/ch1/exchangis_datasource_cn.md b/docs/zh_CN/ch1/exchangis_datasource_cn.md
index 5bfb1c423..b7466d4bf 100644
--- a/docs/zh_CN/ch1/exchangis_datasource_cn.md
+++ b/docs/zh_CN/ch1/exchangis_datasource_cn.md
@@ -106,7 +106,7 @@
需求描述：
-后台需要将其和Linkis1.1.1的标签功能相整合，为数据源赋予标签关系。
+后台需要将其和Linkis1.4.0的标签功能相整合，为数据源赋予标签关系。
流程设计:
diff --git a/docs/zh_CN/ch1/exchangis_datax_deploy_cn.md b/docs/zh_CN/ch1/exchangis_datax_deploy_cn.md
index 81c1a821d..00a09f989 100644
--- a/docs/zh_CN/ch1/exchangis_datax_deploy_cn.md
+++ b/docs/zh_CN/ch1/exchangis_datax_deploy_cn.md
@@ -2,7 +2,7 @@
### 环境准备
DataX引擎是执行Exchangis数据同步任务不可或缺的组件，只有安装部署完成DataX引擎才能够成功执行数据同步任务。同时，确保所部署的机器上有安装DataX。
-您在安装部署DataX引擎之前，请按照[Exchangis1.1.2安装部署文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.1.2/docs/zh_CN/ch1/exchangis_deploy_cn.md)（TODO 待修改连接地址）安装完成Exchangis1.1.2及相关组件的安装，并确保工程基本功能可用。
+您在安装部署DataX引擎之前，请按照[Exchangis安装部署文档](docs/zh_CN/ch1/exchangis_deploy_cn.md)安装完成Exchangis及相关组件的安装，并确保工程基本功能可用。
强烈建议您在执行DataX任务之前，先在该节点使用原生的DataX执行测试任务，以检测该节点环境是否正常。
@@ -17,7 +17,7 @@ DataX引擎是执行Exchangis数据同步任务不可或缺的组件，只有安
Exchangis1.1.2和Linkis 1.4.0支持的主流DataX版本1.4.6与1.4.7，更高版本可能需要修改部分代码重新编译。
-[点击跳转 Release 界面](https://github.com/WeBankFinTech/Exchangis/releases/tag/release-1.1.2)（TODO 待修改连接地址）
+[点击跳转 Release 界面](https://github.com/WeBankFinTech/Exchangis/releases/tag/release-1.1.2)
#### 2） 编译打包
如果您想自己开发和编译datax引擎，具体编译步骤如下：
@@ -69,4 +69,4 @@ select * from linkis_cg_engine_conn_plugin_bml_resources where engine_conn_type=
至此，datax安装部署就完成了。
engineplugin更详细的介绍可以参看下面的文章。
-https://linkis.apache.org/zh-CN/docs/latest/deployment/engine-conn-plugin-installation/
\ No newline at end of file
+https://linkis.apache.org/zh-CN/docs/latest/deployment/install-engineconn
\ No newline at end of file
diff --git a/docs/zh_CN/ch1/exchangis_deploy_cn.md b/docs/zh_CN/ch1/exchangis_deploy_cn.md
index b25e49a77..79c3fc139 100644
--- a/docs/zh_CN/ch1/exchangis_deploy_cn.md
+++ b/docs/zh_CN/ch1/exchangis_deploy_cn.md
@@ -29,7 +29,7 @@ Exchangis 的安装，主要分为以下四步：
[linkis1.4.0代码地址](https://github.com/apache/incubator-linkis/tree/release-1.4.0)
-[DSS1.1.2代码地址 ](https://github.com/WeBankFinTech/DataSphereStudio/tree/dev-1.1.2)
+[DSS1.1.2代码地址 ](https://github.com/WeBankFinTech/DataSphereStudio)
datasource启用
@@ -71,7 +71,7 @@ INSERT INTO `linkis_ps_dm_datasource_env` (`env_name`, `env_desc`, `datasource_t
#### 2.1.1下载二进制包
-从 Exchangis 已发布的 release 中 [点击下载exchangis安装包](https://github.com/WeBankFinTech/Exchangis/releases/tag/release-1.1.2)，下载最新的安装包。
+从 Exchangis 已发布的 release 中 [点击下载exchangis安装包](https://github.com/WeBankFinTech/Exchangis/releases)，下载最新的安装包。
#### 2.1.2 编译打包
@@ -211,7 +211,7 @@ mkdir -p /appcom/logs/exchangis/background
#### 2.7.1 获取前端安装包
-Exchangis 已默认提供了编译好的前端安装包，可直接下载使用：[点击下载前端安装包](https://github.com/WeBankFinTech/Exchangis/releases/download/release-1.1.2/web-dist.zip)
+Exchangis 已默认提供了编译好的前端安装包，可直接下载使用：[点击下载前端安装包](https://github.com/WeBankFinTech/Exchangis/releases)
您也可以自行编译 Exchangis 前端，在 Exchangis 根目录下执行如下命令：
@@ -293,16 +293,16 @@ Exchangis 已默认提供了编译好的前端安装包，可直接下载使用
## 3. DSS ExchangisAppConn 安装部署
-如您想正常使用 Exchangis1.1.2 前端，还需安装 DSS ExchangisAppConn 插件，请参考: [ExchangisAppConn 插件安装文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.1.2/docs/zh_CN/ch1/exchangis_appconn_deploy_cn.md)
+如您想正常使用 Exchangis 前端，还需安装 DSS ExchangisAppConn 插件，请参考: [ExchangisAppConn 插件安装文档](docs/zh_CN/ch1/exchangis_appconn_deploy_cn.md)
## 4. Linkis Sqoop 引擎安装部署
-如您想正常执行 Exchangis1.1.2 的 Sqoop作业，还需安装 Linkis Sqoop 引擎，请参考: [Linkis Sqoop 引擎插件安装文档](https://linkis.staged.apache.org/zh-CN/docs/1.4.0/engine_usage/sqoop)
+如您想正常执行 Exchangis 的Sqoop作业，还需安装 Linkis Sqoop 引擎，请参考: [Linkis Sqoop 引擎插件安装文档](docs/zh_CN/ch1/exchangis_sqoop_deploy_cn.md)
## 5. Linkis DataX 引擎安装部署
-如您想正常执行 Exchangis1.0.0 的 DataX作业，还需安装 Linkis DataX 引擎，请参考: [Linkis DataX 引擎插件安装文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.1.2/docs/zh_CN/ch1/exchangis_datax_deploy_cn.md)
+如您想正常执行 Exchangis 的DataX作业，还需安装 Linkis DataX 引擎，请参考: [Linkis DataX 引擎插件安装文档](docs/zh_CN/ch1/exchangis_datax_deploy_cn.md)
## 6. 如何登录使用 Exchangis
-Exchangis更多使用说明，请参考用户使用手册[Exchangis 用户手册](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.1.2/docs/zh_CN/ch1/exchangis_user_manual_cn.md)
+Exchangis 更多使用说明，请参考用户使用手册[Exchangis 用户手册](docs/zh_CN/ch1/exchangis_user_manual_cn.md)
diff --git a/docs/zh_CN/ch1/exchangis_sqoop_deploy_cn.md b/docs/zh_CN/ch1/exchangis_sqoop_deploy_cn.md
index 817854020..f4de28ac2 100644
--- a/docs/zh_CN/ch1/exchangis_sqoop_deploy_cn.md
+++ b/docs/zh_CN/ch1/exchangis_sqoop_deploy_cn.md
@@ -2,7 +2,7 @@
### 环境准备
Sqoop引擎是执行Exchangis数据同步任务不可或缺的组件，只有安装部署完成Sqoop引擎才能够成功执行数据同步任务。同时，确保所部署的机器上有安装sqoop。
-您在安装部署Sqoop引擎之前，请按照[Exchangis1.0.0安装部署文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/zh_CN/ch1/exchangis_deploy_cn.md)安装完成Exchangis1.0.0及相关组件的安装，并确保工程基本功能可用。
+您在安装部署Sqoop引擎之前，请按照[Exchangis安装部署文档](docs/zh_CN/ch1/exchangis_deploy_cn.md)安装完成Exchangis及相关组件的安装，并确保工程基本功能可用。
Sqoop引擎主要依赖Hadoop基础环境，如果该节点需要部署Sqoop引擎，需要部署Hadoop客户端环境。
@@ -26,9 +26,9 @@ Sqoop引擎主要依赖Hadoop基础环境，如果该节点需要部署Sqoop引
### 安装包准备
#### 1）下载二进制包
-Exchangis1.0.0和Linkis 1.1.1支持的主流Sqoop版本1.4.6与1.4.7，更高版本可能需要修改部分代码重新编译。
+Exchangis1.1.2和Linkis 1.4.0支持的主流Sqoop版本1.4.6与1.4.7，更高版本可能需要修改部分代码重新编译。
-[点击跳转 Release 界面](https://github.com/WeBankFinTech/Exchangis/releases/tag/release-1.0.0)
+[点击跳转 Release 界面](https://github.com/WeBankFinTech/Exchangis/releases)
#### 2） 编译打包
如果您想自己开发和编译sqoop引擎，具体编译步骤如下：
@@ -79,4 +79,4 @@ select * from linkis_cg_engine_conn_plugin_bml_resources where engine_conn_type=
至此，sqoop安装部署就完成了。
engineplugin更详细的介绍可以参看下面的文章。
-https://linkis.apache.org/zh-CN/docs/latest/deployment/engine-conn-plugin-installation/
\ No newline at end of file
+https://linkis.apache.org/zh-CN/docs/latest/deployment/install-engineconn
\ No newline at end of file
diff --git a/docs/zh_CN/ch1/exchangis_user_manual_cn.md b/docs/zh_CN/ch1/exchangis_user_manual_cn.md
index 1e7c3c2cc..005c9e189 100644
--- a/docs/zh_CN/ch1/exchangis_user_manual_cn.md
+++ b/docs/zh_CN/ch1/exchangis_user_manual_cn.md
@@ -6,7 +6,7 @@
## 二、登录Exchangis1.0
- Exchangis1.0目前作为DSS**数据交换组件**的一部分，通过登录DSS的方式在组件列表中免密进入。所以，在使用Exchangis1.0之前，请对DSS，Exchangis1.0，Linkis等相关组件进行基本部署，保证组件功能可用，本文不进行赘述，详情见[exchangis部署文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/zh_CN/ch1/exchangis_deploy_cn.md)和[exchangis-appconn部署文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.0/docs/zh_CN/ch1/exchangis_appconn_deploy_cn.md)
+ Exchangis1.0目前作为DSS**数据交换组件**的一部分，通过登录DSS的方式在组件列表中免密进入。所以，在使用Exchangis1.0之前，请对DSS，Exchangis1.0，Linkis等相关组件进行基本部署，保证组件功能可用，本文不进行赘述，详情见[exchangis部署文档](docs/zh_CN/ch1/exchangis_deploy_cn.md)和[exchangis-appconn部署文档](docs/zh_CN/ch1/exchangis_appconn_deploy_cn.md)
### 1、登录DSS
diff --git a/exchangis-datasource/exchangis-datasource-service/src/main/java/com/webank/wedatasphere/exchangis/datasource/Utils/RSAUtil.java b/exchangis-datasource/exchangis-datasource-service/src/main/java/com/webank/wedatasphere/exchangis/datasource/Utils/RSAUtil.java
index d75996d99..b72cc7a6f 100644
--- a/exchangis-datasource/exchangis-datasource-service/src/main/java/com/webank/wedatasphere/exchangis/datasource/Utils/RSAUtil.java
+++ b/exchangis-datasource/exchangis-datasource-service/src/main/java/com/webank/wedatasphere/exchangis/datasource/Utils/RSAUtil.java
@@ -1,11 +1,9 @@
package com.webank.wedatasphere.exchangis.datasource.Utils;
import org.apache.linkis.common.conf.CommonVars;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+import java.util.Base64;
import javax.crypto.Cipher;
-import java.io.IOException;
import java.security.*;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
@@ -78,13 +76,11 @@ public static byte[] privateDecrypt(byte[] content, PrivateKey privateKey) throw
//字节数组转Base64编码
public static String byte2Base64(byte[] bytes){
- BASE64Encoder encoder = new BASE64Encoder();
- return encoder.encode(bytes);
+ return Base64.getEncoder().encodeToString(bytes);
}
//Base64编码转字节数组
- public static byte[] base642Byte(String base64Key) throws IOException {
- BASE64Decoder decoder = new BASE64Decoder();
- return decoder.decodeBuffer(base64Key);
+ public static byte[] base642Byte(String base64Key) {
+ return Base64.getDecoder().decode(base64Key);
}
}
diff --git a/exchangis-job/exchangis-job-server/src/main/test/com/webank/wedatasphere/exchangis/job/server/builder/JobBuilderTest.java b/exchangis-job/exchangis-job-server/src/main/test/com/webank/wedatasphere/exchangis/job/server/builder/JobBuilderTest.java
index e2472d34e..5a30a1231 100644
--- a/exchangis-job/exchangis-job-server/src/main/test/com/webank/wedatasphere/exchangis/job/server/builder/JobBuilderTest.java
+++ b/exchangis-job/exchangis-job-server/src/main/test/com/webank/wedatasphere/exchangis/job/server/builder/JobBuilderTest.java
@@ -57,7 +57,7 @@ public static void main(String[] args) throws ExchangisJobException, JsonProcess
" \"preSql\": [], \n" +
" \"connection\": [\n" +
" {\n" +
- " \"jdbcUrl\":\"jdbc:mysql://172.24.2.61:3306/test\", \n" +
+ " \"jdbcUrl\":\"jdbc:mysql://127.0.0.1:3306/test\", \n" +
" \"table\": [\"testtab\"]\n" +
" }\n" +
" ]\n" +
diff --git a/exchangis-job/exchangis-job-service/pom.xml b/exchangis-job/exchangis-job-service/pom.xml
index 61a1b2133..44ffac3db 100644
--- a/exchangis-job/exchangis-job-service/pom.xml
+++ b/exchangis-job/exchangis-job-service/pom.xml
@@ -21,12 +21,12 @@
com.webank.wedatasphere.exchangis
exchangis-job-common
- 1.1.1
+ 1.1.2
com.webank.wedatasphere.exchangis
exchangis-job-launcher
- 1.1.1
+ 1.1.2
diff --git a/images/en_US/ch1/code.png b/images/en_US/ch1/code.png
new file mode 100644
index 000000000..cec5ef68c
Binary files /dev/null and b/images/en_US/ch1/code.png differ
diff --git a/images/zh_CN/ch1/code.png b/images/zh_CN/ch1/code.png
new file mode 100644
index 000000000..cec5ef68c
Binary files /dev/null and b/images/zh_CN/ch1/code.png differ
diff --git a/images/zh_CN/ch1/frontend_view.png b/images/zh_CN/ch1/frontend_view.png
new file mode 100644
index 000000000..bad523915
Binary files /dev/null and b/images/zh_CN/ch1/frontend_view.png differ
diff --git a/images/zh_CN/ch1/home_page_en.png b/images/zh_CN/ch1/home_page_en.png
new file mode 100644
index 000000000..a752e2984
Binary files /dev/null and b/images/zh_CN/ch1/home_page_en.png differ
diff --git a/images/zh_CN/ch1/home_page_zh.png b/images/zh_CN/ch1/home_page_zh.png
new file mode 100644
index 000000000..2b71f53b3
Binary files /dev/null and b/images/zh_CN/ch1/home_page_zh.png differ
diff --git a/web/README.md b/web/README.md
index 43249b1fd..b7500960c 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,3 +1,3 @@
# Exchangis Web
-基于[FES](https://winixt.gitee.io/fesjs/zh/)打造的管理系统
+基于[FES](https://webank.gitee.io/fes.js/)打造的管理系统