Bladeren bron

[Improvement][server] varPool support syntax #{setValue(key=value)} (#9586)

exmy 3 jaren geleden
bovenliggende
commit
36f01155b5

+ 1 - 1
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 {

+ 1 - 1
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