From a4c019ace2841faa6af14b5373a041464c3dbbde Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 20 七月 2021 11:12:22 +0800
Subject: [PATCH] update OSS接口增加通用contentType
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java | 79 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java
index 97a493f..0b699ab 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java
@@ -1,46 +1,66 @@
package com.ruoyi.oss.service.impl;
-import cn.hutool.core.io.IoUtil;
import com.qiniu.http.Response;
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 com.ruoyi.oss.config.CloudStorageConfig;
+import com.ruoyi.oss.entity.UploadResult;
+import com.ruoyi.oss.enumd.CloudServiceEnumd;
import com.ruoyi.oss.exception.OssException;
+import com.ruoyi.oss.factory.OssFactory;
+import com.ruoyi.oss.properties.CloudStorageProperties;
+import com.ruoyi.oss.properties.CloudStorageProperties.QiniuProperties;
import com.ruoyi.oss.service.abstractd.AbstractCloudStorageService;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
import java.io.InputStream;
/**
* 涓冪墰浜戝瓨鍌�
+ *
+ * @author Lion Li
*/
-public class QiniuCloudStorageServiceImpl extends AbstractCloudStorageService {
+@Lazy
+@Service
+public class QiniuCloudStorageServiceImpl extends AbstractCloudStorageService implements InitializingBean {
- private UploadManager uploadManager;
- private BucketManager bucketManager;
- private String token;
+ private final UploadManager uploadManager;
+ private final BucketManager bucketManager;
+ private final String token;
+ private final QiniuProperties properties;
- public QiniuCloudStorageServiceImpl(CloudStorageConfig config) {
- this.config = config;
- // 鍒濆鍖�
- init();
+ @Autowired
+ public QiniuCloudStorageServiceImpl(CloudStorageProperties properties) {
+ this.properties = properties.getQiniu();
+ try {
+ // z0 z1 z2
+ Configuration config = new Configuration(Region.autoRegion());
+ // 榛樿涓嶄娇鐢╤ttps
+ config.useHttpsDomains = false;
+ uploadManager = new UploadManager(config);
+ Auth auth = Auth.create(
+ this.properties.getAccessKey(),
+ this.properties.getSecretKey());
+ token = auth.uploadToken(this.properties.getBucketName());
+ bucketManager = new BucketManager(auth, config);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("涓冪墰浜戝瓨鍌ㄩ厤缃敊璇�! 璇锋鏌ョ郴缁熼厤缃�!");
+ }
}
- private void init() {
- // z0 z1 z2
- Configuration config = new Configuration(Region.autoRegion());
- // 榛樿涓嶄娇鐢╤ttps
- config.useHttpsDomains = false;
- uploadManager = new UploadManager(config);
- Auth auth = Auth.create(this.config.getAccessKey(), this.config.getSecretKey());
- token = auth.uploadToken(this.config.getBucketName());
- bucketManager = new BucketManager(auth, config);
+
+ @Override
+ public String getServiceType() {
+ return CloudServiceEnumd.QINIU.getValue();
}
@Override
- public String upload(byte[] data, String path) {
+ public UploadResult upload(byte[] data, String path, String contentType) {
try {
Response res = uploadManager.put(data, path, token);
if (!res.isOK()) {
@@ -49,14 +69,14 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿涓冪墰閰嶇疆淇℃伅");
}
- return config.getDomain() + "/" + path;
+ return new UploadResult().setUrl(properties.getDomain() + "/" + path).setFilename(path);
}
@Override
public void delete(String path) {
try {
- path = path.replace(config.getDomain() + "/", "");
- Response res = bucketManager.delete(config.getBucketName(), path);
+ path = path.replace(this.properties.getDomain() + "/", "");
+ Response res = bucketManager.delete(this.properties.getBucketName(), path);
if (!res.isOK()) {
throw new RuntimeException("鍒犻櫎涓冪墰鏂囦欢鍑洪敊锛�" + res.toString());
}
@@ -66,19 +86,18 @@
}
@Override
- public String upload(InputStream inputStream, String path) {
- byte[] data = IoUtil.readBytes(inputStream);
- return this.upload(data, path);
+ public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
+ return upload(data, getPath(this.properties.getPrefix(), suffix), contentType);
}
@Override
- public String uploadSuffix(byte[] data, String suffix) {
- return upload(data, getPath(config.getPrefix(), suffix));
+ public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
+ return upload(inputStream, getPath(this.properties.getPrefix(), suffix), contentType);
}
@Override
- public String uploadSuffix(InputStream inputStream, String suffix) {
- return upload(inputStream, getPath(config.getPrefix(), suffix));
+ public void afterPropertiesSet() throws Exception {
+ OssFactory.register(getServiceType(),this);
}
}
--
Gitblit v1.9.3