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/storage/minio/utils/MinioService.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MinioService.java b/ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioService.java similarity index 87% rename from ard-work/src/main/java/com/ruoyi/media/service/impl/MinioService.java rename to ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioService.java index 3c41b6c..2e095bc 100644 --- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MinioService.java +++ b/ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioService.java @@ -1,4 +1,4 @@ -package com.ruoyi.media.service.impl; +package com.ruoyi.storage.minio.utils; import com.ruoyi.utils.tools.CmdUtils; import com.sun.jna.Platform; @@ -61,10 +61,12 @@ @PreDestroy public void destroyMediaMtx() { - log.info("閿�姣乵inio"); - if (CmdUtils.isProcessRunning(processName)) { - // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� - CmdUtils.stopProcess(processName); + if (minioEnabled) { + log.info("閿�姣乵inio"); + if (CmdUtils.isProcessRunning(processName)) { + // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋� + CmdUtils.stopProcess(processName); + } } } } -- Gitblit v1.9.3