From f041323a2bce037843fcb163b017427baa556da3 Mon Sep 17 00:00:00 2001 From: liusuyi <1951119284@qq.com> Date: 星期三, 24 七月 2024 16:41:16 +0800 Subject: [PATCH] 优化:修改未读消息入库前判断不存在则插入 取消:程序自动拉起redis/mediamtx/minio,中间件全部服务化 增加:流媒体vtdu详情接口 --- ard-work/src/main/java/com/ruoyi/cmd/startup.java | 220 +++++++++++++++++++++++++++--------------------------- 1 files changed, 110 insertions(+), 110 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 9505455..c5f3825 100644 --- a/ard-work/src/main/java/com/ruoyi/cmd/startup.java +++ b/ard-work/src/main/java/com/ruoyi/cmd/startup.java @@ -29,122 +29,122 @@ **/ @Slf4j(topic = "cmd") @Component -public class startup implements ApplicationContextInitializer { +public class startup{ - //minio - String minioName = "minio.exe"; - @Value("${minio.accessKey}") - String accessKey; - @Value("${minio.secretKey}") - String secretKey; - @Value("${minio.path}") - String path; - @Value("${minio.enabled}") - Boolean minioEnabled; - - //mediamtx - String mediamtxName = "mediamtx.exe"; - @Value("${mediamtx.enabled}") - Boolean mediamtxEnabled; - //redis - String redisName = "redis-server.exe"; +// //minio +// String minioName = "minio.exe"; +// @Value("${minio.accessKey}") +// String accessKey; +// @Value("${minio.secretKey}") +// String secretKey; +// @Value("${minio.path}") +// String path; +// @Value("${minio.enabled}") +// Boolean minioEnabled; +// +// //mediamtx +// String mediamtxName = "mediamtx.exe"; +// @Value("${mediamtx.enabled}") +// Boolean mediamtxEnabled; +// //redis +// String redisName = "redis-server.exe"; /** * 绋嬪簭鍒濆鍖栧惎鍔╮edis * 鍒樿嫃涔� * 2023/9/22 10:38:41 */ - @Override - public void initialize(ConfigurableApplicationContext applicationContext) { - if (Platform.isWindows()) { - 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)) { - // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� - CmdUtils.stopProcess(redisName); - } - // 鍚姩鍚庡彴杩涚▼ - CmdUtils.commandStart(workingDir, redisName, cmd, null); - // 鍚姩cmd绐楀彛 - //String[] command = {"cmd", "/c", "start", exePath, "-H127.0.0.1:8000", "-o"}; - //CmdUtils.commandStart(command); - } - } +// @Override +// public void initialize(ConfigurableApplicationContext applicationContext) { +// if (Platform.isWindows()) { +// 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)) { +// // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� +// CmdUtils.stopProcess(redisName); +// } +// // 鍚姩鍚庡彴杩涚▼ +// CmdUtils.commandStart(workingDir, redisName, cmd, null); +// // 鍚姩cmd绐楀彛 +// //String[] command = {"cmd", "/c", "start", exePath, "-H127.0.0.1:8000", "-o"}; +// //CmdUtils.commandStart(command); +// } +// } - @PostConstruct - @Order(1) - public void init() { - if (minioEnabled) { - log.info("鍒濆鍖栧惎鍔╩inio"); - if (Platform.isWindows()) { - 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); - List<String> cmd = new ArrayList<>(); - cmd.add(exePath); - cmd.add("server"); - cmd.add(path); - cmd.add("--console-address=0.0.0.0:9000"); - cmd.add("--address=0.0.0.0:9001"); - if (CmdUtils.isProcessRunning(minioName)) { - // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� - CmdUtils.stopProcess(minioName); - } - // 鍚姩鍚庡彴杩涚▼ - CmdUtils.commandStart(workingDir, minioName, cmd, env); - // 鍚姩cmd绐楀彛 - //String[] command = {"cmd", "/c", "start", exePath}; - //CmdUtils.commandStart(command); - } - } - if (mediamtxEnabled) { - log.info("鍒濆鍖栧惎鍔╩ediaMTX"); - if (Platform.isWindows()) { - 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); - if (CmdUtils.isProcessRunning(mediamtxName)) { - // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� - CmdUtils.stopProcess(mediamtxName); - } - // 鍚姩鍚庡彴杩涚▼ - CmdUtils.commandStart(workingDir, mediamtxName, cmd, null); - // 鍚姩cmd绐楀彛 - //String[] command = {"cmd","/c","start",exePath,ymlPath}; - //CmdUtils.commandStart(command); - } - } - } - - @PreDestroy - public void destroy() { - if (minioEnabled) { - log.info("閿�姣乵inio"); - if (CmdUtils.isProcessRunning(minioName)) { - // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� - CmdUtils.stopProcess(minioName); - } - } - if (mediamtxEnabled) { - log.info("閿�姣乵ediaMtx"); - if (CmdUtils.isProcessRunning(mediamtxName)) { - // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� - CmdUtils.stopProcess(mediamtxName); - } - } - if (true) { - log.info("閿�姣乺edis"); - if (CmdUtils.isProcessRunning(redisName)) { - // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� - CmdUtils.stopProcess(redisName); - } - } - } +// @PostConstruct +// @Order(1) +// public void init() { +// if (minioEnabled) { +// log.info("鍒濆鍖栧惎鍔╩inio"); +// if (Platform.isWindows()) { +// 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); +// List<String> cmd = new ArrayList<>(); +// cmd.add(exePath); +// cmd.add("server"); +// cmd.add(path); +// cmd.add("--console-address=0.0.0.0:9000"); +// cmd.add("--address=0.0.0.0:9001"); +// if (CmdUtils.isProcessRunning(minioName)) { +// // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� +// CmdUtils.stopProcess(minioName); +// } +// // 鍚姩鍚庡彴杩涚▼ +// CmdUtils.commandStart(workingDir, minioName, cmd, env); +// // 鍚姩cmd绐楀彛 +// //String[] command = {"cmd", "/c", "start", exePath}; +// //CmdUtils.commandStart(command); +// } +// } +// if (mediamtxEnabled) { +// log.info("鍒濆鍖栧惎鍔╩ediaMTX"); +// if (Platform.isWindows()) { +// 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); +// if (CmdUtils.isProcessRunning(mediamtxName)) { +// // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� +// CmdUtils.stopProcess(mediamtxName); +// } +// // 鍚姩鍚庡彴杩涚▼ +// CmdUtils.commandStart(workingDir, mediamtxName, cmd, null); +// // 鍚姩cmd绐楀彛 +// //String[] command = {"cmd","/c","start",exePath,ymlPath}; +// //CmdUtils.commandStart(command); +// } +// } +// } +// +// @PreDestroy +// public void destroy() { +// if (minioEnabled) { +// log.info("閿�姣乵inio"); +// if (CmdUtils.isProcessRunning(minioName)) { +// // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� +// CmdUtils.stopProcess(minioName); +// } +// } +// if (mediamtxEnabled) { +// log.info("閿�姣乵ediaMtx"); +// if (CmdUtils.isProcessRunning(mediamtxName)) { +// // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� +// CmdUtils.stopProcess(mediamtxName); +// } +// } +// if (true) { +// log.info("閿�姣乺edis"); +// if (CmdUtils.isProcessRunning(redisName)) { +// // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� +// CmdUtils.stopProcess(redisName); +// } +// } +// } } -- Gitblit v1.9.3