gitee
/
file-online-preview
mirror of https://gitee.com/kekingcn/file-online-preview
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

1.office预览图片模式禁用图片放大效果，达到图片和pdf预览效果一致的体验

encoding
chenkailing 2020-12-26 00:56:48 +08:00 committed by kl
parent c1802b2487
commit 9b0f381c06
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jodconverter-web/src/main/java/cn/keking/config/ConfigConstants.java
View File

@ -158,7 +158,7 @@ public class ConfigConstants {
} }
public static void setFileDirValue(String fileDir) { public static void setFileDirValue(String fileDir) {
if (!DEFAULT_FILE_DIR_VALUE.equals(fileDir.toLowerCase())) { if (!DEFAULT_FILE_DIR_VALUE.equalsIgnoreCase(fileDir)) {
if (!fileDir.endsWith(File.separator)) { if (!fileDir.endsWith(File.separator)) {
fileDir = fileDir + File.separator; fileDir = fileDir + File.separator;
} }
@ -173,7 +173,7 @@ public class ConfigConstants {
public static void setTrustHostValue(String trustHost) { public static void setTrustHostValue(String trustHost) {
CopyOnWriteArraySet<String> trustHostSet; CopyOnWriteArraySet<String> trustHostSet;
if (DEFAULT_TRUST_HOST.equals(trustHost.toLowerCase())) { if (DEFAULT_TRUST_HOST.equalsIgnoreCase(trustHost)) {
trustHostSet = new CopyOnWriteArraySet<>(); trustHostSet = new CopyOnWriteArraySet<>();
} else { } else {
String[] trustHostArray = trustHost.toLowerCase().split(","); String[] trustHostArray = trustHost.toLowerCase().split(",");
@ -207,9 +207,11 @@ public class ConfigConstants {
public static String getOfficePreviewSwitchDisabled() { public static String getOfficePreviewSwitchDisabled() {
return OFFICE_PREVIEW_SWITCH_DISABLED; return OFFICE_PREVIEW_SWITCH_DISABLED;
} }
@Value("${office.preview.switch.disabled:true}") @Value("${office.preview.switch.disabled:true}")
public static void setOfficePreviewSwitchDisabled(String officePreviewSwitchDisabled) { public void setOfficePreviewSwitchDisabled(String officePreviewSwitchDisabled) {
OFFICE_PREVIEW_SWITCH_DISABLED = officePreviewSwitchDisabled;
}
public static void setOfficePreviewSwitchDisabledValue(String officePreviewSwitchDisabled) {
OFFICE_PREVIEW_SWITCH_DISABLED = officePreviewSwitchDisabled; OFFICE_PREVIEW_SWITCH_DISABLED = officePreviewSwitchDisabled;
} }
} }

2
jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java
View File

@ -73,7 +73,7 @@ public class ConfigRefreshComponent {
ConfigConstants.setFtpControlEncodingValue(ftpControlEncoding); ConfigConstants.setFtpControlEncodingValue(ftpControlEncoding);
ConfigConstants.setBaseUrlValue(baseUrl); ConfigConstants.setBaseUrlValue(baseUrl);
ConfigConstants.setTrustHostValue(trustHost); ConfigConstants.setTrustHostValue(trustHost);
ConfigConstants.setOfficePreviewSwitchDisabled(officePreviewSwitchDisabled); ConfigConstants.setOfficePreviewSwitchDisabledValue(officePreviewSwitchDisabled);
ConfigConstants.setPdfDownloadDisableValue(pdfDownloadDisable); ConfigConstants.setPdfDownloadDisableValue(pdfDownloadDisable);
setWatermarkConfig(properties); setWatermarkConfig(properties);
bufferedReader.close(); bufferedReader.close();

10
jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
View File

@ -23,17 +23,11 @@ import java.util.List;
public class OfficeFilePreviewImpl implements FilePreview { public class OfficeFilePreviewImpl implements FilePreview {
private final FileUtils fileUtils; private final FileUtils fileUtils;
private final PdfUtils pdfUtils; private final PdfUtils pdfUtils;
private final DownloadUtils downloadUtils; private final DownloadUtils downloadUtils;
private final OfficeToPdf officeToPdf; private final OfficeToPdf officeToPdf;
public OfficeFilePreviewImpl(FileUtils fileUtils, public OfficeFilePreviewImpl(FileUtils fileUtils, PdfUtils pdfUtils, DownloadUtils downloadUtils, OfficeToPdf officeToPdf) {
PdfUtils pdfUtils,
DownloadUtils downloadUtils,
OfficeToPdf officeToPdf) {
this.fileUtils = fileUtils; this.fileUtils = fileUtils;
this.pdfUtils = pdfUtils; this.pdfUtils = pdfUtils;
this.downloadUtils = downloadUtils; this.downloadUtils = downloadUtils;
@ -47,7 +41,7 @@ public class OfficeFilePreviewImpl implements FilePreview {
@Override @Override
public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) { public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
// 预览Type，参数传了就取参数的，没传取系统默认 // 预览Type，参数传了就取参数的，没传取系统默认
String officePreviewType = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString(); String officePreviewType = fileAttribute.getOfficePreviewType();
String baseUrl = BaseUrlFilter.getBaseUrl(); String baseUrl = BaseUrlFilter.getBaseUrl();
String suffix=fileAttribute.getSuffix(); String suffix=fileAttribute.getSuffix();
String fileName=fileAttribute.getName(); String fileName=fileAttribute.getName();

28
jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
View File

@ -104,7 +104,7 @@ public class FileUtils {
/** /**
* 从url中剥离出文件名 * 从url中剥离出文件名
* *
* @param url 格式如：http://keking.ufile.ucloud.com.cn/20171113164107_月度绩效表模板(新).xls?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=I D1NOFtAJSPT16E6imv6JWuq0k= * @param url 格式如：http://www.com.cn/20171113164107_月度绩效表模板(新).xls?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=I D1NOFtAJSPT16E6imv6JWuq0k=
* @return 文件名 * @return 文件名
*/ */
public String getFileNameFromURL(String url) { public String getFileNameFromURL(String url) {
@ -340,25 +340,27 @@ public class FileUtils {
public FileAttribute getFileAttribute(String url, HttpServletRequest req) { public FileAttribute getFileAttribute(String url, HttpServletRequest req) {
FileAttribute attribute = new FileAttribute(); FileAttribute attribute = new FileAttribute();
String suffix; String suffix;
String fullFileName = getUrlParameterReg(url, "fullfilename"); FileType type;
String fileName;
String fullFileName = this.getUrlParameterReg(url, "fullfilename");
if (StringUtils.hasText(fullFileName)) { if (StringUtils.hasText(fullFileName)) {
attribute.setName(fullFileName); fileName = fullFileName;
FileType type = typeFromFileName(fullFileName); type = typeFromFileName(fullFileName);
attribute.setType(type);
suffix = suffixFromFileName(fullFileName); suffix = suffixFromFileName(fullFileName);
} else { } else {
fileName = getFileNameFromURL(url);
String fileName = getFileNameFromURL(url); type = typeFromUrl(url);
FileType type = typeFromUrl(url);
attribute.setName(fileName);
attribute.setType(type);
suffix = suffixFromUrl(url); suffix = suffixFromUrl(url);
} }
attribute.setType(type);
attribute.setName(fileName);
attribute.setSuffix(suffix); attribute.setSuffix(suffix);
attribute.setUrl(url);
if (req != null) { if (req != null) {
String officePreviewType = req.getParameter("officePreviewType"); String officePreviewType = req.getParameter("officePreviewType");
if(StringUtils.hasText(officePreviewType)){
attribute.setOfficePreviewType(officePreviewType); attribute.setOfficePreviewType(officePreviewType);
}
} }
return attribute; return attribute;
} }

2
jodconverter-web/src/main/resources/web/officePicture.ftl
View File

@ -30,7 +30,7 @@
<div class="container"> <div class="container">
<#list imgurls as img> <#list imgurls as img>
<div class="img-area"> <div class="img-area">
<img class="my-photo" alt="loading" title="查看大图" style="cursor: pointer;" data-src="${img}" src="images/loading.gif" onclick="changePreviewType('allImages')"> <img class="my-photo" alt="loading" data-src="${img}" src="images/loading.gif">
</div> </div>
</#list> </#list>
</div> </div>