Переглянути джерело

:arrow_up: 适配最新API

smallchill 5 роки тому
батько
коміт
53e333110f

+ 4 - 1
src/main/java/org/springblade/modules/resource/builder/oss/MinioOssBuilder.java

@@ -40,7 +40,10 @@ public class MinioOssBuilder {
 		ossProperties.setSecretKey(oss.getSecretKey());
 		ossProperties.setBucketName(oss.getBucketName());
 		// 创建客户端
-		MinioClient minioClient = new MinioClient(oss.getEndpoint(), oss.getAccessKey(), oss.getSecretKey());
+		MinioClient minioClient = MinioClient.builder()
+			.endpoint(oss.getEndpoint())
+			.credentials(oss.getAccessKey(), oss.getSecretKey())
+			.build();
 		return new MinioTemplate(minioClient, ossRule, ossProperties);
 	}
 

+ 3 - 3
src/main/java/org/springblade/modules/resource/builder/oss/QiniuOssBuilder.java

@@ -16,15 +16,15 @@
  */
 package org.springblade.modules.resource.builder.oss;
 
-import com.qiniu.common.Zone;
 import com.qiniu.storage.BucketManager;
 import com.qiniu.storage.Configuration;
+import com.qiniu.storage.Region;
 import com.qiniu.storage.UploadManager;
 import com.qiniu.util.Auth;
 import lombok.SneakyThrows;
 import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.oss.props.OssProperties;
 import org.springblade.core.oss.QiniuTemplate;
+import org.springblade.core.oss.props.OssProperties;
 import org.springblade.core.oss.rule.OssRule;
 import org.springblade.modules.resource.entity.Oss;
 
@@ -42,7 +42,7 @@ public class QiniuOssBuilder {
 		ossProperties.setAccessKey(oss.getAccessKey());
 		ossProperties.setSecretKey(oss.getSecretKey());
 		ossProperties.setBucketName(oss.getBucketName());
-		Configuration cfg = new Configuration(Zone.autoZone());
+		Configuration cfg = new Configuration(Region.autoRegion());
 		Auth auth = Auth.create(oss.getAccessKey(), oss.getSecretKey());
 		UploadManager uploadManager = new UploadManager(cfg);
 		BucketManager bucketManager = new BucketManager(auth, cfg);