Merge remote-tracking branch 'origin/developer' into developer

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

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -81,9 +82,13 @@ public class PlaceholderUtils {
             log.info("-----------命令{}，不需要替换-----------",command);
             return command;
         }
-        byte[] bytes = resolvePlaceholders(command.getBytes(), param);
-        return new String(bytes, StandardCharsets.UTF_8);
+        StringBuilder sb = new StringBuilder(command);
+        for (Map.Entry<String, String> stringStringEntry : param.entrySet()) {
+            sb.append(" -").append(stringStringEntry.getKey()).append(" ").append(stringStringEntry.getValue());
         }
+        return sb.toString();
+    }
+
 
     /**
      * 脚本时间参数替换
@@ -160,8 +165,12 @@ public class PlaceholderUtils {
 
         String s = PlaceholderUtils.paramPlaceholder(jsonString, "2020/3/12 15:13");*/
 
-        System.out.println(initCommand("python ${biz_file}","D:/2020project/byit-myth-job/demo-client/byit-demo-client/src/main/java/com/byit/job/Mains.java"));
-
+        //System.out.println(initCommand("python ${biz_file}","D:/2020project/byit-myth-job/demo-client/byit-demo-client/src/main/java/com/byit/job/Mains.java"));
+        System.out.println(commandReplace("python test.py", new HashMap<String, String>() {{
+            put("name", "张三");
+            put("age", "14");
+            put("sex", "男");
+        }}));
 
     }
 }