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

fix: MinioUtil -> ObsBootUtil

Browse Source
This commit is contained in:
yjz
2024-07-19 14:43:59 +08:00
parent 782d4da197
commit 98472d6725
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+4 -1
View File
@@ -18,6 +18,7 @@ import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysUserCacheInfo; import com.jero.common.system.vo.SysUserCacheInfo;
import com.jero.common.util.*; import com.jero.common.util.*;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.base.service.BaseCommonService;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.oss.service.IOSSFileService;
@@ -732,8 +733,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
outputStream.write(buffer, 0, bytesRead); outputStream.write(buffer, 0, bytesRead);
} }
byte[] fileBytes = outputStream.toByteArray(); byte[] fileBytes = outputStream.toByteArray();
// 上传文件到obs
String url = ObsBootUtil.upload(new ByteArrayInputStream(fileBytes), name);
// 上传文件到MinIO // 上传文件到MinIO
String url = MinioUtil.upload(new ByteArrayInputStream(fileBytes), name); // String url = MinioUtil.upload(new ByteArrayInputStream(fileBytes), name);
// 保存到oss // 保存到oss
OSSFile ossFile = new OSSFile(); OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
laws-modules/src/main/java/com/jero/modules/document/utils/ReadWordUtil.java
+8 -5
View File
@@ -1,7 +1,7 @@
package com.jero.modules.document.utils; package com.jero.modules.document.utils;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MinioUtil; import com.jero.common.util.obs.ObsBootUtil;
import org.apache.poi.hwpf.extractor.WordExtractor; import org.apache.poi.hwpf.extractor.WordExtractor;
import org.apache.poi.ooxml.POIXMLDocument; import org.apache.poi.ooxml.POIXMLDocument;
import org.apache.poi.ooxml.extractor.POIXMLTextExtractor; import org.apache.poi.ooxml.extractor.POIXMLTextExtractor;
@@ -11,6 +11,7 @@ import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.util.Objects;
import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile; import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile;
@@ -27,8 +28,9 @@ public class ReadWordUtil {
String str = "--"; String str = "--";
try { try {
if (path.endsWith(".doc")) { if (path.endsWith(".doc")) {
if(MinioUtil.doesObjectExist(path)){ // InputStream in = MinioUtil.download(path);
InputStream in = MinioUtil.download(path); InputStream in = ObsBootUtil.getOssFile(path);
if(!Objects.isNull(in)){
WordExtractor ex = new WordExtractor(in); WordExtractor ex = new WordExtractor(in);
str = ex.getText(); str = ex.getText();
ex.close(); ex.close();
@@ -36,8 +38,9 @@ public class ReadWordUtil {
} }
} else if (path.endsWith("docx")) { } else if (path.endsWith("docx")) {
//先把文件存到本地, 用完后在删除 //先把文件存到本地, 用完后在删除
if(MinioUtil.doesObjectExist(path)){ // InputStream in = MinioUtil.download(path);
InputStream in = MinioUtil.download(path); InputStream in = ObsBootUtil.getOssFile(path);
if(!Objects.isNull(in)){
String fileNowPath = uploadpath + "/tempZip/" ; String fileNowPath = uploadpath + "/tempZip/" ;
File file = new File(fileNowPath); File file = new File(fileNowPath);
if (file.exists()) { if (file.exists()) {
laws-modules/src/main/java/com/jero/modules/laws/ocr/controller/OCRRestfulController.java
+7 -4
View File
@@ -2,6 +2,7 @@ package com.jero.modules.laws.ocr.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.jero.common.util.MinioUtil; import com.jero.common.util.MinioUtil;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.laws.ocr.MD5Util; import com.jero.modules.laws.ocr.MD5Util;
import com.jero.modules.laws.ocr.entity.OcrCallBackResultEo; import com.jero.modules.laws.ocr.entity.OcrCallBackResultEo;
import com.jero.modules.laws.ocr.entity.OcrRecordEO; import com.jero.modules.laws.ocr.entity.OcrRecordEO;
@@ -135,9 +136,10 @@ public class OCRRestfulController extends BaseController<OcrRecordEO> {
String fileId = ocrRecordEO.getAttId(); String fileId = ocrRecordEO.getAttId();
OSSFile ossFile = ossFileService.getById(fileId); OSSFile ossFile = ossFileService.getById(fileId);
if (!Objects.isNull(ossFile)){ if (!Objects.isNull(ossFile)){
InputStream minioFile = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl()); InputStream obsFile = ObsBootUtil.getOssFile(ossFile.getUrl());
// InputStream minioFile = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl());
MultipartFile multipartFile = new MockMultipartFile(ossFile.getFileName(), ossFile.getFileName(), MultipartFile multipartFile = new MockMultipartFile(ossFile.getFileName(), ossFile.getFileName(),
ContentType.APPLICATION_OCTET_STREAM.toString(), minioFile); ContentType.APPLICATION_OCTET_STREAM.toString(), obsFile);
return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"add"); return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"add");
} else { } else {
return Result.error("0","无法找到该文件",null); return Result.error("0","无法找到该文件",null);
@@ -157,9 +159,10 @@ public class OCRRestfulController extends BaseController<OcrRecordEO> {
String fileId = ocrRecordEO.getAttId(); String fileId = ocrRecordEO.getAttId();
OSSFile ossFile = ossFileService.getById(fileId); OSSFile ossFile = ossFileService.getById(fileId);
if (!Objects.isNull(ossFile)){ if (!Objects.isNull(ossFile)){
InputStream minioFile = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl()); InputStream obsFile = ObsBootUtil.getOssFile(ossFile.getUrl());
// InputStream minioFile = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl());
MultipartFile multipartFile = new MockMultipartFile(ossFile.getFileName(), ossFile.getFileName(), MultipartFile multipartFile = new MockMultipartFile(ossFile.getFileName(), ossFile.getFileName(),
ContentType.APPLICATION_OCTET_STREAM.toString(), minioFile); ContentType.APPLICATION_OCTET_STREAM.toString(), obsFile);
return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"update"); return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"update");
} else { } else {
return Result.error("0","无法找到该文件",null); return Result.error("0","无法找到该文件",null);
laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OCRRestfulServiceImpl.java
+5 -3
View File
@@ -2,8 +2,8 @@ package com.jero.modules.laws.ocr.service.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MinioUtil;
import com.jero.common.util.SnowflakeUtils; import com.jero.common.util.SnowflakeUtils;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.laws.ocr.Base64Util; import com.jero.modules.laws.ocr.Base64Util;
import com.jero.modules.laws.ocr.OkHttpUtil; import com.jero.modules.laws.ocr.OkHttpUtil;
import com.jero.modules.laws.ocr.RsaUtil; import com.jero.modules.laws.ocr.RsaUtil;
@@ -161,7 +161,8 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
String jsonId=null; String jsonId=null;
logger.info("保存文件"); logger.info("保存文件");
if(wordFile!=null && !wordFile.isEmpty()){ if(wordFile!=null && !wordFile.isEmpty()){
String wordUrl = MinioUtil.upload(wordFile, "/temp"); // String wordUrl = MinioUtil.upload(wordFile, "/temp");
String wordUrl = ObsBootUtil.upload(wordFile, "/temp");
OSSFile ossFile = new OSSFile(); OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
ossFile.setFileName(wordFile.getOriginalFilename()); ossFile.setFileName(wordFile.getOriginalFilename());
@@ -171,7 +172,8 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
logger.info("word存储完成"); logger.info("word存储完成");
} }
if(jsonFile!=null && !jsonFile.isEmpty()){ if(jsonFile!=null && !jsonFile.isEmpty()){
String jsonUrl = MinioUtil.upload(jsonFile, "/temp"); // String jsonUrl = MinioUtil.upload(jsonFile, "/temp");
String jsonUrl = ObsBootUtil.upload(wordFile, "/temp");
OSSFile ossFile = new OSSFile(); OSSFile ossFile = new OSSFile();
ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
ossFile.setFileName(jsonFile.getOriginalFilename()); ossFile.setFileName(jsonFile.getOriginalFilename());