Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'pms'

Browse Source
This commit is contained in:
hongawen
2023-03-08 15:57:51 +08:00
parent 9eabebf8d8 a1daceb70c
commit 3804366cd1
4 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java
View File

@@ -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);
}
}

19
pqs-harmonic/harmonic-boot/pom.xml
View File

@@ -63,25 +63,6 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.8.1</version>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>8.2.1</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--避免idea后端配置类报红-->
<dependency>
<groupId>org.springframework.boot</groupId>

21
pqs-process/process-boot/pom.xml
View File

@@ -67,27 +67,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.8.1</version>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>8.2.1</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.jeffreyning</groupId>
<artifactId>mybatisplus-plus</artifactId>

2
pqs.ipr
View File

@@ -289,8 +289,8 @@
<module filepath="$PROJECT_DIR$/pqs-common/common-influxdb/common-influxDB.iml"/>
<module filepath="$PROJECT_DIR$/pqs-common/common-poi/common-poi.iml"/>
<module filepath="$PROJECT_DIR$/pqs-common/common-echarts/common-echarts.iml"/>
<module filepath="$PROJECT_DIR$/pqs-common/common-minio/common-minio.iml"/>
<module filepath="$PROJECT_DIR$/pqs-common/common-huawei/common-huawei.iml"/>
<module filepath="$PROJECT_DIR$/pqs-common/common-oss/common-oss.iml"/>
<module filepath="$PROJECT_DIR$/pqs-common/pqs-common.iml"/>
<module filepath="$PROJECT_DIR$/pqs-gateway/pqs-gateway.iml"/>
<module filepath="$PROJECT_DIR$/pqs-user/user-api/user-api.iml"/>