From f8c7ce647cf1365215a1e69718d25dbd974e0b6d Mon Sep 17 00:00:00 2001 From: gaoxiongzaq Date: Sun, 23 Apr 2023 11:22:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95&force=5Fupdated=5Fcache=3Dtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/keking/model/FileAttribute.java | 7 +++++++ .../cn/keking/service/FileHandlerService.java | 18 +++++++++++++++--- .../service/impl/CadFilePreviewImpl.java | 3 ++- .../service/impl/CompressFilePreviewImpl.java | 3 ++- .../service/impl/OfficeFilePreviewImpl.java | 7 ++++--- .../service/impl/PdfFilePreviewImpl.java | 5 +++-- .../service/impl/SimTextFilePreviewImpl.java | 3 ++- .../service/impl/TiffFilePreviewImpl.java | 3 ++- 8 files changed, 37 insertions(+), 12 deletions(-) diff --git a/server/src/main/java/cn/keking/model/FileAttribute.java b/server/src/main/java/cn/keking/model/FileAttribute.java index 265750e0..eee91dc7 100644 --- a/server/src/main/java/cn/keking/model/FileAttribute.java +++ b/server/src/main/java/cn/keking/model/FileAttribute.java @@ -18,6 +18,7 @@ public class FileAttribute { private String officePreviewType = ConfigConstants.getOfficePreviewType(); private String tifPreviewType; private Boolean skipDownLoad = false; + private Boolean forceUpdatedCache = false; public FileAttribute() { } @@ -116,5 +117,11 @@ public class FileAttribute { public void setTifPreviewType(String previewType) { this.tifPreviewType = previewType; } + public Boolean forceUpdatedCache() { + return forceUpdatedCache; + } + public void setforceUpdatedCache(Boolean forceUpdatedCache) { + this.forceUpdatedCache = forceUpdatedCache; + } } diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index 446e05c3..fbd3b088 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -14,6 +14,7 @@ import com.aspose.cad.Image; import com.aspose.cad.LoadOptions; import com.aspose.cad.imageoptions.CadRasterizationOptions; import com.aspose.cad.imageoptions.PdfOptions; +import jodd.util.StringUtil; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.rendering.ImageType; import org.apache.pdfbox.rendering.PDFRenderer; @@ -176,11 +177,18 @@ public class FileHandlerService { * @param baseUrl 基础访问地址 * @return 图片访问集合 */ - public List pdf2jpg(String pdfFilePath, String pdfName, String baseUrl) { + public List pdf2jpg(String pdfFilePath, String pdfName, String baseUrl, FileAttribute fileAttribute) { List imageUrls = new ArrayList<>(); - Integer imageCount = this.getConvertedPdfImage(pdfFilePath); + Integer imageCount ; 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 { + imageCount = this.getConvertedPdfImage(pdfFilePath); + } String urlPrefix; try { urlPrefix = baseUrl + URLEncoder.encode(pdfFolder, uriEncoding).replaceAll("\\+", "%20"); @@ -199,7 +207,7 @@ public class FileHandlerService { if (!pdfFile.exists()) { return null; } - PDDocument doc = PDDocument.load(pdfFile); + PDDocument doc = PDDocument.load(pdfFile,filePassword); doc.setResourceCache(new NotResourceCache()); int pageCount = doc.getNumberOfPages(); PDFRenderer pdfRenderer = new PDFRenderer(doc); @@ -305,6 +313,7 @@ public class FileHandlerService { attribute.setUrl(url); if (req != null) { String officePreviewType = req.getParameter("officePreviewType"); + String forceUpdatedCache = req.getParameter("force_updated_cache"); String fileKey = WebUtils.getUrlParameterReg(url,"fileKey"); if (StringUtils.hasText(officePreviewType)) { attribute.setOfficePreviewType(officePreviewType); @@ -312,6 +321,9 @@ public class FileHandlerService { if (StringUtils.hasText(fileKey)) { attribute.setFileKey(fileKey); } + if (StringUtil.isNotBlank(forceUpdatedCache) && "true".equalsIgnoreCase(forceUpdatedCache)) { + attribute.setforceUpdatedCache(true); + } String tifPreviewType = req.getParameter("tifPreviewType"); if (StringUtils.hasText(tifPreviewType)) { diff --git a/server/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java index 11944080..42b9c1a5 100644 --- a/server/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java @@ -38,11 +38,12 @@ public class CadFilePreviewImpl implements FilePreview { // 预览Type，参数传了就取参数的，没传取系统默认 String officePreviewType = fileAttribute.getOfficePreviewType() == null ? ConfigConstants.getOfficePreviewType() : fileAttribute.getOfficePreviewType(); String baseUrl = BaseUrlFilter.getBaseUrl(); + boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); String fileName = fileAttribute.getName(); String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf"; String outFilePath = FILE_DIR + pdfName; // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换 - if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { + if (forceUpdatedCache || !fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { String filePath; ReturnResponse response = DownloadUtils.downLoad(fileAttribute, null); if (response.isFailure()) { diff --git a/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java index 011ce8c4..8209b9ca 100644 --- a/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java @@ -38,9 +38,10 @@ public class CompressFilePreviewImpl implements FilePreview { public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) { String fileName=fileAttribute.getName(); String filePassword = fileAttribute.getFilePassword(); + boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); String fileTree = null; // 判断文件名是否存在(redis缓存读取) - if (!StringUtils.hasText(fileHandlerService.getConvertedFile(fileName)) || !ConfigConstants.isCacheEnabled()) { + if (forceUpdatedCache || !StringUtils.hasText(fileHandlerService.getConvertedFile(fileName)) || !ConfigConstants.isCacheEnabled()) { ReturnResponse response = DownloadUtils.downLoad(fileAttribute, fileName); if (response.isFailure()) { return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg()); diff --git a/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java index 2cf75496..ecd0f6b4 100644 --- a/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java @@ -47,12 +47,13 @@ public class OfficeFilePreviewImpl implements FilePreview { String suffix = fileAttribute.getSuffix(); String fileName = fileAttribute.getName(); String filePassword = fileAttribute.getFilePassword(); + boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); String userToken = fileAttribute.getUserToken(); boolean isHtml = suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx") || suffix.equalsIgnoreCase("csv") || suffix.equalsIgnoreCase("xlsm") || suffix.equalsIgnoreCase("xlt") || suffix.equalsIgnoreCase("xltm") || suffix.equalsIgnoreCase("et") || suffix.equalsIgnoreCase("ett") || suffix.equalsIgnoreCase("xlam"); String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + (isHtml ? "html" : "pdf"); String cacheFileName = userToken == null ? pdfName : userToken + "_" + pdfName; String outFilePath = FILE_DIR + cacheFileName; - if ( !fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { + if (forceUpdatedCache|| !fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { // 下载远程文件到本地，如果文件在本地已存在不会重复下载 ReturnResponse response = DownloadUtils.downLoad(fileAttribute, fileName); if (response.isFailure()) { @@ -70,7 +71,7 @@ public class OfficeFilePreviewImpl implements FilePreview { if (ConfigConstants.isCacheEnabled()) { // 全局开启缓存 isUseCached = true; - if (fileHandlerService.listConvertedFiles().containsKey(cacheFileName)) { + if (!forceUpdatedCache && fileHandlerService.listConvertedFiles().containsKey(cacheFileName)) { // 存在缓存 isCached = true; } @@ -132,7 +133,7 @@ public class OfficeFilePreviewImpl implements FilePreview { static String getPreviewType(Model model, FileAttribute fileAttribute, String officePreviewType, String baseUrl, String pdfName, String outFilePath, FileHandlerService fileHandlerService, String officePreviewTypeImage, OtherFilePreviewImpl otherFilePreview) { String suffix = fileAttribute.getSuffix(); boolean isPPT = suffix.equalsIgnoreCase("ppt") || suffix.equalsIgnoreCase("pptx"); - List imageUrls = fileHandlerService.pdf2jpg(outFilePath, pdfName, baseUrl); + List imageUrls = fileHandlerService.pdf2jpg(outFilePath, pdfName, baseUrl, fileAttribute); if (imageUrls == null || imageUrls.size() < 1) { return otherFilePreview.notSupportedFile(model, fileAttribute, "office转图片异常，请联系管理员"); } diff --git a/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java index 25f01dbd..a8e2b606 100644 --- a/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java @@ -34,11 +34,12 @@ public class PdfFilePreviewImpl implements FilePreview { String fileName = fileAttribute.getName(); String officePreviewType = fileAttribute.getOfficePreviewType(); String baseUrl = BaseUrlFilter.getBaseUrl(); + boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf"; String outFilePath = FILE_DIR + pdfName; if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_ALL_IMAGES.equals(officePreviewType)) { //当文件不存在时，就去下载 - if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { + if (forceUpdatedCache || !fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { ReturnResponse response = DownloadUtils.downLoad(fileAttribute, fileName); if (response.isFailure()) { return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg()); @@ -49,7 +50,7 @@ public class PdfFilePreviewImpl implements FilePreview { fileHandlerService.addConvertedFile(pdfName, fileHandlerService.getRelativePath(outFilePath)); } } - List imageUrls = fileHandlerService.pdf2jpg(outFilePath, pdfName, baseUrl); + List imageUrls = fileHandlerService.pdf2jpg(outFilePath, pdfName, baseUrl, fileAttribute); if (imageUrls == null || imageUrls.size() < 1) { return otherFilePreview.notSupportedFile(model, fileAttribute, "pdf转图片异常，请联系管理员"); } diff --git a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java index 328c4c7a..e4b8ece4 100644 --- a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java @@ -34,8 +34,9 @@ public class SimTextFilePreviewImpl implements FilePreview { @Override public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) { String fileName = fileAttribute.getName(); + boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); String filePath = FILE_DIR + fileName; - if (!fileHandlerService.listConvertedFiles().containsKey(fileName) || !ConfigConstants.isCacheEnabled()) { + if (forceUpdatedCache || !fileHandlerService.listConvertedFiles().containsKey(fileName) || !ConfigConstants.isCacheEnabled()) { ReturnResponse response = DownloadUtils.downLoad(fileAttribute, fileName); if (response.isFailure()) { return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg()); diff --git a/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java index 9566998d..8d9beaba 100644 --- a/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java @@ -39,6 +39,7 @@ public class TiffFilePreviewImpl implements FilePreview { String baseUrl = BaseUrlFilter.getBaseUrl(); String tifPreviewType = ConfigConstants.getTifPreviewType(); String tifOnLinePreviewType = fileAttribute.getTifPreviewType(); + boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); if (StringUtils.hasText(tifOnLinePreviewType)) { tifPreviewType = tifOnLinePreviewType; } @@ -52,7 +53,7 @@ public class TiffFilePreviewImpl implements FilePreview { String outFilePath = fileDir + pdfName; if ("pdf".equalsIgnoreCase(tifPreviewType)) { //当文件不存在时，就去下载 - if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { + if (forceUpdatedCache || !fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { ReturnResponse response = DownloadUtils.downLoad(fileAttribute, fileName); if (response.isFailure()) { return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg()); From 832420f469733d821aa5e1cc68d3d17ce1ce60c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= Date: Sun, 23 Apr 2023 04:02:27 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95&forceUpdatedCache=3Dtrue=20=E5=8F=AF=E5=90=88?= =?UTF-8?q?=E5=B9=B6=20=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=E5=8F=AF=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 高雄 --- server/src/main/java/cn/keking/service/FileHandlerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index fbd3b088..7116a96d 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -313,7 +313,7 @@ public class FileHandlerService { attribute.setUrl(url); if (req != null) { String officePreviewType = req.getParameter("officePreviewType"); - String forceUpdatedCache = req.getParameter("force_updated_cache"); + String forceUpdatedCache = req.getParameter("forceUpdatedCache"); String fileKey = WebUtils.getUrlParameterReg(url,"fileKey"); if (StringUtils.hasText(officePreviewType)) { attribute.setOfficePreviewType(officePreviewType); 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 3/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95&forceUpdatedCache=3Dtrue=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD:=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BC=93=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); } From 4f007e0c6e0830b086cd1e83cd77bb21a7a5a6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= Date: Sun, 23 Apr 2023 05:58:25 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95&forceUpdatedCache=3Dtrue=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD:=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BC=93=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: 高雄 --- .../main/java/cn/keking/service/FileHandlerService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index 1ac7b69a..ec42e3c9 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -14,7 +14,6 @@ import com.aspose.cad.Image; import com.aspose.cad.LoadOptions; import com.aspose.cad.imageoptions.CadRasterizationOptions; import com.aspose.cad.imageoptions.PdfOptions; -import jodd.util.StringUtil; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.rendering.ImageType; import org.apache.pdfbox.rendering.PDFRenderer; @@ -179,12 +178,12 @@ public class FileHandlerService { */ public List pdf2jpg(String pdfFilePath, String pdfName, String baseUrl, FileAttribute fileAttribute) { List imageUrls = new ArrayList<>(); - Integer imageCount = null; ; + Integer imageCount = this.getConvertedPdfImage(pdfFilePath); String imageFileSuffix = ".jpg"; String pdfFolder = pdfName.substring(0, pdfName.length() - 4); boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); - if (!forceUpdatedCache){ - imageCount = this.getConvertedPdfImage(pdfFilePath); + if (forceUpdatedCache){ + imageCount = null; } String urlPrefix; try { From 9aeacc6e6769af8643c96de537306a60db00ecd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= Date: Sun, 23 Apr 2023 05:59:51 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95&forceUpdatedCache=3Dtrue=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD:=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BC=93=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: 高雄 --- server/src/main/resources/web/main/record.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/main/resources/web/main/record.ftl b/server/src/main/resources/web/main/record.ftl index 5d83e933..e365e7c5 100644 --- a/server/src/main/resources/web/main/record.ftl +++ b/server/src/main/resources/web/main/record.ftl @@ -55,6 +55,7 @@
1.新增 dcm 等医疗数位影像预览
2.新增 drawio 绘图预览
+ 3.新增开启缓存的情况下重新生成的命令 &forceUpdatedCache=true
From 47860685215371e7244c58aff52bea02ecf53a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= Date: Sun, 23 Apr 2023 06:15:09 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95&forceUpdatedCache=3Dtrue=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD:=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BC=93=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: 高雄 --- .../src/main/java/cn/keking/service/FileHandlerService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index ec42e3c9..9e02b2c4 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -178,12 +178,12 @@ public class FileHandlerService { */ public List pdf2jpg(String pdfFilePath, String pdfName, String baseUrl, FileAttribute fileAttribute) { List imageUrls = new ArrayList<>(); - Integer imageCount = this.getConvertedPdfImage(pdfFilePath); + Integer imageCount = null; String imageFileSuffix = ".jpg"; String pdfFolder = pdfName.substring(0, pdfName.length() - 4); boolean forceUpdatedCache=fileAttribute.forceUpdatedCache(); - if (forceUpdatedCache){ - imageCount = null; + if (!forceUpdatedCache){ + imageCount = this.getConvertedPdfImage(pdfFilePath); } String urlPrefix; try {