diff --git a/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java b/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java index 600c61a69..008e11bae 100644 --- a/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java +++ b/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java @@ -4,16 +4,17 @@ import com.njcn.common.config.GeneralInfo; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.huawei.obs.util.OBSUtil; import com.njcn.minioss.bo.MinIoUploadResDTO; -import com.njcn.minioss.config.MinIoProperties; +import com.njcn.minioss.config.MinIossProperties; import com.njcn.minioss.util.MinIoUtils; import com.njcn.oss.constant.GeneralConstant; -import com.njcn.oss.constant.OssPath; import com.njcn.oss.enums.OssResponseEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import java.io.FileInputStream; + /** * @author hongawen * @version 1.0.0 @@ -40,7 +41,7 @@ public class FileStorageUtil { */ private final MinIoUtils minIoUtils; - private final MinIoProperties minIoProperties; + private final MinIossProperties minIossProperties; /*** @@ -54,11 +55,36 @@ public class FileStorageUtil { String filePath; if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) { filePath = dir + minIoUtils.minFileName(multipartFile.getOriginalFilename()); - obsUtil.multiFileUpload(multipartFile, filePath); + obsUtil.uploadMultipart(multipartFile, filePath); } else { try { //把名称存入数据 - MinIoUploadResDTO minIoUploadResDTO = minIoUtils.upload(multipartFile, minIoProperties.getBucket(), dir); + MinIoUploadResDTO minIoUploadResDTO = minIoUtils.upload(multipartFile, minIossProperties.getBucket(), dir); + filePath = minIoUploadResDTO.getMinFileName(); + } catch (Exception e) { + throw new BusinessException(OssResponseEnum.UPLOAD_FILE_ERROR); + } + } + return filePath; + } + + /*** + * 上传InputStream流, + * @author hongawen + * @date 2023/3/7 22:48 + * @param fileStream 文件源 + * @param dir 服务器文件存放路径 + * @param fileName 原始文件名 + */ + public String uploadStream(FileInputStream fileStream, String dir, String fileName) { + String filePath; + if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) { + filePath = dir + minIoUtils.minFileName(fileName); + obsUtil.uploadStream(fileStream, filePath); + } else { + try { + //把名称存入数据 + MinIoUploadResDTO minIoUploadResDTO = minIoUtils.uploadStream(fileStream, minIossProperties.getBucket(), dir,minIoUtils.minFileName(fileName)); filePath = minIoUploadResDTO.getMinFileName(); } catch (Exception e) { throw new BusinessException(OssResponseEnum.UPLOAD_FILE_ERROR); @@ -79,7 +105,7 @@ public class FileStorageUtil { if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) { url = obsUtil.getFileUrl(filePath); } else { - url = minIoUtils.getObjectUrl(minIoProperties.getBucket(), filePath, 7 * 24 * 60 * 60); + url = minIoUtils.getObjectUrl(minIossProperties.getBucket(), filePath, 7 * 24 * 60 * 60); } return url; } @@ -95,7 +121,7 @@ public class FileStorageUtil { if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) { obsUtil.delete(fileName); }else{ - minIoUtils.removeObject(minIoProperties.getBucket(), fileName); + minIoUtils.removeObject(minIossProperties.getBucket(), fileName); } } diff --git a/pqs-harmonic/harmonic-boot/pom.xml b/pqs-harmonic/harmonic-boot/pom.xml index 1158f0fe1..e5f31837e 100644 --- a/pqs-harmonic/harmonic-boot/pom.xml +++ b/pqs-harmonic/harmonic-boot/pom.xml @@ -63,25 +63,6 @@ - - - com.squareup.okhttp3 - okhttp - 4.8.1 - - - - io.minio - minio - 8.2.1 - - - com.squareup.okhttp3 - okhttp - - - - org.springframework.boot diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml index a7ed2024d..ffa315673 100644 --- a/pqs-process/process-boot/pom.xml +++ b/pqs-process/process-boot/pom.xml @@ -67,27 +67,6 @@ ${project.version} - - - - - - com.squareup.okhttp3 - okhttp - 4.8.1 - - - - io.minio - minio - 8.2.1 - - - com.squareup.okhttp3 - okhttp - - - com.github.jeffreyning mybatisplus-plus diff --git a/pqs.ipr b/pqs.ipr index c248a621a..de9c5deec 100644 --- a/pqs.ipr +++ b/pqs.ipr @@ -289,8 +289,8 @@ - +