From 7de353fa99cfe82101c434b5d080f6a5a1945aac Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 12 四月 2024 10:24:06 +0800
Subject: [PATCH] 提交部分备份
---
ard-work/src/main/java/com/ruoyi/cmd/startup.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/cmd/startup.java b/ard-work/src/main/java/com/ruoyi/cmd/startup.java
index 8e41c40..9505455 100644
--- a/ard-work/src/main/java/com/ruoyi/cmd/startup.java
+++ b/ard-work/src/main/java/com/ruoyi/cmd/startup.java
@@ -41,6 +41,7 @@
String path;
@Value("${minio.enabled}")
Boolean minioEnabled;
+
//mediamtx
String mediamtxName = "mediamtx.exe";
@Value("${mediamtx.enabled}")
@@ -56,7 +57,8 @@
@Override
public void initialize(ConfigurableApplicationContext applicationContext) {
if (Platform.isWindows()) {
- String exePath = System.getProperty("user.dir") + File.separator + "server" + File.separator + "redis" + File.separator + redisName;
+ String workingDir = System.getProperty("user.dir") + File.separator + "server" + File.separator + "redis";
+ String exePath = workingDir +File.separator+ redisName;
List<String> cmd = new ArrayList<>();
cmd.add(exePath);
if (CmdUtils.isProcessRunning(redisName)) {
@@ -64,7 +66,7 @@
CmdUtils.stopProcess(redisName);
}
// 鍚姩鍚庡彴杩涚▼
- CmdUtils.commandStart(redisName, cmd, null);
+ CmdUtils.commandStart(workingDir, redisName, cmd, null);
// 鍚姩cmd绐楀彛
//String[] command = {"cmd", "/c", "start", exePath, "-H127.0.0.1:8000", "-o"};
//CmdUtils.commandStart(command);
@@ -77,7 +79,8 @@
if (minioEnabled) {
log.info("鍒濆鍖栧惎鍔╩inio");
if (Platform.isWindows()) {
- String exePath = System.getProperty("user.dir") + File.separator + "server" + File.separator + "minio" + File.separator + minioName;
+ String workingDir = System.getProperty("user.dir") + File.separator + "server" + File.separator + "minio";
+ String exePath = workingDir + File.separator + minioName;
Map<String, String> env = new HashMap<>();
env.put("MINIO_ROOT_USER", accessKey);
env.put("MINIO_ROOT_PASSWORD", secretKey);
@@ -92,7 +95,7 @@
CmdUtils.stopProcess(minioName);
}
// 鍚姩鍚庡彴杩涚▼
- CmdUtils.commandStart(minioName, cmd, env);
+ CmdUtils.commandStart(workingDir, minioName, cmd, env);
// 鍚姩cmd绐楀彛
//String[] command = {"cmd", "/c", "start", exePath};
//CmdUtils.commandStart(command);
@@ -101,21 +104,21 @@
if (mediamtxEnabled) {
log.info("鍒濆鍖栧惎鍔╩ediaMTX");
if (Platform.isWindows()) {
- String exePath = System.getProperty("user.dir") + File.separator + "server" + File.separator + "mediamtx" + File.separator + mediamtxName;
- String ymlPath = System.getProperty("user.dir") + File.separator + "server" + File.separator + "mediamtx" + File.separator + "mediamtx.yml";
-
+ String workingDir = System.getProperty("user.dir") + File.separator + "server" + File.separator + "mediamtx";
+ String exePath = workingDir + File.separator + mediamtxName;
+ String ymlPath = workingDir + File.separator + "mediamtx.yml";
List<String> cmd = new ArrayList<>();
cmd.add(exePath);
- cmd.add(ymlPath);
+ // cmd.add(ymlPath);
if (CmdUtils.isProcessRunning(mediamtxName)) {
// 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
CmdUtils.stopProcess(mediamtxName);
}
// 鍚姩鍚庡彴杩涚▼
- CmdUtils.commandStart(mediamtxName, cmd, null);
+ CmdUtils.commandStart(workingDir, mediamtxName, cmd, null);
// 鍚姩cmd绐楀彛
-// String[] command = {"cmd","/c","start",exePath,ymlPath};
-// CmdUtils.commandStart(command);
+ //String[] command = {"cmd","/c","start",exePath,ymlPath};
+ //CmdUtils.commandStart(command);
}
}
}
@@ -144,4 +147,4 @@
}
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3