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

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowOperatingServiceImpl.java

@@ -145,8 +145,11 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
                 if(StringUtils.isNoneBlank(runCommand)){
                     if(runCommand.startsWith(JAVA_TYPE) && CollectionUtil.isNotEmpty(publicParam)){
                         publicParam.forEach((k,v) ->{
-                            String keyName = String.format("${%s}",k);
-                            runCommand.replace(keyName, v);
+                            if(!"auditTime".equals(k)){
+                                String keyName = String.format("${%s}",k);
+                                runCommand.replace(keyName, v);
+                            }
+
                         });
                         node.setRunCommand(runCommand);
                     }

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

@@ -10,6 +10,8 @@ import org.apache.commons.lang3.StringUtils;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 占位符替换工具类
@@ -28,6 +30,7 @@ public class PlaceholderUtils {
      */
     private static final String PLACEHOLDER_SUFFIX = "}";
     public static final String JAVA_TYPE = "java";
+    public static final String JAVA_JAR_JAR_PATTERN = "java -jar (.*\\.jar) (.*)";
 
     /**
      * 占位符数据替换
@@ -68,16 +71,28 @@ public class PlaceholderUtils {
             command = command.replaceAll(" ","&&");
             StringBuilder sb = new StringBuilder(command);
             for (Map.Entry<String, String> stringStringEntry : param.entrySet()) {
-                sb.append("&&-").append(stringStringEntry.getKey()).append("&&").append(String.format("'%s'",stringStringEntry.getValue()));
+                if(!"auditTime".equals(stringStringEntry.getKey())){
+                    sb.append("&&-").append(stringStringEntry.getKey()).append("&&").append(String.format("'%s'",stringStringEntry.getValue()));
+                }
+
             }
             return sb.toString();
         }else{
+            Pattern p=Pattern.compile(JAVA_JAR_JAR_PATTERN);
+
+            Matcher m=p.matcher(command);
+            if(m.find()){
+                String jarName = m.group(1);
+                String paramSuffix = m.group(2);
+                command = String.format("java&&-jar&&%s&&%s",jarName,paramSuffix);
+            }
             command = commandDateReplace(param, command);
         }
 
         return command;
     }
 
+
     /**
      * 命令日期替换
      *