From 089e288a6e55d2ae527ad733bbb8b8b5eaad6107 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 18 七月 2021 18:20:21 +0800
Subject: [PATCH] update 使用 策略+工厂 重写OSS模块

---
 ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java |   54 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 15 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..a0782fe 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,28 +1,47 @@
 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.enumd.CloudServiceEnumd;
 import com.ruoyi.oss.exception.OssException;
+import com.ruoyi.oss.factory.OssFactory;
+import com.ruoyi.oss.properties.AliyunProperties;
+import com.ruoyi.oss.properties.CloudStorageProperties;
 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();
+	@Autowired
+	public AliyunCloudStorageServiceImpl(CloudStorageProperties properties) {
+		this.properties = properties.getAliyun();
+		ClientConfiguration configuration = new ClientConfiguration();
+		DefaultCredentialProvider credentialProvider = new DefaultCredentialProvider(
+			this.properties.getAccessKeyId(),
+			this.properties.getAccessKeySecret());
+		client = new OSSClient(this.properties.getEndpoint(), credentialProvider, configuration);
 	}
 
-	private void init() {
-		client = new OSSClient(config.getDomain(), config.getAccessKey(), config.getSecretKey());
+	@Override
+	public String getServiceType() {
+		return CloudServiceEnumd.ALIYUN.getValue();
 	}
 
 	@Override
@@ -33,18 +52,18 @@
 	@Override
 	public String upload(InputStream inputStream, String path) {
 		try {
-			client.putObject(config.getBucketName(), path, inputStream);
+			client.putObject(this.properties.getBucketName(), path, inputStream);
 		} catch (Exception e) {
 			throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ厤缃俊鎭�");
 		}
-		return config.getDomain() + "/" + path;
+		return this.properties.getEndpoint() + "/" + 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("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ厤缃俊鎭�");
 		}
@@ -52,11 +71,16 @@
 
 	@Override
 	public String uploadSuffix(byte[] data, String suffix) {
-		return upload(data, getPath(config.getPrefix(), suffix));
+		return upload(data, getPath(this.properties.getPrefix(), suffix));
 	}
 
 	@Override
 	public String uploadSuffix(InputStream inputStream, String suffix) {
-		return upload(inputStream, getPath(config.getPrefix(), suffix));
+		return upload(inputStream, getPath(this.properties.getPrefix(), suffix));
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		OssFactory.register(getServiceType(),this);
 	}
 }

--
Gitblit v1.9.3