Commit cf803d41 by huangfusuper

java参数替换 命令日志信息更新

parent a2758aea
...@@ -66,7 +66,7 @@ public class PlaceholderUtils { ...@@ -66,7 +66,7 @@ public class PlaceholderUtils {
if (!command.startsWith(JAVA_TYPE)) { if (!command.startsWith(JAVA_TYPE)) {
StringBuilder sb = new StringBuilder(command); StringBuilder sb = new StringBuilder(command);
for (Map.Entry<String, String> stringStringEntry : param.entrySet()) { for (Map.Entry<String, String> stringStringEntry : param.entrySet()) {
sb.append(" -").append(stringStringEntry.getKey()).append(" ").append(String.format("'%s'",stringStringEntry.getValue())); sb.append(" -").append(stringStringEntry.getKey()).append("&&").append(String.format("'%s'",stringStringEntry.getValue()));
} }
return sb.toString(); return sb.toString();
}else{ }else{
......
...@@ -43,7 +43,7 @@ public class RunScriptProcessingMachine implements ProcessingMachine { ...@@ -43,7 +43,7 @@ public class RunScriptProcessingMachine implements ProcessingMachine {
boolean isRunNode = scriptDto.getRunId().contains("REAL:EXEC:"); boolean isRunNode = scriptDto.getRunId().contains("REAL:EXEC:");
String runKey = KeyUtil.generateRunKey(scriptDto.getLogId()); String runKey = KeyUtil.generateRunKey(scriptDto.getLogId());
try { try {
List<String> cmdList = Arrays.asList(scriptDto.getCommand().split(" ")); List<String> cmdList = Arrays.asList(scriptDto.getCommand().split("&&"));
List<String> newCmdList = new ArrayList<>(); List<String> newCmdList = new ArrayList<>();
cmdList.forEach(cmd ->{ cmdList.forEach(cmd ->{
if (StringUtils.isNotBlank(cmd)) { if (StringUtils.isNotBlank(cmd)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment