public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-03-22 21:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 提供一个自定义的S3存储客户端配置的校验方法，由调用者决定校验的结果

Browse Source
This commit is contained in:
秋辞未寒
2026-03-15 22:01:58 +08:00
parent c94005e1ba
commit 222f3657d0
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/s3/client/S3StorageClient.java
View File

@@ -26,6 +26,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* S3 存储客户端接口。
@@ -381,12 +382,23 @@ public interface S3StorageClient extends AutoCloseable {
*/
String presignPutUrl(String key, Duration expiredTime, Map<String, String> metadata);
/**
* 校验客户端配置与传入的配置是否一致
* 校验客户端配置
*
* @param config 配置
* <p>注意：该方法不会修改任何既有的配置和状态，你看可以理解为这仅仅是一个配置展示的方法，以供调用者根据当前的配置，自行决定是否需要重新构建客户端。</p>
*
* @param verifyConfigAction 校验配置动作函数
* @return 是否一致
*/
boolean verifyConfig(S3StorageClientConfig config);
boolean verifyConfig(Function<S3StorageClientConfig,Boolean> verifyConfigAction);
/**
* 校验客户端配置与传入的待校验配置是否一致
*
* <p>注意：该方法不会修改任何既有的配置和状态，你看可以理解为这仅仅是一个配置展示的方法，以供调用者根据当前的配置，自行决定是否需要重新构建客户端。</p>
*
* @param verifyConfig 待校验的配置
* @return 是否一致
*/
boolean verifyConfig(S3StorageClientConfig verifyConfig);
}

11
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/s3/client/S3StorageClientImpl.java
View File

@@ -34,6 +34,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* S3 存储客户端实现类。
@@ -396,8 +397,14 @@ public class S3StorageClientImpl implements S3StorageClient {
}
@Override
public boolean verifyConfig(S3StorageClientConfig config) {
return Objects.equals(this.config,config);
public boolean verifyConfig(Function<S3StorageClientConfig,Boolean> verifyConfigAction) {
S3StorageClientConfig copy = S3StorageClientConfig.copy(config);
return Boolean.TRUE.equals(verifyConfigAction.apply(copy));
}
@Override
public boolean verifyConfig(S3StorageClientConfig verifyConfig) {
return verifyConfig(config -> Objects.equals(config,verifyConfig));
}
@Override