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