update OSS接口增加通用contentType

ruoyi-oss/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java

@@ -12,5 +12,7 @@ public class CloudConstant {
 	 */
 	public final static String CLOUD_STORAGE_CONFIG_KEY = "sys.oss.cloudStorageService";
 
+	public final static String DEFAULT_CONTENT_TYPE = "application/octet-stream";
+
 
 }

ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageService.java

@@ -32,7 +32,7 @@ public interface ICloudStorageService {
 	 * @param path 文件路径，包含文件名
 	 * @return 返回http地址
 	 */
-	UploadResult upload(byte[] data, String path);
+	UploadResult upload(byte[] data, String path, String contentType);
 
 	/**
 	 * 文件删除
@@ -48,7 +48,7 @@ public interface ICloudStorageService {
 	 * @param suffix 后缀
 	 * @return 返回http地址
 	 */
-	UploadResult uploadSuffix(byte[] data, String suffix);
+	UploadResult uploadSuffix(byte[] data, String suffix, String contentType);
 
 	/**
 	 * 文件上传
@@ -57,7 +57,7 @@ public interface ICloudStorageService {
 	 * @param path        文件路径，包含文件名
 	 * @return 返回http地址
 	 */
-	UploadResult upload(InputStream inputStream, String path);
+	UploadResult upload(InputStream inputStream, String path, String contentType);
 
 	/**
 	 * 文件上传
@@ -66,5 +66,5 @@ public interface ICloudStorageService {
 	 * @param suffix      后缀
 	 * @return 返回http地址
 	 */
-	UploadResult uploadSuffix(InputStream inputStream, String suffix);
+	UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType);
 }

ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageService.java

@@ -34,22 +34,22 @@ public abstract class AbstractCloudStorageService implements ICloudStorageServic
 	}
 
 	@Override
-	public abstract UploadResult upload(byte[] data, String path);
+	public abstract UploadResult upload(byte[] data, String path, String contentType);
 
 	@Override
 	public abstract void delete(String path);
 
 	@Override
-	public UploadResult upload(InputStream inputStream, String path) {
+	public UploadResult upload(InputStream inputStream, String path, String contentType) {
 		byte[] data = IoUtil.readBytes(inputStream);
-		return this.upload(data, path);
+		return this.upload(data, path, contentType);
 	}
 
 	@Override
-	public abstract UploadResult uploadSuffix(byte[] data, String suffix);
+	public abstract UploadResult uploadSuffix(byte[] data, String suffix, String contentType);
 
 	@Override
-	public abstract UploadResult uploadSuffix(InputStream inputStream, String suffix);
+	public abstract UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType);
 
 	@Override
 	public abstract void afterPropertiesSet() throws Exception;

ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java

@@ -50,12 +50,12 @@ public class AliyunCloudStorageServiceImpl extends AbstractCloudStorageService i
 	}
 
 	@Override
-	public UploadResult upload(byte[] data, String path) {
-		return upload(new ByteArrayInputStream(data), path);
+	public UploadResult upload(byte[] data, String path, String contentType) {
+		return upload(new ByteArrayInputStream(data), path, contentType);
 	}
 
 	@Override
-	public UploadResult upload(InputStream inputStream, String path) {
+	public UploadResult upload(InputStream inputStream, String path, String contentType) {
 		try {
 			client.putObject(this.properties.getBucketName(), path, inputStream);
 		} catch (Exception e) {
@@ -75,13 +75,13 @@ public class AliyunCloudStorageServiceImpl extends AbstractCloudStorageService i
 	}
 
 	@Override
-	public UploadResult uploadSuffix(byte[] data, String suffix) {
-		return upload(data, getPath(this.properties.getPrefix(), suffix));
+	public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
+		return upload(data, getPath(this.properties.getPrefix(), suffix), contentType);
 	}
 
 	@Override
-	public UploadResult uploadSuffix(InputStream inputStream, String suffix) {
-		return upload(inputStream, getPath(this.properties.getPrefix(), suffix));
+	public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
+		return upload(inputStream, getPath(this.properties.getPrefix(), suffix), contentType);
 	}
 
 	@Override

ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ruoyi.oss.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.oss.constant.CloudConstant;
 import com.ruoyi.oss.entity.UploadResult;
 import com.ruoyi.oss.enumd.CloudServiceEnumd;
 import com.ruoyi.oss.enumd.PolicyType;
@@ -58,17 +60,17 @@ public class MinioCloudStorageServiceImpl extends AbstractCloudStorageService im
 	}
 
 	@Override
-	public UploadResult upload(byte[] data, String path) {
-		return upload(new ByteArrayInputStream(data), path);
+	public UploadResult upload(byte[] data, String path, String contentType) {
+		return upload(new ByteArrayInputStream(data), path, contentType);
 	}
 
 	@Override
-	public UploadResult upload(InputStream inputStream, String path) {
+	public UploadResult upload(InputStream inputStream, String path, String contentType) {
 		try {
 			minioClient.putObject(PutObjectArgs.builder()
 				.bucket(properties.getBucketName())
 				.object(path)
-				.contentType("application/octet-stream")
+				.contentType(StrUtil.blankToDefault(contentType, CloudConstant.DEFAULT_CONTENT_TYPE))
 				.stream(inputStream, inputStream.available(), -1)
 				.build());
 		} catch (Exception e) {
@@ -91,13 +93,13 @@ public class MinioCloudStorageServiceImpl extends AbstractCloudStorageService im
 	}
 
 	@Override
-	public UploadResult uploadSuffix(byte[] data, String suffix) {
-		return upload(data, getPath("", suffix));
+	public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
+		return upload(data, getPath("", suffix), contentType);
 	}
 
 	@Override
-	public UploadResult uploadSuffix(InputStream inputStream, String suffix) {
-		return upload(inputStream, getPath("", suffix));
+	public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
+		return upload(inputStream, getPath("", suffix), contentType);
 	}
 
 	@Override

ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java

@@ -53,7 +53,7 @@ public class QcloudCloudStorageServiceImpl extends AbstractCloudStorageService i
 	}
 
 	@Override
-	public UploadResult upload(byte[] data, String path) {
+	public UploadResult upload(byte[] data, String path, String contentType) {
 		// 腾讯云必需要以"/"开头
 		if (!path.startsWith("/")) {
 			path = "/" + path;
@@ -80,13 +80,13 @@ public class QcloudCloudStorageServiceImpl extends AbstractCloudStorageService i
 	}
 
 	@Override
-	public UploadResult uploadSuffix(byte[] data, String suffix) {
-		return upload(data, getPath(this.properties.getPrefix(), suffix));
+	public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
+		return upload(data, getPath(this.properties.getPrefix(), suffix), contentType);
 	}
 
 	@Override
-	public UploadResult uploadSuffix(InputStream inputStream, String suffix) {
-		return upload(inputStream, getPath(this.properties.getPrefix(), suffix));
+	public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
+		return upload(inputStream, getPath(this.properties.getPrefix(), suffix), contentType);
 	}
 
 	@Override

ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java

@@ -60,7 +60,7 @@ public class QiniuCloudStorageServiceImpl extends AbstractCloudStorageService im
 	}
 
 	@Override
-	public UploadResult upload(byte[] data, String path) {
+	public UploadResult upload(byte[] data, String path, String contentType) {
 		try {
 			Response res = uploadManager.put(data, path, token);
 			if (!res.isOK()) {
@@ -86,13 +86,13 @@ public class QiniuCloudStorageServiceImpl extends AbstractCloudStorageService im
 	}
 
 	@Override
-	public UploadResult uploadSuffix(byte[] data, String suffix) {
-		return upload(data, getPath(this.properties.getPrefix(), suffix));
+	public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
+		return upload(data, getPath(this.properties.getPrefix(), suffix), contentType);
 	}
 
 	@Override
-	public UploadResult uploadSuffix(InputStream inputStream, String suffix) {
-		return upload(inputStream, getPath(this.properties.getPrefix(), suffix));
+	public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
+		return upload(inputStream, getPath(this.properties.getPrefix(), suffix), contentType);
 	}
 
 	@Override

ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java

@@ -59,7 +59,7 @@ public class SysOssServiceImpl extends ServicePlusImpl<SysOssMapper, SysOss> imp
 		ICloudStorageService storage = OssFactory.instance();
 		UploadResult uploadResult;
 		try {
-			uploadResult = storage.uploadSuffix(file.getBytes(), suffix);
+			uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
 		} catch (IOException e) {
 			throw new CustomException("文件读取异常!!!", e);
 		}