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

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

@@ -30,7 +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) (.*)";
+    public static final String JAVA_JAR_JAR_PATTERN = "java -jar (.*) (.*\\.jar) (.*)";
 
     /**
      * 占位符数据替换
@@ -83,8 +83,9 @@ public class PlaceholderUtils {
             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);
+                String env = m.group(2);
+                String paramSuffix = m.group(3);
+                command = String.format("java&&-jar&&%s&&%s&&%s",jarName,env,paramSuffix);
             }
             command = commandDateReplace(param, command);
         }
@@ -93,6 +94,21 @@ public class PlaceholderUtils {
     }
 
 
+    public static void main(String[] args) {
+        String cmd = "java -jar -Djava.security.egd=file:/dev/./urandom /ddmp/sqlEngine/ddmp-engine.jar {isReRun:false,jobId:8367,type:\"sql\",engineId:13,exterPath:\"/ddmp/sqlEngine\",storeType:\"redis\",contentKey:\"JOBCONTENT:8367:cCSVVTsb\",tenant:0000,flowId:\"\",projectId:33,nowDate:\"2020-11-09 12:10:02\",bizDate:\"20201108\"}";
+        Pattern p=Pattern.compile(JAVA_JAR_JAR_PATTERN);
+        Matcher m=p.matcher(cmd);
+        ;
+        if(m.find()){
+            String jarName = m.group(1);
+            String env = m.group(2);
+            String paramSuffix = m.group(3);
+            System.out.println(String.format("java&&-jar&&%s&&%s&&%s", jarName,env, paramSuffix));
+        }
+
+
+    }
+
     /**
      * 命令日期替换
      *