diff --git a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioClientConfig.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioClientConfig.java index 6a072c3..b2491af 100644 --- a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioClientConfig.java +++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioClientConfig.java @@ -94,7 +94,7 @@ public class MinioClientConfig { this.accessKey = accessKey; this.secretKey = secretKey; this.name = name; - this.defaultBuket=defaultBuket; + this.defaultBuket = defaultBuket; } public MinioClientEntity() { diff --git a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java index d0669d5..af55924 100644 --- a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java +++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java @@ -1,6 +1,5 @@ package com.ruoyi.middleware.minio.config; - import io.minio.MinioClient; import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; @@ -13,12 +12,12 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; @Configuration("MinioConfiguration") -@ConditionalOnProperty(prefix = "minio",name = {"enable"},havingValue = "true" , matchIfMissing = false) +@ConditionalOnProperty(prefix = "minio", name = { "enable" }, havingValue = "true", matchIfMissing = false) public class MinioConfig { public int maxSize; - public static String prefix="/minio"; + public static String prefix = "/minio"; @Autowired private MinioClientConfig minioClientConfig; @@ -30,18 +29,28 @@ public class MinioConfig { @PostConstruct public void init() { - System.out.println(maxSize); List collect = minioClientConfig.getSlave().stream().map(item -> { - item.setClient(MinioClient.builder().endpoint(item.getUrl()).credentials(item.getAccessKey(), item.getSecretKey()).build()); + try { + item.setClient(MinioClient.builder().endpoint(item.getUrl()) + .credentials(item.getAccessKey(), item.getSecretKey()).build()); + } catch (Exception exception) { + item.setClient(MinioClient.builder().endpoint(item.getUrl()).build()); + } + return item; }).toList(); - collect.forEach(item->{ - slaveClients.put(item.getName(),item); + collect.forEach(item -> { + slaveClients.put(item.getName(), item); slaveClientsList.add(item); }); MinioClientConfig.MinioClientEntity master = minioClientConfig.getMaster(); - master.setClient(MinioClient.builder().credentials(master.getAccessKey(),master.getSecretKey()).endpoint(master.getUrl()).build()); + try { + master.setClient(MinioClient.builder().endpoint(master.getUrl()) + .credentials(master.getAccessKey(), master.getSecretKey()).build()); + } catch (Exception exception) { + master.setClient(MinioClient.builder().endpoint(master.getUrl()).build()); + } masterClient = master; } diff --git a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileUtil.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileUtil.java index 4773427..7be7e4f 100644 --- a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileUtil.java +++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileUtil.java @@ -27,8 +27,7 @@ public class MinioFileUtil implements FileUtil { if (FileUtils.isAbsolutePath(filePath)) { relativePath = FileUtils.getRelativePath(filePath); } else { - String absPath = RuoYiConfig.getProfile() + File.separator + filePath; - relativePath = FileUtils.getRelativePath(absPath); + relativePath = filePath; } return MinioUtil.uploadFile(minioConfig.getMasterClient().getDefaultBuket(), relativePath, file); }