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

2
ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioClientConfig.java
View File

@ -94,7 +94,7 @@ public class MinioClientConfig {
this.accessKey = accessKey; this.accessKey = accessKey;
this.secretKey = secretKey; this.secretKey = secretKey;
this.name = name; this.name = name;
this.defaultBuket=defaultBuket; this.defaultBuket = defaultBuket;
} }
public MinioClientEntity() { public MinioClientEntity() {

25
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;
@ -13,12 +12,12 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
@Configuration("MinioConfiguration") @Configuration("MinioConfiguration")
@ConditionalOnProperty(prefix = "minio",name = {"enable"},havingValue = "true" , matchIfMissing = false) @ConditionalOnProperty(prefix = "minio", name = { "enable" }, havingValue = "true", matchIfMissing = false)
public class MinioConfig { public class MinioConfig {
public int maxSize; public int maxSize;
public static String prefix="/minio"; public static String prefix = "/minio";
@Autowired @Autowired
private MinioClientConfig minioClientConfig; private MinioClientConfig minioClientConfig;
@ -30,18 +29,28 @@ 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 -> {
slaveClients.put(item.getName(),item); slaveClients.put(item.getName(), item);
slaveClientsList.add(item); slaveClientsList.add(item);
}); });
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);
} }