Merge pull request #4 from WeBankFinTech/master

up to version
WeBankFinTech · Jun 11, 2020 · bf3212e · bf3212e
2 parents 558fa9a + 9f97984
commit bf3212e
Show file tree

Hide file tree

Showing 13 changed files with 670 additions and 48 deletions.
diff --git a/README-ZH.md b/README-ZH.md
@@ -157,7 +157,7 @@ DSS主要特点：
 
 ## 快速安装使用
 
-点我进入[快速安装使用](docs/zh_CN/ch2/DSS快速安装使用文档.md)
+点我进入[快速安装使用](docs/zh_CN/ch2/DSS_LINKIS_Quick_Install.md)
 
 ## 架构
 
@@ -167,7 +167,7 @@ DSS主要特点：
 
 #### 1. 安装编译文档
 
-[快速安装使用文档](docs/zh_CN/ch2/DSS快速安装使用文档.md)
+[快速安装使用文档](docs/zh_CN/ch2/DSS_LINKIS_Quick_Install.md)
 
 [**DSS安装常见问题列表**](docs/zh_CN/ch1/DSS安装常见问题列表.md)
 
@@ -203,4 +203,4 @@ DSS主要特点：
 
 ## License
 
-DSS is under the Apache 2.0 license. See the [License](LICENSE) file for details.
+DSS is under the Apache 2.0 license. See the [License](LICENSE) file for details.
diff --git a/conf/config.sh b/conf/config.sh
@@ -71,7 +71,7 @@ VISUALIS_NGINX_PORT=8088
 
 #azkaban address for check
 AZKABAN_ADRESS_IP=127.0.0.1
-AZKABAN_ADRESS_PORT=8091
+AZKABAN_ADRESS_PORT=8081
 
 #qualitis.address for check
 QUALITIS_ADRESS_IP=127.0.0.1

diff --git a/db/azkaban.sql b/db/azkaban.sql
@@ -1,3 +1,4 @@
 INSERT INTO `dss_application` (`id`, `name`, `url`, `is_user_need_init`, `level`, `user_init_url`, `exists_project_service`, `project_url`, `enhance_json`, `if_iframe`, `homepage_url`, `redirect_url`) VALUES (NULL, 'schedulis', NULL, '0', '1', NULL, '0', NULL, NULL, '1', NULL, NULL);
-UPDATE `dss_application` SET url = 'http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT', project_url = 'http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/manager?project=${projectName}',homepage_url = 'http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/homepage' WHERE `name` in
- ('schedulis');
+UPDATE `dss_application` SET url = 'http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT', project_url = 'http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/manager?project=${projectName}',homepage_url = 'http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/homepage' WHERE `name` in ('schedulis');
+SELECT @shcedulis_id:=id FROM `dss_application` WHERE `name` = 'schedulis';
+insert into dss_workflow_node values(null,null,'linkis.shell.sh',@shcedulis_id,1,1,0,1,null);
diff --git a/docs/zh_CN/ch1/DSS安装常见问题列表.md b/docs/zh_CN/ch1/DSS安装常见问题列表.md
@@ -3,17 +3,20 @@
 **本文档汇总DSS安装过程中所有问题列表及解决方式，为社区用户安装DSS提供参考。**
 
 
-#### (1) 创建工程提示用户token为空
+#### (1) 创建工程失败:add scheduler project用户token为空
 
 ```
-sudo vi dss-server/conf/token.properties
-```
-
-添加用户
+{"method":null,"status":1,"message":"error code(错误码): 90002, error message(错误信息): add scheduler project failederrCode: 90019 ,desc: errCode: 90020 ,desc: 用户token为空 ,ip: dss.com ,port: 9004 ,serviceKind: dss-server ,ip: dss.com ,port: 9004 ,serviceKind: dss-server.","data":{"errorMsg":{"serviceKind":"dss-server","level":2,"port":9004,"errCode":90002,"ip":"dss.com","desc":"add scheduler project failederrCode: 90019 ,desc: errCode: 90020 ,desc: 用户token为空 ,ip: dss.com ,port: 9004 ,serviceKind: dss-server ,ip: dss.com ,port: 9004 ,serviceKind: dss-server"}}}
 
 ```
-xxx=xxx
-```
+
+确保dss-server的token.properties中添加了此用户，并保持与 azkaban 的 azkaban-users.xml用户一致
+以hadoop用户为例:
+1、在dss-server的token.properties添加
+hadoop=hadoop
+2、在azkaban azkaban-users.xml 文件 添加
+<user groups="hadoop" password="hadoop" roles="admin" username="hadoop"/
+用户名密码务必保持一致
 
 #### (2) visualis执行报错，找不到driver驱动