diff --git a/shandan-basedata/src/main/java/com/keyware/shandan/dynacmicform/controller/DynamicDataController.java b/shandan-basedata/src/main/java/com/keyware/shandan/dynacmicform/controller/DynamicDataController.java index 8ca08e8..caefba1 100644 --- a/shandan-basedata/src/main/java/com/keyware/shandan/dynacmicform/controller/DynamicDataController.java +++ b/shandan-basedata/src/main/java/com/keyware/shandan/dynacmicform/controller/DynamicDataController.java @@ -292,7 +292,9 @@ public class DynamicDataController { String filePath = System.getProperty("user.home") + File.separator + formInfo.getFormId() + ".xlsx"; File file = new File(filePath); - file.deleteOnExit(); + if(file.exists()){ + file.delete(); + } ExcelWriter excelWriter = ExcelUtil.getWriter(file); excelWriter.merge(colIds.size() - 1, formInfo.getFormName()); excelWriter.write(rows, true); @@ -317,7 +319,9 @@ public class DynamicDataController { String filePath = System.getProperty("user.home") + File.separator + formInfo.getFormId() + "_template.xlsx"; File file = new File(filePath); - file.deleteOnExit(); + if(file.exists()){ + file.delete(); + } ExcelWriter excelWriter = ExcelUtil.getWriter(file); excelWriter.merge(colIds.size() - 1, formInfo.getFormName()); excelWriter.write(rows, true); diff --git a/shandan-browser/src/main/java/com/keyware/shandan/browser/service/ExportComponent.java b/shandan-browser/src/main/java/com/keyware/shandan/browser/service/ExportComponent.java index a050198..81272d5 100644 --- a/shandan-browser/src/main/java/com/keyware/shandan/browser/service/ExportComponent.java +++ b/shandan-browser/src/main/java/com/keyware/shandan/browser/service/ExportComponent.java @@ -189,7 +189,9 @@ public class ExportComponent { private void delete(String path) { File file = new File(path); - file.deleteOnExit(); + if(file.exists()){ + file.delete(); + } } @AllArgsConstructor diff --git a/shandan-common/src/main/java/com/keyware/shandan/common/util/FileDownload.java b/shandan-common/src/main/java/com/keyware/shandan/common/util/FileDownload.java index 38b1509..9294f65 100644 --- a/shandan-common/src/main/java/com/keyware/shandan/common/util/FileDownload.java +++ b/shandan-common/src/main/java/com/keyware/shandan/common/util/FileDownload.java @@ -81,7 +81,9 @@ public class FileDownload { return "下载过程出现错误,文件流读取异常!"; } finally { if (delete) { - file.deleteOnExit(); + if(file.exists()){ + file.delete(); + } } } return "下载完成"; diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java index ef4a472..9fba8ff 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java +++ b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java @@ -176,7 +176,6 @@ public class SysFileController extends BaseController uploadChunk(MultipartFile file, SysFile fileInfo, SysFileChunk fileChunk) throws Exception { - //; return Result.of(FileChunkUploadUtil.uploadChunk(file, fileInfo, fileChunk)); } diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFileServiceImpl.java b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFileServiceImpl.java index 3f5743a..58e8a45 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFileServiceImpl.java +++ b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFileServiceImpl.java @@ -234,7 +234,9 @@ public class SysFileServiceImpl extends BaseServiceImpl chunks = new ArrayList<>(chunksCache.values()); chunks.sort((o1, o2) -> (int) (o1.getChunkIndex() - o2.getChunkIndex())); - FileOutputStream outputStream = new FileOutputStream(targetFile, true); - for (SysFileChunk chunk : chunks) { - File chunkFile = new File(chunk.getChunkPath()); - FileUtils.copyFile(chunkFile, outputStream); + try (FileOutputStream outputStream = new FileOutputStream(targetFile, true)) { + for (SysFileChunk chunk : chunks) { + File chunkFile = new File(chunk.getChunkPath()); + FileUtils.copyFile(chunkFile, outputStream); + } } - outputStream.close(); // 删除分片缓存文件,该方法为递归删除 FileUtil.del(chunkFIleStorePath);