From 456620b6383611bc5982d670fca8dead60571208 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 06 六月 2024 11:13:46 +0800
Subject: [PATCH] !549 ♥️发布 5.2.0-BETA2 公测版本 Merge pull request !549 from 疯狂的狮子Li/dev
---
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
index fcad35b..86668aa 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
@@ -162,13 +162,14 @@
/**
* 涓婁紶鏂囦欢鍒� Amazon S3锛屽苟杩斿洖涓婁紶缁撴灉
*
- * @param filePath 鏈湴鏂囦欢璺緞
- * @param key 鍦� Amazon S3 涓殑瀵硅薄閿�
- * @param md5Digest 鏈湴鏂囦欢鐨� MD5 鍝堝笇鍊硷紙鍙�夛級
+ * @param filePath 鏈湴鏂囦欢璺緞
+ * @param key 鍦� Amazon S3 涓殑瀵硅薄閿�
+ * @param md5Digest 鏈湴鏂囦欢鐨� MD5 鍝堝笇鍊硷紙鍙�夛級
+ * @param contentType 鏂囦欢鍐呭绫诲瀷
* @return UploadResult 鍖呭惈涓婁紶鍚庣殑鏂囦欢淇℃伅
* @throws OssException 濡傛灉涓婁紶澶辫触锛屾姏鍑鸿嚜瀹氫箟寮傚父
*/
- public UploadResult upload(Path filePath, String key, String md5Digest) {
+ public UploadResult upload(Path filePath, String key, String md5Digest, String contentType) {
try {
// 鏋勫缓涓婁紶璇锋眰瀵硅薄
FileUpload fileUpload = transferManager.uploadFile(
@@ -176,6 +177,7 @@
y -> y.bucket(properties.getBucketName())
.key(key)
.contentMD5(StringUtils.isNotEmpty(md5Digest) ? md5Digest : null)
+ .contentType(contentType)
.build())
.addTransferListener(LoggingTransferListener.create())
.source(filePath).build());
@@ -201,10 +203,11 @@
* @param inputStream 瑕佷笂浼犵殑杈撳叆娴�
* @param key 鍦� Amazon S3 涓殑瀵硅薄閿�
* @param length 杈撳叆娴佺殑闀垮害
+ * @param contentType 鏂囦欢鍐呭绫诲瀷
* @return UploadResult 鍖呭惈涓婁紶鍚庣殑鏂囦欢淇℃伅
* @throws OssException 濡傛灉涓婁紶澶辫触锛屾姏鍑鸿嚜瀹氫箟寮傚父
*/
- public UploadResult upload(InputStream inputStream, String key, Long length) {
+ public UploadResult upload(InputStream inputStream, String key, Long length, String contentType) {
// 濡傛灉杈撳叆娴佷笉鏄� ByteArrayInputStream锛屽垯灏嗗叾璇诲彇涓哄瓧鑺傛暟缁勫啀鍒涘缓 ByteArrayInputStream
if (!(inputStream instanceof ByteArrayInputStream)) {
inputStream = new ByteArrayInputStream(IoUtil.readBytes(inputStream));
@@ -219,6 +222,7 @@
.putObjectRequest(
y -> y.bucket(properties.getBucketName())
.key(key)
+ .contentType(contentType)
.build())
.build());
@@ -335,7 +339,7 @@
* @throws OssException 濡傛灉涓婁紶澶辫触锛屾姏鍑鸿嚜瀹氫箟寮傚父
*/
public UploadResult uploadSuffix(byte[] data, String suffix) {
- return upload(new ByteArrayInputStream(data), getPath(properties.getPrefix(), suffix), Long.valueOf(data.length));
+ return upload(new ByteArrayInputStream(data), getPath(properties.getPrefix(), suffix), Long.valueOf(data.length), FileUtils.getMimeType(suffix));
}
/**
@@ -348,7 +352,7 @@
* @throws OssException 濡傛灉涓婁紶澶辫触锛屾姏鍑鸿嚜瀹氫箟寮傚父
*/
public UploadResult uploadSuffix(InputStream inputStream, String suffix, Long length) {
- return upload(inputStream, getPath(properties.getPrefix(), suffix), length);
+ return upload(inputStream, getPath(properties.getPrefix(), suffix), length, FileUtils.getMimeType(suffix));
}
/**
@@ -360,7 +364,7 @@
* @throws OssException 濡傛灉涓婁紶澶辫触锛屾姏鍑鸿嚜瀹氫箟寮傚父
*/
public UploadResult uploadSuffix(File file, String suffix) {
- return upload(file.toPath(), getPath(properties.getPrefix(), suffix), null);
+ return upload(file.toPath(), getPath(properties.getPrefix(), suffix), null, FileUtils.getMimeType(suffix));
}
/**
--
Gitblit v1.9.3