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/MinioCloudStorageServiceImpl.java | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java
index bf02831..480f5e9 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java
@@ -1,31 +1,43 @@
package com.ruoyi.oss.service.impl;
-import cn.hutool.core.io.IoUtil;
-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.MinioProperties;
import com.ruoyi.oss.service.abstractd.AbstractCloudStorageService;
import io.minio.MinioClient;
+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;
/**
* minio瀛樺偍
+ *
+ * @author Lion Li
*/
-public class MinioCloudStorageServiceImpl extends AbstractCloudStorageService {
+@Lazy
+@Service
+public class MinioCloudStorageServiceImpl extends AbstractCloudStorageService implements InitializingBean {
- private MinioClient minioClient;
+ private final MinioClient minioClient;
+ private final MinioProperties properties;
- public MinioCloudStorageServiceImpl(CloudStorageConfig config) {
- this.config = config;
- // 鍒濆鍖�
- init();
+ @Autowired
+ public MinioCloudStorageServiceImpl(CloudStorageProperties properties) {
+ this.properties = properties.getMinio();
+ minioClient = MinioClient.builder()
+ .endpoint(this.properties.getEndpoint())
+ .credentials(this.properties.getAccessKey(), this.properties.getSecretKey())
+ .build();
}
- private void init() {
- minioClient = MinioClient.builder()
- .endpoint(config.getDomain())
- .credentials(config.getAccessKey(), config.getSecretKey())
- .build();
+ @Override
+ public String getServiceType() {
+ return CloudServiceEnumd.MINIO.getValue();
}
@Override
@@ -35,7 +47,7 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿Minio閰嶇疆淇℃伅");
}
- return config.getDomain() + "/" + path;
+ return this.properties.getEndpoint() + "/" + path;
}
@Override
@@ -48,19 +60,17 @@
}
@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