From 72ba3c8daf0303d1afb39c5021eaab1514d3cc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=A4=A7?= <1504665037@qq.com> Date: Sat, 24 Jan 2026 15:36:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=80=9A=E8=BF=87=E9=85=8D=E7=BD=AE=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/file/service/LocalSysFileServiceImpl.java | 3 ++- .../java/com/ruoyi/file/service/MinioSysFileServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index 48e0ceb..9c2adf8 100644 --- a/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -4,6 +4,7 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.file.FileUtils; import com.ruoyi.file.utils.FileUploadUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -16,8 +17,8 @@ import java.io.ByteArrayOutputStream; * * @author ruoyi */ -@Primary @Service +@ConditionalOnProperty(name = "file.storage", havingValue = "local", matchIfMissing = true) public class LocalSysFileServiceImpl implements ISysFileService { /** * 资源映射路径 前缀 diff --git a/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java index 204291f..2d02240 100644 --- a/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java @@ -8,6 +8,7 @@ import io.minio.MinioClient; import io.minio.PutObjectArgs; import io.minio.RemoveObjectArgs; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -21,6 +22,7 @@ import java.io.InputStream; * @author ruoyi */ @Service +@ConditionalOnProperty(name = "file.storage", havingValue = "minio") public class MinioSysFileServiceImpl implements ISysFileService { @Autowired private MinioConfig minioConfig;