feat: update
This commit is contained in:
@@ -26,6 +26,7 @@ public class EncryptFilterConfig {
|
||||
config.setKey("d86d7bab3d6ac01ad9dc6a897652f2d2");//1.2版本及以下key 16位,1.2以上key 32位
|
||||
config.setRequestDecryptUriList(Collections.emptyList());
|
||||
config.setResponseCharset("UTF-8");
|
||||
config.setDebug(true);
|
||||
config.setResponseEncryptUriList(Collections.singletonList("/oss/minio/getAllMinioInfo"));
|
||||
FilterRegistrationBean<EncryptionFilter> registration = new FilterRegistrationBean<EncryptionFilter>();
|
||||
registration.setFilter(new EncryptionFilter(config));
|
||||
|
@@ -13,6 +13,7 @@ import io.minio.MinioClient;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import okhttp3.OkHttpClient;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
@@ -35,16 +36,8 @@ public class MinioOssConfiguration {
|
||||
private SchisandraOssMinioDomainService schisandraOssMinioDomainService;
|
||||
|
||||
public StandardOssClient minioOssClient(String userId) {
|
||||
CompletableFuture<SchisandraOssMinioDTO> futurePrice = CompletableFuture.supplyAsync(() -> {
|
||||
SchisandraOssMinioBO minioBO = schisandraOssMinioDomainService.getMinioConfig(Long.valueOf(userId));
|
||||
SchisandraOssMinioDTO minioDTO = SchisandraOssMinioDTOConverter.INSTANCE.convertBOToDTO(minioBO);
|
||||
return minioDTO;
|
||||
});
|
||||
SchisandraOssMinioDTO minio = futurePrice.join();
|
||||
if (ObjectUtils.isEmpty(minio)) {
|
||||
log.error("minio配置信息获取失败");
|
||||
return null;
|
||||
}
|
||||
SchisandraOssMinioDTO minio = getSchisandraOssMinioDTO(userId);
|
||||
if (minio == null) return null;
|
||||
MinioOssConfig minioOssConfig = new MinioOssConfig();
|
||||
minioOssConfig.setBasePath(minio.getBasePath());
|
||||
minioOssConfig.setBucketName(minio.getBucketName());
|
||||
@@ -70,6 +63,21 @@ public class MinioOssConfiguration {
|
||||
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private SchisandraOssMinioDTO getSchisandraOssMinioDTO(String userId) {
|
||||
CompletableFuture<SchisandraOssMinioDTO> futurePrice = CompletableFuture.supplyAsync(() -> {
|
||||
SchisandraOssMinioBO minioBO = schisandraOssMinioDomainService.getMinioConfig(Long.valueOf(userId));
|
||||
SchisandraOssMinioDTO minioDTO = SchisandraOssMinioDTOConverter.INSTANCE.convertBOToDTO(minioBO);
|
||||
return minioDTO;
|
||||
});
|
||||
SchisandraOssMinioDTO minio = futurePrice.join();
|
||||
if (ObjectUtils.isEmpty(minio)) {
|
||||
log.error("minio配置信息获取失败");
|
||||
return null;
|
||||
}
|
||||
return minio;
|
||||
}
|
||||
|
||||
public StandardOssClient minioOssClient(MinioOssConfig minioOssConfig) {
|
||||
return new MinioOssClient(minioClient(minioOssConfig),minioOssConfig);
|
||||
}
|
||||
|
Reference in New Issue
Block a user