From ba5bd31ecf829d2b462bd3f62b566828b347a89a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 13:36:18 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java
index a0a3f6c..7067aad 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/WorkShopFileServiceImpl.java
@@ -7,7 +7,9 @@
import com.ruoyi.basic.mapper.*;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.WorkShopFileService;
+import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.utils.file.MinioUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -37,8 +39,8 @@
@Resource
private MinioUtils minioUtils;
- @Value("${minio.bucketName}")
- private String bucketName;
+ @Autowired
+ private MinioConfig minioConfig;
@Override
public int delFile(Integer id) {
@@ -51,9 +53,9 @@
WorkShopFile file = workShopFileMapper.selectById(id);
if (file != null && file.getFileUrl() != null) {
// 妫�鏌� MinIO 涓枃浠舵槸鍚﹀瓨鍦�
- if (minioUtils.objectExists(bucketName, file.getFileUrl())) {
+ if (minioUtils.objectExists(minioConfig.getBucketName(), file.getFileUrl())) {
// 鍏堝垹闄� MinIO 涓殑瀵硅薄
- minioUtils.removeObjectsResult(bucketName, file.getFileUrl());
+ minioUtils.removeObjectsResult(minioConfig.getBucketName(), file.getFileUrl());
}
}
// 鎵ц鏁版嵁搴撳垹闄ゆ搷浣�
--
Gitblit v1.9.3