diff --git a/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java b/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java index 8acf26c5..fa8bcca0 100644 --- a/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java +++ b/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java @@ -54,21 +54,15 @@ public class OfficeFilePreviewImpl implements FilePreview { // 判断之前是否已转换过,如果转换过,直接返回,否则执行转换 if (!fileUtils.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { String filePath = fileDir + fileName; - if (!new File(filePath).exists()) { - ReturnResponse response = downloadUtils.downLoad(fileAttribute, null); - if (0 != response.getCode()) { - model.addAttribute("fileType", suffix); - model.addAttribute("msg", response.getMsg()); - return "fileNotSupported"; - } - filePath = response.getContent(); + ReturnResponse response = downloadUtils.downLoad(fileAttribute, null); + if (0 != response.getCode()) { + model.addAttribute("fileType", suffix); + model.addAttribute("msg", response.getMsg()); + return "fileNotSupported"; } + filePath = response.getContent(); if (StringUtils.hasText(outFilePath)) { officeToPdf.openOfficeToPDF(filePath, outFilePath); - File f = new File(filePath); - if (f.exists()) { - f.delete(); - } if (isHtml) { // 对转换后的文件进行操作(改变编码方式) fileUtils.doActionConvertedFile(outFilePath); diff --git a/jodconverter-web/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java b/jodconverter-web/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java index dba00d15..e16bcfd8 100644 --- a/jodconverter-web/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java +++ b/jodconverter-web/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java @@ -44,15 +44,13 @@ public class PdfFilePreviewImpl implements FilePreview{ String outFilePath = fileDir + pdfName; if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_ALLIMAGES.equals(officePreviewType)) { //当文件不存在时,就去下载 - if (!new File(outFilePath).exists()) { - ReturnResponse response = downloadUtils.downLoad(fileAttribute, fileName); - if (0 != response.getCode()) { - model.addAttribute("fileType", suffix); - model.addAttribute("msg", response.getMsg()); - return "fileNotSupported"; - } - outFilePath = response.getContent(); + ReturnResponse response = downloadUtils.downLoad(fileAttribute, fileName); + if (0 != response.getCode()) { + model.addAttribute("fileType", suffix); + model.addAttribute("msg", response.getMsg()); + return "fileNotSupported"; } + outFilePath = response.getContent(); List imageUrls = pdfUtils.pdf2jpg(outFilePath, pdfName, originUrl); if (imageUrls == null || imageUrls.size() < 1) { model.addAttribute("msg", "pdf转图片异常,请联系管理员");