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/QiniuCloudStorageServiceImpl.java |   66 ++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 26 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..a8c9393 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,42 +1,57 @@
 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.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.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();
-	}
-
-	private void init() {
+	@Autowired
+	public QiniuCloudStorageServiceImpl(CloudStorageProperties properties) {
+		this.properties = properties.getQiniu();
 		// 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());
+		Auth auth = Auth.create(
+			this.properties.getAccessKey(),
+			this.properties.getSecretKey());
+		token = auth.uploadToken(this.properties.getBucketName());
 		bucketManager = new BucketManager(auth, config);
+	}
+
+
+	@Override
+	public String getServiceType() {
+		return CloudServiceEnumd.QINIU.getValue();
 	}
 
 	@Override
@@ -49,14 +64,14 @@
 		} catch (Exception e) {
 			throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿涓冪墰閰嶇疆淇℃伅");
 		}
-		return config.getDomain() + "/" + path;
+		return this.properties.getDomain() + "/" + 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 +81,18 @@
 	}
 
 	@Override
-	public String upload(InputStream inputStream, String path) {
-		byte[] data = IoUtil.readBytes(inputStream);
-		return this.upload(data, path);
-	}
-
-	@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