Merge pull request WeBankFinTech#320 from WeDataSphere/dev-1.0.0

LGTM.

README-ZH.md

@@ -53,8 +53,8 @@ Exchangis 抽象了一套统一的数据源和同步作业定义插件，允许
 
 
 ## 相关文档
-[安装部署文档](https://github.com/WeDataSphere/Exchangis/blob/dev-1.0.0-rc/docs/zh_CN/ch1/exchangis_deploy_cn.md) 
-[用户手册](https://github.com/WeDataSphere/Exchangis/blob/dev-1.0.0-rc/docs/zh_CN/ch1/exchangis_user_manual_cn.md)
+[安装部署文档](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)
 
 ## 交流贡献
 

README.md

@@ -52,8 +52,8 @@ With the help of [Linkis](https://github.com/apache/incubator-linkis) computing
 
 ## Documents
 
-[Quick Deploy](https://github.com/WeDataSphere/Exchangis/blob/dev-1.0.0-rc/docs/zh_CN/ch1/exchangis_deploy_cn.md) 
-[User Manual](https://github.com/WeDataSphere/Exchangis/blob/dev-1.0.0-rc/docs/zh_CN/ch1/exchangis_user_manual_cn.md)
+[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)
 
 ## Communication and contribution 
 

assembly-package/config/application-exchangis.yml

@@ -6,7 +6,7 @@ spring:
 eureka:
  client:
  serviceUrl:
- defaultZone: https://127.0.0.1:3306/eureka/
+ defaultZone: https://{IP}:{PORT}/eureka/
  instance:
  metadata-map:
  test: wedatasphere

assembly-package/config/config.sh

@@ -1,4 +1,11 @@
-LINKIS_GATEWAY_HOST=
-LINKIS_GATEWAY_PORT=
-EXCHANGIS_PORT=
-EUREKA_URL=
+#LINKIS_GATEWAY服务地址IP，用于查找linkis-mg-gateway服务
+LINKIS_GATEWAY_HOST={IP}
+
+#LINKIS_GATEWAY服务地址端口，用于查找linkis-mg-gateway服务
+LINKIS_GATEWAY_PORT={PORT}
+
+#Exchangis服务端口
+EXCHANGIS_PORT={PORT}
+
+#Eureka服务URL
+EUREKA_URL=https://{IP:PORT}/eureka/

assembly-package/config/db.sh

@@ -1,9 +1,9 @@
 # 设置数据库的连接信息
 # 包括IP地址、数据库名称、用户名、端口
-MYSQL_HOST=
-MYSQL_PORT=
-MYSQL_USERNAME=
-MYSQL_PASSWORD=
-DATABASE=
+MYSQL_HOST={IP}
+MYSQL_PORT={PORT}
+MYSQL_USERNAME={username}
+MYSQL_PASSWORD={password}
+DATABASE={dbName}
 
 

assembly-package/config/exchangis-server.properties

@@ -15,33 +15,25 @@
 #
 #
 
-#wds.linkis.test.mode=true
-wds.linkis.test.mode=false
+wds.linkis.server.mybatis.datasource.url=jdbc:mysql:https://{IP}:{PORT}/{database}?useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
 
-wds.linkis.server.mybatis.datasource.url=jdbc:mysql:https://127.0.0.1:3306/exchangis?useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+wds.linkis.server.mybatis.datasource.username={username}
 
-wds.linkis.server.mybatis.datasource.username=username
-
-wds.linkis.server.mybatis.datasource.password=password
-
-wds.linkis.gateway.ip=127.0.0.1
-wds.linkis.gateway.port=9001
-wds.linkis.gateway.url=https://127.0.0.1:9001/
+wds.linkis.server.mybatis.datasource.password={password}
 
 wds.linkis.log.clear=true
 
 wds.linkis.server.version=v1
 
-## datasource client
-wds.exchangis.datasource.client.serverurl=https://127.0.0.1:9001
+# datasource client
+wds.exchangis.datasource.client.serverurl=https://{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=https://127.0.0.1:9001
+wds.exchangis.client.linkis.server-url=https://{LINKIS_IP}:{LINKIS_PORT}/
 wds.exchangis.client.linkis.token.value=EXCHANGIS-AUTH
-
 wds.exchangis.datasource.extension.dir=exchangis-extds
 
 ##restful
@@ -65,5 +57,5 @@ 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.linkis-session.ticket.key=bdp-user-ticket-id
 

assembly-package/sbin/launcher.sh

@@ -32,6 +32,8 @@ DEBUG_PORT="7006"
 SPRING_PROFILE="exchangis"
 SLEEP_TIMEREVAL_S=2
 
+CONF_PATH=${DIR}/../config
+
 function LOG(){
  currentTime=`date "+%Y-%m-%d %H:%M:%S.%3N"`
  echo -e "$currentTime [${1}] ($$) $2" | tee -a ${SHELL_LOG}
@@ -212,7 +214,9 @@ launcher_start(){
  wait_for_startup 20 $1 $2
  if [[ $? -eq 0 ]]; then
  LOG INFO "Launcher: [ $1 ] start success"
- LOG INFO "Please check exchangis server in EUREKA_ADDRESS: ${EUREKA_URL} "
+ APPLICATION_YML="${CONF_PATH}/application-exchangis.yml"
+ EUREKA_URL=`cat ${APPLICATION_YML} | grep Zone | sed -n '1p'`
+ LOG INFO "Please check exchangis server in EUREKA_ADDRESS: ${EUREKA_URL#*:} "
  else
  LOG ERROR "Launcher: [ $1 ] start fail over 20 seconds, please retry it"
  fi

db/exchangis_ddl.sql

@@ -81,6 +81,16 @@ CREATE TABLE `exchangis_project_info` (
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1497870871035973934 DEFAULT CHARSET=utf8;
 
+-- exchangis_v4.exchangis_project_user definition
+CREATE TABLE `exchangis_project_user` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `project_id` bigint(20) NOT NULL,
+ `priv_user` varchar(32) COLLATE utf8_bin DEFAULT NULL,
+ `priv` int(20) DEFAULT NULL,
+ `last_update_time` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=84 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT
+
 -- exchangis_v4.exchangis_launchable_task definition
 DROP TABLE IF EXISTS `exchangis_launchable_task`;
 CREATE TABLE `exchangis_launchable_task` (

docs/en_US/ch1/exchangis_deploy_en.md

@@ -28,7 +28,7 @@ $\color{#FF0000}{Note: be sure to reinstall dss1.0.1, and the linkis version mus
 
 [linkis1.1.1 code address ](https://github.com/apache/incubator-linkis/tree/release-1.1.1) 
 
-[DSS1.0.1 code address ](https://github.com/WeBankFinTech/DataSphereStudio/tree/master)
+[DSS1.0.1 code address ](https://github.com/WeBankFinTech/DataSphereStudio/tree/dev-1.1.0)
 
 datasource enabled 
 
@@ -63,7 +63,7 @@ Please ensure that DSS1.0.1 and Linkis1.1.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).
+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.0.0).
 
 #### 2.1.2 Compile and package 
 
@@ -187,7 +187,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)
+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/web-dist.zip)
 
 You can also compile the exchange front-end by yourself and execute the following command in the exchanise root directory:
 
@@ -269,12 +269,12 @@ Please visit the Exchange front-end page at https://${EXCHANGIS_INSTALL_IP}:8098
 
 ## 3. DSS ExchangisAppConn installation and deployment 
 
-If you want to use Exchangis1.0.1 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.1-rc/docs/en_US/ch1/exchangis_appconn_deploy_en.md)
+If you want to use Exchangis1.0.1 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)
 
 ## 4. Linkis Sqoop engine installation and deployment 
 
-If you want to execute the Sqoop operation of Exchangis1.0.1 normally, you also need to install the Linkis Sqoop engine. Please refer to: : [Linkis Sqoop engine installation documentation ](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.0.1-rc/docs/en_US/ch1/exchangis_sqoop_deploy_en.md)
+If you want to execute the Sqoop operation of Exchangis1.0.1 normally, you also need to install the Linkis Sqoop engine. Please refer to: : [Linkis Sqoop engine installation documentation ](https://linkis.staged.apache.org/zh-CN/docs/1.1.2/engine_usage/sqoop)
 
 ## 5. How to log in and use Exchangis
 
- To be supplemented !
+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)