From ace5a1898c85dc66f3fff5dbac4aa3c3bec9d5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= Date: Sun, 23 Apr 2023 05:54:21 +0000 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD:=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E6=96=B9=E6=B3=95?= =?UTF-8?q?&forceUpdatedCache=3Dtrue=20=E6=96=B0=E5=A2=9E=E5=8A=9F?= =?UTF-8?q?=E8=83=BD:=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=96=B9=E6=B3=95&forceUpdatedCache=3Dtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 高雄 --- .../java/cn/keking/service/FileHandlerService.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index 7116a96d..1ac7b69a 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -179,14 +179,11 @@ public class FileHandlerService { */ public List pdf2jpg(String pdfFilePath, String pdfName, String baseUrl, FileAttribute fileAttribute) { List imageUrls = new ArrayList<>(); - Integer imageCount ; + Integer imageCount = null; ; String imageFileSuffix = ".jpg"; String pdfFolder = pdfName.substring(0, pdfName.length() - 4); - boolean force_updated_cache=fileAttribute.forceUpdatedCache(); - String filePassword = fileAttribute.getFilePassword(); - if (force_updated_cache){ - imageCount = Integer.valueOf("0"); - }else { + boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); + if (!forceUpdatedCache){ imageCount = this.getConvertedPdfImage(pdfFilePath); } String urlPrefix; @@ -207,7 +204,7 @@ public class FileHandlerService { if (!pdfFile.exists()) { return null; } - PDDocument doc = PDDocument.load(pdfFile,filePassword); + PDDocument doc = PDDocument.load(pdfFile); doc.setResourceCache(new NotResourceCache()); int pageCount = doc.getNumberOfPages(); PDFRenderer pdfRenderer = new PDFRenderer(doc); @@ -321,7 +318,7 @@ public class FileHandlerService { if (StringUtils.hasText(fileKey)) { attribute.setFileKey(fileKey); } - if (StringUtil.isNotBlank(forceUpdatedCache) && "true".equalsIgnoreCase(forceUpdatedCache)) { + if ( "true".equalsIgnoreCase(forceUpdatedCache)) { attribute.setforceUpdatedCache(true); }