lsm/file-online-preview
1
0
Fork 0
mirror of https://gitee.com/kekingcn/file-online-preview.git synced 2025-10-24 09:49:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复某些情况下txt文本乱码问题

Browse Source
This commit is contained in:
gaoxiong
2021-04-15 17:46:44 +08:00
committed by kl
parent 176f38070d
commit 0a1ff64d18
2 changed files with 4670 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4644
server/src/main/java/cn/keking/service/impl/EncodingDetects.java Normal file
View File

File diff suppressed because it is too large Load Diff

33
server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
View File

@@ -1,5 +1,6 @@
package cn.keking.service.impl; package cn.keking.service.impl;
import cn.keking.config.ConfigConstants;
import cn.keking.model.FileAttribute; import cn.keking.model.FileAttribute;
import cn.keking.model.ReturnResponse; import cn.keking.model.ReturnResponse;
import cn.keking.service.FilePreview; import cn.keking.service.FilePreview;
@@ -11,8 +12,7 @@ import org.springframework.stereotype.Service;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.util.HtmlUtils; import org.springframework.web.util.HtmlUtils;
import java.io.File; import java.io.*;
import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
/** /**
@@ -27,19 +27,19 @@ public class SimTextFilePreviewImpl implements FilePreview {
public SimTextFilePreviewImpl(OtherFilePreviewImpl otherFilePreview) { public SimTextFilePreviewImpl(OtherFilePreviewImpl otherFilePreview) {
this.otherFilePreview = otherFilePreview; this.otherFilePreview = otherFilePreview;
} }
private static final String FILE_DIR = ConfigConstants.getFileDir();
@Override @Override
public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) { public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
String fileName = fileAttribute.getName(); String fileName = fileAttribute.getName();
String baseUrll = FILE_DIR + fileName;
// String suffix = fileAttribute.getSuffix();
ReturnResponse<String> response = DownloadUtils.downLoad(fileAttribute, fileName); ReturnResponse<String> response = DownloadUtils.downLoad(fileAttribute, fileName);
if (response.isFailure()) { if (response.isFailure()) {
return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg()); return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg());
} }
try { try {
File originFile = new File(response.getContent()); String fileData = HtmlUtils.htmlEscape(textData(baseUrll));
String charset = KkFileUtils.getFileEncode(originFile);
String fileData = FileUtil.readString(originFile, charset);
fileData = HtmlUtils.htmlEscape(fileData, StandardCharsets.UTF_8.name());
model.addAttribute("textData", Base64.encodeBase64String(fileData.getBytes())); model.addAttribute("textData", Base64.encodeBase64String(fileData.getBytes()));
} catch (IOException e) { } catch (IOException e) {
return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage()); return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage());
@@ -47,4 +47,23 @@ public class SimTextFilePreviewImpl implements FilePreview {
return TXT_FILE_PREVIEW_PAGE; return TXT_FILE_PREVIEW_PAGE;
} }
private String textData(String baseUrll) throws IOException {
File file = new File(baseUrll);
if(!file.exists() || file.length() == 0) {
String line="";
return line;
}else {
String charset = EncodingDetects.getJavaEncode(baseUrll);
System.out.println(charset);
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(baseUrll), charset));
StringBuilder result = new StringBuilder();
String line;
while ((line = br.readLine()) != null) {
result.append(line).append("\r\n");
}
return result.toString();
}
}
} }