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/AliyunCloudStorageServiceImpl.java | 85 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 28 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java
index 8fbe16c..b483eba 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java
@@ -1,62 +1,91 @@
package com.ruoyi.oss.service.impl;
+import com.aliyun.oss.ClientConfiguration;
import com.aliyun.oss.OSSClient;
-import com.ruoyi.oss.config.CloudStorageConfig;
+import com.aliyun.oss.common.auth.DefaultCredentialProvider;
+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.AliyunProperties;
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.ByteArrayInputStream;
import java.io.InputStream;
/**
* 闃块噷浜戝瓨鍌�
+ *
+ * @author Lion Li
*/
-public class AliyunCloudStorageServiceImpl extends AbstractCloudStorageService {
+@Lazy
+@Service
+public class AliyunCloudStorageServiceImpl extends AbstractCloudStorageService implements InitializingBean {
- private OSSClient client;
+ private final OSSClient client;
+ private final AliyunProperties properties;
- public AliyunCloudStorageServiceImpl(CloudStorageConfig config) {
- this.config = config;
- // 鍒濆鍖�
- init();
- }
-
- private void init() {
- client = new OSSClient(config.getDomain(), config.getAccessKey(), config.getSecretKey());
- }
-
- @Override
- public String upload(byte[] data, String path) {
- return upload(new ByteArrayInputStream(data), path);
- }
-
- @Override
- public String upload(InputStream inputStream, String path) {
+ @Autowired
+ public AliyunCloudStorageServiceImpl(CloudStorageProperties properties) {
+ this.properties = properties.getAliyun();
try {
- client.putObject(config.getBucketName(), path, inputStream);
+ ClientConfiguration configuration = new ClientConfiguration();
+ DefaultCredentialProvider credentialProvider = new DefaultCredentialProvider(
+ this.properties.getAccessKeyId(),
+ this.properties.getAccessKeySecret());
+ client = new OSSClient(this.properties.getEndpoint(), credentialProvider, configuration);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("闃块噷浜戝瓨鍌ㄩ厤缃敊璇�! 璇锋鏌ョ郴缁熼厤缃�!");
+ }
+ }
+
+ @Override
+ public String getServiceType() {
+ return CloudServiceEnumd.ALIYUN.getValue();
+ }
+
+ @Override
+ public UploadResult upload(byte[] data, String path, String contentType) {
+ return upload(new ByteArrayInputStream(data), path, contentType);
+ }
+
+ @Override
+ public UploadResult upload(InputStream inputStream, String path, String contentType) {
+ try {
+ client.putObject(this.properties.getBucketName(), path, inputStream);
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ厤缃俊鎭�");
}
- return config.getDomain() + "/" + path;
+ return new UploadResult().setUrl(properties.getEndpoint() + "/" + path).setFilename(path);
}
@Override
public void delete(String path) {
- path = path.replace(config.getDomain() + "/", "");
+ path = path.replace(this.properties.getEndpoint() + "/", "");
try {
- client.deleteObject(config.getBucketName(), path);
+ client.deleteObject(this.properties.getBucketName(), path);
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ厤缃俊鎭�");
}
}
@Override
- public String uploadSuffix(byte[] data, String suffix) {
- return upload(data, getPath(config.getPrefix(), suffix));
+ public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
+ return upload(data, getPath(this.properties.getPrefix(), suffix), contentType);
}
@Override
- public String uploadSuffix(InputStream inputStream, String suffix) {
- return upload(inputStream, getPath(config.getPrefix(), suffix));
+ public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
+ return upload(inputStream, getPath(this.properties.getPrefix(), suffix), contentType);
+ }
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ OssFactory.register(getServiceType(),this);
}
}
--
Gitblit v1.9.3