From 78cdc4f8e3a29109dbcc0bba8f33f97ec734bf6f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 25 Mar 2024 17:09:15 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=A7=A3=E5=AF=86=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/util/IntekeyUtils.java | 5 +++++ .../jero/modules/split/service/impl/FileSpiltService.java | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/util/IntekeyUtils.java b/laws-base/laws-base-core/src/main/java/com/jero/common/util/IntekeyUtils.java index 5c820d1e..eadfb9da 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/util/IntekeyUtils.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/util/IntekeyUtils.java @@ -114,6 +114,11 @@ public class IntekeyUtils { if(ENABLE){ return decryptFile(DECRYPT_URL, DECRYPT_APP_CODE, DECRYPT_SECRET_KEY, null, file); } + try { + return file.getInputStream(); + } catch (IOException e) { + e.printStackTrace(); + } return null; } 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 ce61fe92..19c6576e 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 @@ -184,8 +184,6 @@ public class FileSpiltService { MultipartFile mFile1 = new MockMultipartFile(fileName, fileName, ContentType.APPLICATION_OCTET_STREAM.toString(), is1); InputStream inputStream = IntekeyUtils.getInputStreamByDecryptFile(mFile); InputStream inputStream1 = IntekeyUtils.getInputStreamByDecryptFile(mFile1); - inputStream = inputStream == null ? is : inputStream; - inputStream1 = inputStream1 == null ? is1 : inputStream1; ZipSecureFile.setMinInflateRatio(-1.0d); XWPFDocument doc = new XWPFDocument(inputStream); // 获取文档中的图片