diff --git a/server/src/main/java/cn/keking/model/FileAttribute.java b/server/src/main/java/cn/keking/model/FileAttribute.java index 7cb4d9f1..036bef9a 100644 --- a/server/src/main/java/cn/keking/model/FileAttribute.java +++ b/server/src/main/java/cn/keking/model/FileAttribute.java @@ -14,7 +14,7 @@ public class FileAttribute { private String url; private String fileKey; private String officePreviewType = ConfigConstants.getOfficePreviewType(); - private String previewType; + private String tifPreviewType; public FileAttribute() { } @@ -34,13 +34,13 @@ public class FileAttribute { this.officePreviewType = officePreviewType; } - public FileAttribute(FileType type, String suffix, String name, String url, String officePreviewType, String previewType) { + public FileAttribute(FileType type, String suffix, String name, String url, String officePreviewType, String tifPreviewType) { this.type = type; this.suffix = suffix; this.name = name; this.url = url; this.officePreviewType = officePreviewType; - this.previewType = previewType; + this.tifPreviewType = tifPreviewType; } public String getFileKey() { @@ -91,12 +91,12 @@ public class FileAttribute { this.url = url; } - public String getPreviewType() { - return previewType; + public String getTifPreviewType() { + return tifPreviewType; } - public void setPreviewType(String previewType) { - this.previewType = previewType; + public void setTifPreviewType(String previewType) { + this.tifPreviewType = previewType; } } diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index c9a94319..67ec1fc7 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -285,9 +285,9 @@ public class FileHandlerService { attribute.setFileKey(fileKey); } - String previewType = req.getParameter("previewType"); - if (StringUtils.hasText(previewType)) { - attribute.setPreviewType(previewType); + String tifPreviewType = req.getParameter("tifPreviewType"); + if (StringUtils.hasText(tifPreviewType)) { + attribute.setTifPreviewType(tifPreviewType); } } return attribute; 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 87adb10d..885fa50a 100644 --- a/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java @@ -40,9 +40,9 @@ public class TiffFilePreviewImpl implements FilePreview { @Override public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) { String tifPreviewType = ConfigConstants.getTifPreviewType(); - String previewType = fileAttribute.getPreviewType(); - if (StringUtils.hasText(previewType)) { - tifPreviewType = previewType; + String tifOnLinePreviewType = fileAttribute.getTifPreviewType(); + if (StringUtils.hasText(tifOnLinePreviewType)) { + tifPreviewType = tifOnLinePreviewType; } if("tif".equalsIgnoreCase(tifPreviewType)){ diff --git a/server/src/main/resources/web/pdf.ftl b/server/src/main/resources/web/pdf.ftl index 1d65159c..f2e3b724 100644 --- a/server/src/main/resources/web/pdf.ftl +++ b/server/src/main/resources/web/pdf.ftl @@ -37,7 +37,7 @@ } function goForImage() { - var url = window.location.href + "&previewType=jpg" + var url = window.location.href + "&tifPreviewType=jpg" if (url.indexOf("officePreviewType=pdf") != -1) { url = url.replace("officePreviewType=pdf", "officePreviewType=image"); } else {