Browse Source

修复: 文件名含有特殊字符时无法预览

dependabot/maven/server/com.thoughtworks.xstream-xstream-1.4.18
jerrykcode 3 years ago
parent
commit
2177aed64f
  1. 1
      server/src/main/java/cn/keking/service/FileHandlerService.java
  2. 21
      server/src/main/java/cn/keking/utils/WebUtils.java

1
server/src/main/java/cn/keking/service/FileHandlerService.java

@ -273,6 +273,7 @@ public class FileHandlerService {
attribute.setType(type); attribute.setType(type);
attribute.setName(fileName); attribute.setName(fileName);
attribute.setSuffix(suffix); attribute.setSuffix(suffix);
url = WebUtils.encodeUrlFileName(url);
attribute.setUrl(url); attribute.setUrl(url);
if (req != null) { if (req != null) {
String officePreviewType = req.getParameter("officePreviewType"); String officePreviewType = req.getParameter("officePreviewType");

21
server/src/main/java/cn/keking/utils/WebUtils.java

@ -2,8 +2,10 @@ package cn.keking.utils;
import io.mola.galimatias.GalimatiasParseException; import io.mola.galimatias.GalimatiasParseException;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLEncoder;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -97,4 +99,23 @@ public class WebUtils {
String fileName = nonPramStr.substring(nonPramStr.lastIndexOf("/") + 1); String fileName = nonPramStr.substring(nonPramStr.lastIndexOf("/") + 1);
return KkFileUtils.suffixFromFileName(fileName); return KkFileUtils.suffixFromFileName(fileName);
} }
/**
* 对url中的文件名进行UTF-8编码
*
* @param url url
* @return 文件名编码后的url
*/
public static String encodeUrlFileName(String url) {
String noQueryUrl = url.substring(0, url.contains("?") ? url.indexOf("?") : url.length());
int fileNameStartIndex = noQueryUrl.lastIndexOf('/') + 1;
int fileNameEndIndex = noQueryUrl.lastIndexOf('.');
String encodedFileName;
try {
encodedFileName = URLEncoder.encode(noQueryUrl.substring(fileNameStartIndex, fileNameEndIndex), "UTF-8");
} catch (UnsupportedEncodingException e) {
return null;
}
return url.substring(0, fileNameStartIndex) + encodedFileName + url.substring(fileNameEndIndex);
}
} }

Loading…
Cancel
Save