From 4061fc3381f8ee7f178bfd633830419e7d95464b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 22 Jul 2024 09:23:33 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BB=8Eminio=E5=88=87=E6=8F=9B=E5=88=B0=E5=8D=8E=E4=B8=BA?=
 =?UTF-8?q?=E4=BA=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessStandardComplianceCheckServiceImpl.java  | 4 ++--
 .../impl/LawsConformityAssessmentLibraryServiceImpl.java | 4 ++--
 .../laws/common/service/impl/LawsCommonServiceImpl.java  | 9 +++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 90bad8c6..fd4c168f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -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;
             }
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
index 07fc0af6..e00d642b 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
@@ -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);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index 98851b97..6183bdd6 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -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;
                     }