diff --git a/maku-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java b/maku-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java index 816865d3be72c6f239ea584068f23fbc92f448b0..0add5bfb11e8cd64835d3622a64abdd73761f5fa 100644 --- a/maku-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java +++ b/maku-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java @@ -4,11 +4,15 @@ import io.minio.BucketExistsArgs; import io.minio.MakeBucketArgs; import io.minio.MinioClient; import io.minio.PutObjectArgs; +import net.maku.framework.common.constant.Constant; import net.maku.framework.common.exception.ServerException; import net.maku.storage.properties.StorageProperties; +import org.springframework.http.MediaType; +import org.springframework.http.MediaTypeFactory; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.util.Optional; /** * Minio存储 @@ -40,9 +44,16 @@ public class MinioStorageService extends StorageService { minioClient.makeBucket(MakeBucketArgs.builder().bucket(properties.getMinio().getBucketName()).build()); } + String contentType = Constant.CONTENTTYPE_OCTET_STREAM; + Optional mediaType = MediaTypeFactory.getMediaType(path); + if (mediaType.isPresent()) { + contentType = mediaType.get().toString(); + } + minioClient.putObject( PutObjectArgs.builder() .bucket(properties.getMinio().getBucketName()) + .contentType(contentType) .object(path) .stream(inputStream, inputStream.available(), -1) .build() diff --git a/maku-framework/src/main/java/net/maku/framework/common/constant/Constant.java b/maku-framework/src/main/java/net/maku/framework/common/constant/Constant.java index 7e5d7e537589f52aeb1e2af98c05f6b138c34cb1..e70936d7575539f8adcbf6b5b784abf6520c0f4e 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/constant/Constant.java +++ b/maku-framework/src/main/java/net/maku/framework/common/constant/Constant.java @@ -48,5 +48,9 @@ public interface Constant { * pgsql的driver */ String PGSQL_DRIVER = "org.postgresql.Driver"; + /** + * Content-Type + */ + String CONTENTTYPE_OCTET_STREAM = "application/octet-stream"; } \ No newline at end of file