修复:修复预览ftp时,图片图片、pdf预览异常

This commit is contained in:
陈精华
2020-05-14 16:22:48 +08:00
committed by kl
parent 59ac8effc1
commit 5196536bb4
3 changed files with 43 additions and 5 deletions

View File

@ -39,7 +39,6 @@ public class PdfFilePreviewImpl implements FilePreview{
String fileName=fileAttribute.getName();
String officePreviewType = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString();
String baseUrl = BaseUrlFilter.getBaseUrl();
model.addAttribute("pdfUrl", url);
String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
String outFilePath = fileDir + pdfName;
if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_ALLIMAGES.equals(officePreviewType)) {
@ -64,6 +63,20 @@ public class PdfFilePreviewImpl implements FilePreview{
} else {
return "picture";
}
} else {
// 不是http开头浏览器不能直接访问需下载到本地
if (url != null && !url.toLowerCase().startsWith("http")) {
ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, pdfName);
if (0 != response.getCode()) {
model.addAttribute("fileType", suffix);
model.addAttribute("msg", response.getMsg());
return "fileNotSupported";
} else {
model.addAttribute("pdfUrl", fileUtils.getRelativePath(response.getContent()));
}
} else {
model.addAttribute("pdfUrl", url);
}
}
return "pdf";
}