QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: 相关代码从minio切換到华为云

Browse Source
This commit is contained in:
mzaxd
2024-07-22 09:23:55 +08:00
parent f0b70dc24c
commit 4061fc3381
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+2 -2
View File
@@ -13,8 +13,8 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysDictItemCore;
import com.jero.common.util.FileUtils;
import com.jero.common.util.MessageUtils;
import com.jero.common.util.MinioUtil;
import com.jero.common.util.ZipUtil;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.activiti.common.ActivitiCommon;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
@@ -891,7 +891,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
OSSFile fileInfo = fileInfos.get(0);
String fileName = fileInfo.getFileName();
String url = fileInfo.getUrl();
try (InputStream originalInputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), url)) {
try (InputStream originalInputStream = ObsBootUtil.getOssFile(url)) {
if (originalInputStream == null) {
return null;
}
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+2 -2
View File
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.FileUtils;
import com.jero.common.util.MinioUtil;
import com.jero.common.util.ZipUtil;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
import com.jero.modules.assessmentLibrary.entity.vo.LawsConformityAssessmentLibraryExportVO;
@@ -220,7 +220,7 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
vo.setMaterialFileList(materialFileList);
// 写出文件
for (OSSFile ossFile : ossFileList) {
InputStream inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl());
InputStream inputStream = ObsBootUtil.getOssFile(ossFile.getUrl());
// pdf加水印
if (StringUtils.endsWithIgnoreCase(ossFile.getFileName(), ".pdf")) {
inputStream = sysWaterMarkUtil.addWatermarkToPdf(inputStream);
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+3 -6
View File
@@ -23,8 +23,8 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysDictItemCore;
import com.jero.common.util.IntekeyUtils;
import com.jero.common.util.MessageUtils;
import com.jero.common.util.MinioUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.mapper.LawsCommonMapper;
@@ -2413,9 +2413,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
private byte[] getMinioFileContentNormal(OSSFile file, boolean esSpecial) throws Exception {
String fileUrl = file.getUrl();
String fileName = file.getFileName();
String minioUrl = MinioUtil.getMinioUrl();
minioUrl = minioUrl + MinioUtil.getBucketName() + "/";
String url = fileUrl.replace(minioUrl, "");
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
byte[] buf = new byte[1024];
@@ -2423,7 +2420,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
if ("pdf".equalsIgnoreCase(FileUtil.extName(fileName))) {
// 如果是PDF文件, 添加水印
try (InputStream originalInputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), url);
try (InputStream originalInputStream = ObsBootUtil.getOssFile(file.getUrl());
InputStream watermarkedInputStream = sysWaterMarkUtil.addWatermarkToPdf(originalInputStream)) {
// 如果是系统开启了加密并且处理的是企标 则需要将加水印的pdf文件再次加密
InputStream is = watermarkedInputStream;
@@ -2444,7 +2441,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
}
} else {
// 如果不是PDF文件
try (InputStream inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), url)) {
try (InputStream inputStream = ObsBootUtil.getOssFile(file.getUrl())) {
if (inputStream == null) {
return null;
}