From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/utils/tools/CmdUtils.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/tools/CmdUtils.java b/ard-work/src/main/java/com/ruoyi/utils/tools/CmdUtils.java
index 60a9915..3204542 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/tools/CmdUtils.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/tools/CmdUtils.java
@@ -7,6 +7,7 @@
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.util.List;
+import java.util.Map;
/**
* @Description: cmd鍛戒护宸ュ叿绫�
@@ -18,10 +19,20 @@
@Slf4j(topic = "cmd")
public class CmdUtils {
//鍚姩鍛戒护1
- public static void commandStart(String processName, List<String> command) {
- log.debug("鍚姩澶栭儴绋嬪簭:" + processName);
- command.forEach(v -> log.debug(v + " "));
+ public static void commandStart(String processName, List<String> command, Map<String, String> env) {
+ log.debug("鍚姩澶栭儴绋嬪簭:銆�" + processName+"銆�");
+// command.forEach(v -> log.debug(v + " "));
+ log.debug(String.join(" ", command));
ProcessBuilder builder = new ProcessBuilder();
+
+ // 鑾峰彇瀛愯繘绋嬬殑鐜鍙橀噺鏄犲皠
+ if (env != null) {
+ env.entrySet().forEach(entry -> {
+ log.debug(entry.getKey() + ":" + entry.getValue());
+ });
+ Map<String, String> envMap = builder.environment();
+ envMap.putAll(env);
+ }
//姝ｅ父淇℃伅鍜岄敊璇俊鎭悎骞惰緭鍑�
builder.redirectErrorStream(true);
builder.command(command);
@@ -36,13 +47,13 @@
// System.out.println(line);
// }
} catch (IOException e) {
- e.printStackTrace();
+ log.error("cmd寮傚父:" + e.getMessage());
}
}
// 缁撴潫鎸囧畾鍚嶇О鐨勮繘绋�
public static void stopProcess(String processName) {
- log.debug("灏濊瘯缁撴潫杩涚▼:"+processName);
+ log.debug("灏濊瘯缁撴潫杩涚▼:" + processName);
ProcessBuilder builder = new ProcessBuilder("taskkill", "/F", "/IM", processName);
Process process;
try {
--
Gitblit v1.9.3