- 
- 
+ 
+ 
-
-
+
+
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *
+ * http://www.gnu.org/licenses/lgpl.html + *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springblade.core.oss;
+
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.common.utils.BinaryUtil;
+import com.aliyun.oss.model.MatchMode;
+import com.aliyun.oss.model.ObjectMetadata;
+import com.aliyun.oss.model.PolicyConditions;
+import com.aliyun.oss.model.PutObjectResult;
+import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
+import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.oss.model.OssFile;
+import org.springblade.core.oss.props.OssProperties;
+import org.springblade.core.oss.rule.OssRule;
+import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.utils.StringPool;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AliossTemplate
+ *
+ * @author Chill
+ */
+@AllArgsConstructor
+public class AliossTemplate {
+ private OSSClient ossClient;
+ private OssProperties ossProperties;
+ private OssRule ossRule;
+
+ @SneakyThrows
+ public void makeBucket(String bucketName) {
+ if (!bucketExists(bucketName)) {
+ ossClient.createBucket(getBucketName(bucketName));
+ }
+ }
+
+ @SneakyThrows
+ public void removeBucket(String bucketName) {
+ ossClient.deleteBucket(getBucketName(bucketName));
+ }
+
+ @SneakyThrows
+ public boolean bucketExists(String bucketName) {
+ return ossClient.doesBucketExist(getBucketName(bucketName));
+ }
+
+ @SneakyThrows
+ public void copyFile(String bucketName, String fileName, String destBucketName) {
+ ossClient.copyObject(getBucketName(bucketName), fileName, getBucketName(destBucketName), fileName);
+ }
+
+ @SneakyThrows
+ public void copyFile(String bucketName, String fileName, String destBucketName, String destFileName) {
+ ossClient.copyObject(getBucketName(bucketName), fileName, getBucketName(destBucketName), destFileName);
+ }
+
+ @SneakyThrows
+ public OssFile statFile(String fileName) {
+ return statFile(ossProperties.getBucketName(), fileName);
+ }
+
+ @SneakyThrows
+ public OssFile statFile(String bucketName, String fileName) {
+ ObjectMetadata stat = ossClient.getObjectMetadata(getBucketName(bucketName), fileName);
+ OssFile ossFile = new OssFile();
+ ossFile.setName(fileName);
+ ossFile.setLink(fileLink(ossFile.getName()));
+ ossFile.setHash(stat.getContentMD5());
+ ossFile.setLength(stat.getContentLength());
+ ossFile.setPutTime(stat.getLastModified());
+ ossFile.setContentType(stat.getContentType());
+ return ossFile;
+ }
+
+ @SneakyThrows
+ public String filePath(String fileName) {
+ return getOssHost().concat(StringPool.SLASH).concat(fileName);
+ }
+
+ @SneakyThrows
+ public String filePath(String bucketName, String fileName) {
+ return getOssHost(bucketName).concat(StringPool.SLASH).concat(fileName);
+ }
+
+ @SneakyThrows
+ public String fileLink(String fileName) {
+ return getOssHost().concat(StringPool.SLASH).concat(fileName);
+ }
+
+ @SneakyThrows
+ public String fileLink(String bucketName, String fileName) {
+ return getOssHost(bucketName).concat(StringPool.SLASH).concat(fileName);
+ }
+
+ /**
+ * 文件对象
+ *
+ * @param file 上传文件类
+ * @return
+ */
+
+ @SneakyThrows
+ public BladeFile putFile(MultipartFile file) {
+ return putFile(ossProperties.getBucketName(), file.getOriginalFilename(), file);
+ }
+
+ /**
+ * @param fileName 上传文件名
+ * @param file 上传文件类
+ * @return
+ */
+
+ @SneakyThrows
+ public BladeFile putFile(String fileName, MultipartFile file) {
+ return putFile(ossProperties.getBucketName(), fileName, file);
+ }
+
+ @SneakyThrows
+ public BladeFile putFile(String bucketName, String fileName, MultipartFile file) {
+ return putFile(bucketName, fileName, file.getInputStream());
+ }
+
+ @SneakyThrows
+ public BladeFile putFile(String fileName, InputStream stream) {
+ return putFile(ossProperties.getBucketName(), fileName, stream);
+ }
+
+ @SneakyThrows
+ public BladeFile putFile(String bucketName, String fileName, InputStream stream) {
+ return put(bucketName, stream, fileName, false);
+ }
+
+ @SneakyThrows
+ public BladeFile put(String bucketName, InputStream stream, String key, boolean cover) {
+ makeBucket(bucketName);
+ String originalName = key;
+ key = getFileName(key);
+ // 覆盖上传
+ if (cover) {
+ ossClient.putObject(getBucketName(bucketName), key, stream);
+ } else {
+ PutObjectResult response = ossClient.putObject(getBucketName(bucketName), key, stream);
+ int retry = 0;
+ int retryCount = 5;
+ while (StringUtils.isEmpty(response.getETag()) && retry < retryCount) {
+ response = ossClient.putObject(getBucketName(bucketName), key, stream);
+ retry++;
+ }
+ }
+ BladeFile file = new BladeFile();
+ file.setOriginalName(originalName);
+ file.setName(key);
+ file.setLink(fileLink(bucketName, key));
+ return file;
+ }
+
+ @SneakyThrows
+ public void removeFile(String fileName) {
+ ossClient.deleteObject(getBucketName(), fileName);
+ }
+
+ @SneakyThrows
+ public void removeFile(String bucketName, String fileName) {
+ ossClient.deleteObject(getBucketName(bucketName), fileName);
+ }
+
+ @SneakyThrows
+ public void removeFiles(List
+ * 获取上传凭证，普通上传
+ */
+ public String getUploadToken(String bucketName) {
+ // 默认过期时间2小时
+ return getUploadToken(bucketName, ossProperties.getArgs().get("expireTime", 3600L));
+ }
+
+ /**
+ * TODO 上传大小限制、基础路径
+ *
+ * 获取上传凭证，普通上传
+ */
+ public String getUploadToken(String bucketName, long expireTime) {
+ String baseDir = "upload";
+
+ long expireEndTime = System.currentTimeMillis() + expireTime * 1000;
+ Date expiration = new Date(expireEndTime);
+
+ PolicyConditions policyConds = new PolicyConditions();
+ // 默认大小限制10M
+ policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, ossProperties.getArgs().get("contentLengthRange", 10485760));
+ policyConds.addConditionItem(MatchMode.StartWith, PolicyConditions.COND_KEY, baseDir);
+
+ String postPolicy = ossClient.generatePostPolicy(expiration, policyConds);
+ byte[] binaryData = postPolicy.getBytes(StandardCharsets.UTF_8);
+ String encodedPolicy = BinaryUtil.toBase64String(binaryData);
+ String postSignature = ossClient.calculatePostSignature(postPolicy);
+
+ Map
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springblade.core.oss.config;
+
+import com.aliyun.oss.ClientConfiguration;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.common.auth.CredentialsProvider;
+import com.aliyun.oss.common.auth.DefaultCredentialProvider;
+import lombok.AllArgsConstructor;
+import org.springblade.core.oss.AliossTemplate;
+import org.springblade.core.oss.props.OssProperties;
+import org.springblade.core.oss.rule.BladeOssRule;
+import org.springblade.core.oss.rule.OssRule;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Alioss配置类
+ *
+ * @author Chill
+ */
+@Configuration
+@AllArgsConstructor
+@AutoConfigureAfter(QiniuConfiguration.class)
+@EnableConfigurationProperties(OssProperties.class)
+@ConditionalOnProperty(value = "oss.name", havingValue = "alioss")
+public class AliossConfiguration {
+
+ private OssProperties ossProperties;
+
+ @Bean
+ @ConditionalOnMissingBean(OssRule.class)
+ public OssRule ossRule() {
+ return new BladeOssRule();
+ }
+
+ @Bean
+ @ConditionalOnMissingBean(OSSClient.class)
+ public OSSClient ossClient() {
+ // 创建ClientConfiguration。ClientConfiguration是OSSClient的配置类，可配置代理、连接超时、最大连接数等参数。
+ ClientConfiguration conf = new ClientConfiguration();
+ // 设置OSSClient允许打开的最大HTTP连接数，默认为1024个。
+ conf.setMaxConnections(1024);
+ // 设置Socket层传输数据的超时时间，默认为50000毫秒。
+ conf.setSocketTimeout(50000);
+ // 设置建立连接的超时时间，默认为50000毫秒。
+ conf.setConnectionTimeout(50000);
+ // 设置从连接池中获取连接的超时时间（单位：毫秒），默认不超时。
+ conf.setConnectionRequestTimeout(1000);
+ // 设置连接空闲超时时间。超时则关闭连接，默认为60000毫秒。
+ conf.setIdleConnectionTime(60000);
+ // 设置失败请求重试次数，默认为3次。
+ conf.setMaxErrorRetry(5);
+ CredentialsProvider credentialsProvider = new DefaultCredentialProvider(ossProperties.getAccessKey(), ossProperties.getSecretKey());
+ return new OSSClient(ossProperties.getEndpoint(), credentialsProvider, conf);
+ }
+
+ @Bean
+ @ConditionalOnMissingBean(AliossTemplate.class)
+ @ConditionalOnBean({OSSClient.class, OssRule.class})
+ public AliossTemplate aliossTemplate(OSSClient ossClient, OssRule ossRule) {
+ return new AliossTemplate(ossClient, ossProperties, ossRule);
+ }
+
+}
diff --git a/blade-core-oss/src/main/java/org/springblade/core/oss/config/OssConfiguration.java b/blade-core-oss/src/main/java/org/springblade/core/oss/config/QiniuConfiguration.java
similarity index 96%
rename from blade-core-oss/src/main/java/org/springblade/core/oss/config/OssConfiguration.java
rename to blade-core-oss/src/main/java/org/springblade/core/oss/config/QiniuConfiguration.java
index c69b614..52ab32a 100644
--- a/blade-core-oss/src/main/java/org/springblade/core/oss/config/OssConfiguration.java
+++ b/blade-core-oss/src/main/java/org/springblade/core/oss/config/QiniuConfiguration.java
@@ -39,8 +39,8 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@AllArgsConstructor
@EnableConfigurationProperties(OssProperties.class)
-@ConditionalOnProperty(value = "oss.enable", havingValue = "true")
-public class OssConfiguration {
+@ConditionalOnProperty(value = "oss.name", havingValue = "qiniu")
+public class QiniuConfiguration {
private OssProperties ossProperties;
diff --git a/blade-core-oss/src/main/java/org/springblade/core/oss/model/BladeFile.java b/blade-core-oss/src/main/java/org/springblade/core/oss/model/BladeFile.java
index bc02327..3b746c7 100644
--- a/blade-core-oss/src/main/java/org/springblade/core/oss/model/BladeFile.java
+++ b/blade-core-oss/src/main/java/org/springblade/core/oss/model/BladeFile.java
@@ -32,4 +32,8 @@ public class BladeFile {
* 文件名
*/
private String name;
+ /**
+ * 原始文件名
+ */
+ private String originalName;
}
diff --git a/blade-core-oss/src/main/java/org/springblade/core/oss/props/OssProperties.java b/blade-core-oss/src/main/java/org/springblade/core/oss/props/OssProperties.java
index 1a46887..7b29384 100644
--- a/blade-core-oss/src/main/java/org/springblade/core/oss/props/OssProperties.java
+++ b/blade-core-oss/src/main/java/org/springblade/core/oss/props/OssProperties.java
@@ -16,6 +16,7 @@
package org.springblade.core.oss.props;
import lombok.Data;
+import org.springblade.core.tool.support.Kv;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
@@ -62,4 +63,9 @@ public class OssProperties {
*/
private String bucketName = "bladex";
+ /**
+ * 自定义属性
+ */
+ private Kv args;
+
}
diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml
index 0e18457..2367341 100644
--- a/blade-core-secure/pom.xml
+++ b/blade-core-secure/pom.xml
@@ -5,7 +5,7 @@