Browse Source

修改合并异常

pull/2077/head
Jiaju Zhuang 3 years ago
parent
commit
2dabf6cce3
  1. 15
      src/main/java/com/alibaba/excel/context/WriteContextImpl.java

15
src/main/java/com/alibaba/excel/context/WriteContextImpl.java

@ -437,7 +437,7 @@ public class WriteContextImpl implements WriteContext {
if (writeWorkbookHolder.getFile() != null) { if (writeWorkbookHolder.getFile() != null) {
return false; return false;
} }
File tempXlsx = FileUtils.createTmpFile(UUID.randomUUID().toString() + ".xlsx"); File tempXlsx = FileUtils.createTmpFile(UUID.randomUUID() + ".xlsx");
FileOutputStream tempFileOutputStream = new FileOutputStream(tempXlsx); FileOutputStream tempFileOutputStream = new FileOutputStream(tempXlsx);
try { try {
writeWorkbookHolder.getWorkbook().write(tempFileOutputStream); writeWorkbookHolder.getWorkbook().write(tempFileOutputStream);
@ -483,19 +483,6 @@ public class WriteContextImpl implements WriteContext {
POIFSFileSystem fileSystem = new POIFSFileSystem(); POIFSFileSystem fileSystem = new POIFSFileSystem();
Encryptor encryptor = new EncryptionInfo(EncryptionMode.standard).getEncryptor(); Encryptor encryptor = new EncryptionInfo(EncryptionMode.standard).getEncryptor();
encryptor.confirmPassword(writeWorkbookHolder.getPassword()); encryptor.confirmPassword(writeWorkbookHolder.getPassword());
OPCPackage opcPackage = null;
OutputStream outputStream = null;
try {
opcPackage = OPCPackage.open(file, PackageAccess.READ_WRITE);
outputStream = encryptor.getDataStream(fileSystem);
opcPackage.save(outputStream);
} finally {
if (opcPackage != null) {
opcPackage.close();
}
if (outputStream != null) {
outputStream.close();
}
try (OPCPackage opcPackage = OPCPackage.open(file, PackageAccess.READ_WRITE); try (OPCPackage opcPackage = OPCPackage.open(file, PackageAccess.READ_WRITE);
OutputStream outputStream = encryptor.getDataStream(fileSystem)) { OutputStream outputStream = encryptor.getDataStream(fileSystem)) {
opcPackage.save(outputStream); opcPackage.save(outputStream);

Loading…
Cancel
Save