From 86d5a1d19074b75eff9999fd99ae085487af43f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 17 二月 2022 10:31:52 +0800
Subject: [PATCH] update 更新 所有 oss 均支持 https 配置
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java
index 5f59db2..756462e 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java
@@ -8,11 +8,13 @@
import com.qcloud.cos.model.*;
import com.qcloud.cos.region.Region;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.oss.constant.OssConstant;
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.exception.OssException;
import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
+import org.springframework.stereotype.Component;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -22,13 +24,14 @@
*
* @author Lion Li
*/
+@Component
public class QcloudOssStrategy extends AbstractOssStrategy {
private COSClient client;
@Override
- public void init(OssProperties cloudStorageProperties) {
- properties = cloudStorageProperties;
+ public void init(OssProperties ossProperties) {
+ super.init(ossProperties);
try {
COSCredentials credentials = new BasicCOSCredentials(
properties.getAccessKey(), properties.getSecretKey());
@@ -36,7 +39,7 @@
ClientConfig clientConfig = new ClientConfig();
// 璁剧疆bucket鎵�鍦ㄧ殑鍖哄煙锛屽崕鍗楋細gz 鍗庡寳锛歵j 鍗庝笢锛歴h
clientConfig.setRegion(new Region(properties.getRegion()));
- if ("Y".equals(properties.getIsHttps())) {
+ if (OssConstant.IS_HTTPS.equals(properties.getIsHttps())) {
clientConfig.setHttpProtocol(HttpProtocol.https);
} else {
clientConfig.setHttpProtocol(HttpProtocol.http);
@@ -46,6 +49,7 @@
} catch (Exception e) {
throw new OssException("鑵捐浜戝瓨鍌ㄩ厤缃敊璇�! 璇锋鏌ョ郴缁熼厤缃�:[" + e.getMessage() + "]");
}
+ isInit = true;
}
@Override
@@ -64,8 +68,8 @@
}
@Override
- public String getServiceType() {
- return OssEnumd.QCLOUD.getValue();
+ public OssEnumd getServiceType() {
+ return OssEnumd.QCLOUD;
}
@Override
@@ -82,7 +86,7 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ヨ吘璁簯閰嶇疆淇℃伅:[" + e.getMessage() + "]");
}
- return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
+ return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
}
@Override
--
Gitblit v1.9.3