From 7d4ac54870e8611a7deec9ed7e8a4025be8de663 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 24 四月 2024 10:44:08 +0800
Subject: [PATCH] oss对象存储代码整理
---
smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/OssRule.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/config/OssConfiguration.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/BladeOssRule.java | 5 ++---
smart-starter-oss/src/main/java/com/qianwen/core/oss/config/AliossConfiguration.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/TencentCosTemplate.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssStatusEnum.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssEnum.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/QiniuTemplate.java | 26 +++++++++++++-------------
smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/PolicyType.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/config/MinioConfiguration.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/model/MinioItem.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/props/OssProperties.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/config/TencentCosConfiguration.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/model/BladeFile.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/config/QiniuConfiguration.java | 1 -
smart-starter-oss/src/main/java/com/qianwen/core/oss/model/OssFile.java | 1 -
16 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/QiniuTemplate.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/QiniuTemplate.java
index 2f0c119..8d536bd 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/QiniuTemplate.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/QiniuTemplate.java
@@ -1,5 +1,18 @@
package com.qianwen.core.oss;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.qianwen.core.oss.model.BladeFile;
+import com.qianwen.core.oss.model.OssFile;
+import com.qianwen.core.oss.props.OssProperties;
+import com.qianwen.core.oss.rule.OssRule;
+import com.qianwen.core.tool.utils.CollectionUtil;
+import com.qianwen.core.tool.utils.Func;
import com.qiniu.common.QiniuException;
import com.qiniu.common.Zone;
import com.qiniu.http.Response;
@@ -9,19 +22,6 @@
import com.qiniu.util.Auth;
import com.qiniu.util.StringMap;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.List;
-import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.core.oss.model.OssFile;
-import com.qianwen.core.oss.props.OssProperties;
-import com.qianwen.core.oss.rule.OssRule;
-import com.qianwen.core.tool.utils.CollectionUtil;
-import com.qianwen.core.tool.utils.Func;
-import org.springframework.web.multipart.MultipartFile;
-
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/QiniuTemplate.class */
public class QiniuTemplate implements OssTemplate {
private final Auth auth;
private final UploadManager uploadManager;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/TencentCosTemplate.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/TencentCosTemplate.java
index 37932a5..fd3da07 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/TencentCosTemplate.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/TencentCosTemplate.java
@@ -17,7 +17,6 @@
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/TencentCosTemplate.class */
public class TencentCosTemplate implements OssTemplate {
private final COSClient cosClient;
private final OssProperties ossProperties;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/AliossConfiguration.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/AliossConfiguration.java
index 63d15b7..a095bdd 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/AliossConfiguration.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/AliossConfiguration.java
@@ -20,7 +20,6 @@
@ConditionalOnClass({OSSClient.class})
@AutoConfigureAfter({OssConfiguration.class})
@ConditionalOnProperty(value = {"oss.name"}, havingValue = "alioss")
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/config/AliossConfiguration.class */
public class AliossConfiguration {
private final OssProperties ossProperties;
private final OssRule ossRule;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/MinioConfiguration.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/MinioConfiguration.java
index 9fc1af0..4f0bc96 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/MinioConfiguration.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/MinioConfiguration.java
@@ -18,7 +18,6 @@
@ConditionalOnClass({MinioClient.class})
@AutoConfigureAfter({OssConfiguration.class})
@ConditionalOnProperty(value = {"oss.name"}, havingValue = "minio")
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/config/MinioConfiguration.class */
public class MinioConfiguration {
private final OssProperties ossProperties;
private final OssRule ossRule;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/OssConfiguration.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/OssConfiguration.java
index 5de9c2a..71411b8 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/OssConfiguration.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/OssConfiguration.java
@@ -10,7 +10,6 @@
@EnableConfigurationProperties({OssProperties.class})
@Configuration(proxyBeanMethods = false)
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/config/OssConfiguration.class */
public class OssConfiguration {
private final OssProperties ossProperties;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/QiniuConfiguration.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/QiniuConfiguration.java
index 5e55f32..7d27ebe 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/QiniuConfiguration.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/QiniuConfiguration.java
@@ -21,7 +21,6 @@
@ConditionalOnClass({Auth.class, UploadManager.class, BucketManager.class})
@AutoConfigureAfter({OssConfiguration.class})
@ConditionalOnProperty(value = {"oss.name"}, havingValue = "qiniu")
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/config/QiniuConfiguration.class */
public class QiniuConfiguration {
private final OssProperties ossProperties;
private final OssRule ossRule;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/TencentCosConfiguration.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/TencentCosConfiguration.java
index 24db078..8bd8f00 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/TencentCosConfiguration.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/config/TencentCosConfiguration.java
@@ -21,7 +21,6 @@
@ConditionalOnClass({COSClient.class})
@AutoConfigureAfter({OssConfiguration.class})
@ConditionalOnProperty(value = {"oss.name"}, havingValue = "tencentcos")
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/config/TencentCosConfiguration.class */
public class TencentCosConfiguration {
private final OssProperties ossProperties;
private final OssRule ossRule;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssEnum.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssEnum.java
index 389626d..68e98fc 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssEnum.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssEnum.java
@@ -1,6 +1,5 @@
package com.qianwen.core.oss.enums;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/enums/OssEnum.class */
public enum OssEnum {
MINIO("minio", 1),
QINIU("qiniu", 2),
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssStatusEnum.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssStatusEnum.java
index e846152..696fe82 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssStatusEnum.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/OssStatusEnum.java
@@ -1,6 +1,5 @@
package com.qianwen.core.oss.enums;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/enums/OssStatusEnum.class */
public enum OssStatusEnum {
DISABLE(1),
ENABLE(2);
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/PolicyType.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/PolicyType.java
index d386d94..c9693c5 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/PolicyType.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/enums/PolicyType.java
@@ -1,6 +1,5 @@
package com.qianwen.core.oss.enums;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/enums/PolicyType.class */
public enum PolicyType {
READ("read", "鍙"),
WRITE("write", "鍙啓"),
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/BladeFile.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/BladeFile.java
index 200d3e7..76516d7 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/BladeFile.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/BladeFile.java
@@ -1,6 +1,5 @@
package com.qianwen.core.oss.model;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/model/BladeFile.class */
public class BladeFile {
private String link;
private String domain;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/MinioItem.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/MinioItem.java
index 188048c..1e2fbc3 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/MinioItem.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/MinioItem.java
@@ -5,7 +5,6 @@
import java.util.Date;
import com.qianwen.core.tool.utils.DateUtil;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/model/MinioItem.class */
public class MinioItem {
private String objectName;
private Date lastModified;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/OssFile.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/OssFile.java
index b192187..78091ef 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/OssFile.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/model/OssFile.java
@@ -2,7 +2,6 @@
import java.util.Date;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/model/OssFile.class */
public class OssFile {
private String link;
private String name;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/props/OssProperties.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/props/OssProperties.java
index dd70bc7..556f439 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/props/OssProperties.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/props/OssProperties.java
@@ -4,7 +4,6 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "oss")
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/props/OssProperties.class */
public class OssProperties {
private Boolean enabled;
private String name;
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/BladeOssRule.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/BladeOssRule.java
index 37a92f2..2e9783a 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/BladeOssRule.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/BladeOssRule.java
@@ -5,7 +5,6 @@
import com.qianwen.core.tool.utils.FileUtil;
import com.qianwen.core.tool.utils.StringUtil;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/rule/BladeOssRule.class */
public class BladeOssRule implements OssRule {
private final Boolean tenantMode;
@@ -13,13 +12,13 @@
this.tenantMode = tenantMode;
}
- @Override // com.qianwen.core.oss.rule.OssRule
+ @Override
public String bucketName(String bucketName) {
String prefix = this.tenantMode.booleanValue() ? AuthUtil.getTenantId().concat("-") : "";
return prefix + bucketName;
}
- @Override // com.qianwen.core.oss.rule.OssRule
+ @Override
public String fileName(String originalFilename) {
return "upload/" + DateUtil.today() + "/" + StringUtil.randomUUID() + "." + FileUtil.getFileExtension(originalFilename);
}
diff --git a/smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/OssRule.java b/smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/OssRule.java
index 2c9c35a..8b021cb 100644
--- a/smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/OssRule.java
+++ b/smart-starter-oss/src/main/java/com/qianwen/core/oss/rule/OssRule.java
@@ -1,6 +1,5 @@
package com.qianwen.core.oss.rule;
-/* loaded from: blade-starter-oss-9.3.0.0-SNAPSHOT.jar:org/springblade/core/oss/rule/OssRule.class */
public interface OssRule {
String bucketName(String bucketName);
--
Gitblit v1.9.3