This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new da2d421 Update system-manual.md（cn、en） (#352)
da2d421 is described below
commit da2d421a1f9a47d624075da021d85b0bd9af2986
Author: nielifeng <[email protected]>
AuthorDate: Thu May 6 17:50:40 2021 +0800
Update system-manual.md（cn、en） (#352)
* Update system-manual.md
up
* Update system-manual.md
* update system-manual doc style
update system-manual doc style
---
docs/en-us/1.3.5/user_doc/system-manual.md | 15 +++++++++++----
docs/zh-cn/1.3.5/user_doc/quick-start.md | 3 ++-
docs/zh-cn/1.3.5/user_doc/system-manual.md | 10 ++++++----
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/docs/en-us/1.3.5/user_doc/system-manual.md
b/docs/en-us/1.3.5/user_doc/system-manual.md
index 0a99e51..aeab87e 100644
--- a/docs/en-us/1.3.5/user_doc/system-manual.md
+++ b/docs/en-us/1.3.5/user_doc/system-manual.md
@@ -272,6 +272,7 @@ conf/common/hadoop.properties
</p>
- Create a file
+
> The file format supports the following types: txt, log, sh, conf, cfg, py,
java, sql, xml, hql, properties
<p align="center">
@@ -305,6 +306,7 @@ conf/common/hadoop.properties
</p>
- delete
+
> File list -> Click the "Delete" button to delete the specified file
#### 3.3 UDF management
@@ -315,11 +317,13 @@ conf/common/hadoop.properties
> Operation function: rename, download, delete.
- Upload udf resources
+
> Same as uploading files.
#### 3.3.2 Function management
- Create UDF function
+
> Click "Create UDF Function", enter the udf function parameters, select the
udf resource, and click "Submit" to create the udf function.
> Currently only supports temporary UDF functions of HIVE
@@ -634,6 +638,7 @@ worker.groups=default,test
#### 7.2 Sub-process node
- The sub-process node is to execute a certain external workflow definition as
a task node.
+
> Drag the
task node in the toolbar to the drawing board, as shown in the following
figure:
<p align="center">
@@ -677,6 +682,7 @@ worker.groups=default,test
#### 7.4 Stored procedure node
- According to the selected data source, execute the stored procedure.
+
> Drag in the
toolbarThe
task node to the drawing board, as shown in the following figure:
<p align="center">
@@ -762,8 +768,9 @@ Note: JAVA and Scala are only used for identification,
there is no difference, i
- Program type: select Python language
- Main jar package: is the Python jar package for running MR
- Other parameters: support -D, -mapper, -reducer, -input -output format, here
you can set the input of user-defined parameters, such as:
-- -mapper "mapper.py 1" -file mapper.py -reducer reducer.py -file reducer.py
–input /journey/words.txt -output /journey/out/mr/\${currentTimeMillis}
-- The mapper.py 1 after -mapper is two parameters, the first parameter is
mapper.py, and the second parameter is 1
+
+ - -mapper "mapper.py 1" -file mapper.py -reducer reducer.py -file reducer.py
–input /journey/words.txt -output /journey/out/mr/\${currentTimeMillis}
+ - The mapper.py 1 after -mapper is two parameters, the first parameter is
mapper.py, and the second parameter is 1
- Resource: If the resource file is referenced in other parameters, you need
to select and specify in the resource
- User-defined parameter: It is a user-defined parameter of the MR part, which
will replace the content with \${variable} in the script
@@ -846,7 +853,7 @@ Note: JAVA and Scala are only used for identification,
there is no difference, i
- json: json configuration file for datax synchronization
- Custom parameters: SQL task type, and stored procedure is a custom parameter
order to set values for the method. The custom parameter type and data type are
the same as the stored procedure task type. The difference is that the SQL task
type custom parameter will replace the \${variable} in the SQL statement.
-#### 8. parameter
+### 8. parameter
#### 8.1 System parameters
@@ -902,4 +909,4 @@ Note: JAVA and Scala are only used for identification,
there is no difference, i
<img src="/img/global_parameter_en.png" width="80%" />
</p>
-- In the task, local_param_bizdate uses \${global_bizdate} to refer to global
parameters. For scripts, you can use \${local_param_bizdate} to refer to the
value of global variable global_bizdate, or directly set the value of
local_param_bizdate through JDBC.
+- In the task, local_param_bizdate uses \${global_bizdate} to refer to global
parameters. For scripts, you can use \${local_param_bizdate} to refer to the
value of global variable global_bizdate, or directly set the value of
local_param_bizdate through JDBC.
\ No newline at end of file
diff --git a/docs/zh-cn/1.3.5/user_doc/quick-start.md
b/docs/zh-cn/1.3.5/user_doc/quick-start.md
index 72a0a89..1a7df26 100644
--- a/docs/zh-cn/1.3.5/user_doc/quick-start.md
+++ b/docs/zh-cn/1.3.5/user_doc/quick-start.md
@@ -1,6 +1,7 @@
# 快速上手
* 管理员用户登录
+
>地址：http://192.168.xx.xx:12345/dolphinscheduler
用户名密码：admin/dolphinscheduler123
<p align="center">
@@ -31,7 +32,7 @@
<p align="center">
<img src="/img/worker_group.png" width="60%" />
</p>
-
+
* 创建token令牌
<p align="center">
<img src="/img/creat_token.png" width="60%" />
diff --git a/docs/zh-cn/1.3.5/user_doc/system-manual.md
b/docs/zh-cn/1.3.5/user_doc/system-manual.md
index e515d8c..e2fa46b 100644
--- a/docs/zh-cn/1.3.5/user_doc/system-manual.md
+++ b/docs/zh-cn/1.3.5/user_doc/system-manual.md
@@ -96,6 +96,7 @@
<img src="/img/run-work.png" width="80%" />
</p>
<span id=runParamers>工作流运行参数说明：</span>
+
*
失败策略：当某一个任务节点执行失败时，其他并行的任务节点需要执行的策略。”继续“表示：某一任务失败后，其他任务节点正常执行；”结束“表示：终止所有正在执行的任务，并终止整个流程。
* 通知策略：当流程结束，根据流程状态发送流程执行信息通知邮件，包含任何状态都不发，成功发，失败发，成功或失败都发。
@@ -721,10 +722,11 @@ worker.groups=default,test
- 程序类型：选择Python语言
- 主jar包：是运行MR的Python jar包
- 其他参数：支持 –D、-mapper、-reducer、-input -output格式，这里可以设置用户自定义参数的输入，比如：
- - -mapper "mapper.py 1" -file mapper.py -reducer reducer.py -file
reducer.py –input /journey/words.txt -output
/journey/out/mr/${currentTimeMillis}
- - 其中 -mapper 后的 mapper.py 1是两个参数，第一个参数是mapper.py，第二个参数是1
- - 资源： 如果其他参数中引用了资源文件，需要在资源中选择指定
- - 自定义参数：是MR局部的用户自定义参数，会替换脚本中以${变量}的内容
+ - -mapper "mapper.py 1" -file mapper.py -reducer reducer.py -file
reducer.py –input /journey/words.txt -output
/journey/out/mr/${currentTimeMillis}
+ - 其中 -mapper 后的 mapper.py 1是两个参数，第一个参数是mapper.py，第二个参数是1
+- 资源： 如果其他参数中引用了资源文件，需要在资源中选择指定
+- 自定义参数：是MR局部的用户自定义参数，会替换脚本中以${变量}的内容
+
#### 7.8 Python节点
- 使用python节点，可以直接执行python脚本，对于python节点，worker会使用`python **`方式提交任务。
