datax命令支持

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/ScriptExecutorJobTask.java

@@ -96,6 +96,7 @@ public class ScriptExecutorJobTask implements TimerTask {
         String runParam = mythJobTaskSchedule.getRunParam();
         //获取命令
         String command = mythJobTaskSchedule.getRunCommand();
+        command = PlaceholderUtils.formatJavaJarCommand(command);
         if (!command.startsWith(JAVA_TYPE)) {
             command = command.replaceAll(" ","&&");
         }

byit-myth-core/myth-core-common/src/main/java/com/byit/job/utils/PlaceholderUtils.java

@@ -77,6 +77,19 @@ public class PlaceholderUtils {
             }
             return sb.toString();
         }else{
+            command = commandDateReplace(param, command);
+
+            for (Map.Entry<String, String> stringStringEntry : param.entrySet()) {
+                String keyName = String.format("${%s}",stringStringEntry.getKey());
+                command = command.replace(keyName, stringStringEntry.getValue());
+            }
+        }
+
+        return command;
+    }
+
+    public static String formatJavaJarCommand(String command){
+        if (command.startsWith(JAVA_TYPE)) {
             Pattern p=Pattern.compile(JAVA_JAR_JAR_PATTERN);
 
             Matcher m=p.matcher(command);
@@ -86,14 +99,9 @@ public class PlaceholderUtils {
                 String paramSuffix = m.group(3);
                 command = String.format("java&&-jar&&%s&&%s&&%s",jarName,env,paramSuffix);
             }
-            command = commandDateReplace(param, command);
-
-            for (Map.Entry<String, String> stringStringEntry : param.entrySet()) {
-                String keyName = String.format("${%s}",stringStringEntry.getKey());
-                command = command.replace(keyName, stringStringEntry.getValue());
-            }
         }
 
+
         return command;
     }