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); // 获取文档中的图片