ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
XSWL1018 2024-06-18 11:26:10 +08:00
parent 2f68105826
commit 586d8048e7
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java
View File

@ -1,6 +1,5 @@
package com.ruoyi.middleware.minio.config; package com.ruoyi.middleware.minio.config;
import io.minio.MinioClient; import io.minio.MinioClient;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -30,9 +29,14 @@ public class MinioConfig {
@PostConstruct @PostConstruct
public void init() { public void init() {
System.out.println(maxSize);
List<MinioClientConfig.MinioClientEntity> collect = minioClientConfig.getSlave().stream().map(item -> { List<MinioClientConfig.MinioClientEntity> 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; return item;
}).toList(); }).toList();
collect.forEach(item -> { collect.forEach(item -> {
@ -41,7 +45,12 @@ public class MinioConfig {
}); });
MinioClientConfig.MinioClientEntity master = minioClientConfig.getMaster(); 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; masterClient = master;
} }

3
ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileUtil.java
View File

@ -27,8 +27,7 @@ public class MinioFileUtil implements FileUtil {
if (FileUtils.isAbsolutePath(filePath)) { if (FileUtils.isAbsolutePath(filePath)) {
relativePath = FileUtils.getRelativePath(filePath); relativePath = FileUtils.getRelativePath(filePath);
} else { } else {
String absPath = RuoYiConfig.getProfile() + File.separator + filePath; relativePath = filePath;
relativePath = FileUtils.getRelativePath(absPath);
} }
return MinioUtil.uploadFile(minioConfig.getMasterClient().getDefaultBuket(), relativePath, file); return MinioUtil.uploadFile(minioConfig.getMasterClient().getDefaultBuket(), relativePath, file);
} }