Commit 30669089 by huangfusuper

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

parent f826dc22
...@@ -96,6 +96,9 @@ public class ScriptExecutorJobTask implements TimerTask { ...@@ -96,6 +96,9 @@ public class ScriptExecutorJobTask implements TimerTask {
String runParam = mythJobTaskSchedule.getRunParam(); String runParam = mythJobTaskSchedule.getRunParam();
//获取命令 //获取命令
String command = mythJobTaskSchedule.getRunCommand(); String command = mythJobTaskSchedule.getRunCommand();
if (!command.startsWith(JAVA_TYPE)) {
command = command.replaceAll(" ","&&");
}
//转换参数对象为参数包装体 //转换参数对象为参数包装体
RunParamWrapped runParamWrapped = JSON.parseObject(runParam, RunParamWrapped.class); RunParamWrapped runParamWrapped = JSON.parseObject(runParam, RunParamWrapped.class);
//当参数包装体不为空时 证明存在参数 或私有或公有 //当参数包装体不为空时 证明存在参数 或私有或公有
......
...@@ -68,7 +68,6 @@ public class PlaceholderUtils { ...@@ -68,7 +68,6 @@ public class PlaceholderUtils {
return command; return command;
} }
if (!command.startsWith(JAVA_TYPE)) { if (!command.startsWith(JAVA_TYPE)) {
command = command.replaceAll(" ","&&");
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()) {
if(!"auditTime".equals(stringStringEntry.getKey())){ if(!"auditTime".equals(stringStringEntry.getKey())){
......
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