diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index b75bf5bc..1c15e6f3 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -1023,13 +1023,20 @@ public class FileSpiltService { XWPFPictureData pictureData = p.getDocument().getPictureDataByID(pictureId); String imageName = UUIDUtils.randomUUID10() + pictureData.getFileName(); byte[] bytev = pictureData.getData(); - String filepathandname = filePathCos + "/" + imageName; + //String filepathandname = filePathCos + "/" + imageName; try { - String path = splitUrl+imageName; + //String path = splitUrl+imageName; // MinioUtil.uploadByte(bytev, filepathandname); - ObsBootUtil.upload(new ByteArrayInputStream(bytev), filepathandname); - String imgCon = path; - String imgConVal = ""; + InputStream inputStream = new ByteArrayInputStream(bytev); + MultipartFile file = new MockMultipartFile(imageName, imageName,ContentType.APPLICATION_OCTET_STREAM.toString(),inputStream); + String upload = ObsBootUtil.upload(file, "temp"); + OSSFile ossFile = new OSSFile(); + ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); + ossFile.setFileName(file.getName()); + ossFile.setUrl(upload); + ossFileService.save(ossFile); + String imgCon = splitUrl+upload.replace("temp\\", ""); + String imgConVal = ""; stringBuilder.append(imgConVal); } catch (Exception e) { e.printStackTrace();