Merge 427a368 into 23d6437

gaoyan1998 · web-flow · commit 345b2aa3968e · 2024-07-02T02:57:27.000Z
diff --git a/docs/docs/en/guide/task/dinky.md b/docs/docs/en/guide/task/dinky.md
@@ -17,11 +17,12 @@ it will call `Dinky API` to trigger dinky task. Click [here](http://www.dlink.to
 
 - Please refer to [DolphinScheduler Task Parameters Appendix](appendix.md) `Default Task Parameters` section for default parameters.
 
-| **Parameter** |                                                                                       **Description**                                                                                        |
-|---------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Dinky Address | The url for a dinky server.                                                                                                                                                                  |
-| Dinky Task ID | The unique task id for a dinky task.                                                                                                                                                         |
-| Online Task   | Specify whether the current dinky job is online. If yes, the submitted job can only be submitted successfully when it is published and there is no corresponding Flink job instance running. |
+|   **Parameter**   |                                                                                                                    **Description**                                                                                                                     |
+|-------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Dinky Address     | The URL for the Dinky service, e.g., http://localhost:8888.                                                                                                                                                                                            |
+| Dinky Task ID     | The unique task id for a dinky task.                                                                                                                                                                                                                   |
+| Online Task       | Specify whether the current dinky job is online. If yes, the submitted job can only be submitted successfully when it is published and there is no corresponding Flink job instance running.                                                           |
+| Custom Parameters | Starting from Dinky 1.0, support for passing custom parameters is available. Currently, only `IN` type inputs are supported, with no support for `OUT` type outputs. Supports the `${param}` syntax for retrieving global or local dynamic parameters. |
 
 ## Task Example
 
diff --git a/docs/docs/zh/guide/task/dinky.md b/docs/docs/zh/guide/task/dinky.md
@@ -17,11 +17,12 @@
 
 - 默认参数说明请参考[DolphinScheduler任务参数附录](appendix.md)`默认任务参数`一栏。
 
-|  **任务参数**   |                               **描述**                                |
-|-------------|---------------------------------------------------------------------|
-| Dinky 地址    | Dinky 服务的 url。                                                      |
-| Dinky 任务 ID | Dinky 作业对应的唯一ID。                                                    |
-| 上线作业        | 指定当前 Dinky 作业是否上线，如果是，则该被提交的作业只能处于已发布且当前无对应的 Flink Job 实例在运行才可提交成功。 |
+|  **任务参数**   |                                   **描述**                                   |
+|-------------|----------------------------------------------------------------------------|
+| Dinky 地址    | Dinky 服务的 url，例如：`http://localhost:8888`。                                  |
+| Dinky 任务 ID | Dinky 作业对应的唯一ID。                                                           |
+| 上线作业        | 指定当前 Dinky 作业是否上线，如果是，则该被提交的作业只能处于已发布且当前无对应的 Flink Job 实例在运行才可提交成功。        |
+| 自定义参数       | 从Dinky 1.0开始支持传递自定义参数，目前仅支持`IN`类型输入，不支持`OUT`类型输出。支持`${param}`方式获取全局或局部动态参数 |
 
 ## Task Example
 
diff --git a/docs/img/tasks/demo/dinky_task_id.png b/docs/img/tasks/demo/dinky_task_id.png
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java
@@ -27,6 +27,8 @@
 import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
 import org.apache.dolphinscheduler.plugin.task.api.model.Property;
 import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
+import org.apache.dolphinscheduler.plugin.task.api.parser.PlaceholderUtils;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpResponse;
@@ -343,11 +345,15 @@ private Map<String, String> generateVariables() {
             }
         }
         List<Property> localParams = this.dinkyParameters.getLocalParams();
+        Map<String, Property> prepareParamsMap = taskExecutionContext.getPrepareParamsMap();
         if (localParams == null || localParams.isEmpty()) {
             return variables;
         }
+        Map<String, String> convertMap = ParameterUtils.convert(prepareParamsMap);
         for (Property property : localParams) {
-            variables.put(property.getProp(), property.getValue());
+            String propertyValue = property.getValue();
+            String value = PlaceholderUtils.replacePlaceholders(propertyValue, convertMap, true);
+            variables.put(property.getProp(), value);
         }
         return variables;
     }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;`
`28`	`28`	`import org.apache.dolphinscheduler.plugin.task.api.model.Property;`
`29`	`29`	`import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;`
	`30`	`+import org.apache.dolphinscheduler.plugin.task.api.parser.PlaceholderUtils;`
	`31`	`+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;`
`30`	`32`
`31`	`33`	`import org.apache.commons.lang3.StringUtils;`
`32`	`34`	`import org.apache.http.HttpResponse;`
`@@ -343,11 +345,15 @@ private Map<String, String> generateVariables() {`
`343`	`345`	`}`
`344`	`346`	`}`
`345`	`347`	`List<Property> localParams = this.dinkyParameters.getLocalParams();`
	`348`	`+ Map<String, Property> prepareParamsMap = taskExecutionContext.getPrepareParamsMap();`
`346`	`349`	`if (localParams == null \|\| localParams.isEmpty()) {`
`347`	`350`	`return variables;`
`348`	`351`	`}`
	`352`	`+ Map<String, String> convertMap = ParameterUtils.convert(prepareParamsMap);`
`349`	`353`	`for (Property property : localParams) {`
`350`		`- variables.put(property.getProp(), property.getValue());`
	`354`	`+ String propertyValue = property.getValue();`
	`355`	`+ String value = PlaceholderUtils.replacePlaceholders(propertyValue, convertMap, true);`
	`356`	`+ variables.put(property.getProp(), value);`
`351`	`357`	`}`
`352`	`358`	`return variables;`
`353`	`359`	`}`