diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java index 340053844a0d21fda0302c10bf2799cb264604a6..e5e85a43327bf4ccbfbff49e932bc56f0b176877 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java @@ -318,7 +318,7 @@ public abstract class AbstractCommandExecutor { try (BufferedReader inReader = new BufferedReader(new InputStreamReader(process.getInputStream()))) { String line; while ((line = inReader.readLine()) != null) { - if (line.startsWith("${setValue(")) { + if (line.startsWith("${setValue(") || line.startsWith("#{setValue(")) { varPool.append(findVarPool(line)); varPool.append("$VarPool$"); } else { diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java index 209be57e7172af0a0325236c3521c4235e0c3870..bb00b6257bb3f1ef34e99b81e6efdda8d5fb3eb8 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java @@ -28,7 +28,7 @@ public class TaskConstants { public static final String APPLICATION_REGEX = "application_\\d+_\\d+"; - public static final String SETVALUE_REGEX = "\\$\\{setValue\\(([^)]*)\\)}"; + public static final String SETVALUE_REGEX = "[\\$#]\\{setValue\\(([^)]*)\\)}"; /** * string false