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

引入cpdetector解决文件编码识别问题

Browse Source
This commit is contained in:
chenkailing
2020-12-26 19:13:50 +08:00
committed by kl
parent f2d929e6fa
commit 342c391a9b
23 changed files with 240 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/main/java/cn/keking/service/FileConvertQueueTask.java
View File

@@ -21,18 +21,18 @@ public class FileConvertQueueTask {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final FilePreviewFactory previewFactory;
private final CacheService cacheService;
private final FilePreviewCommonService filePreviewCommonService;
private final FileHandlerService fileHandlerService;
public FileConvertQueueTask(FilePreviewFactory previewFactory, CacheService cacheService, FilePreviewCommonService filePreviewCommonService) {
public FileConvertQueueTask(FilePreviewFactory previewFactory, CacheService cacheService, FileHandlerService fileHandlerService) {
this.previewFactory = previewFactory;
this.cacheService = cacheService;
this.filePreviewCommonService = filePreviewCommonService;
this.fileHandlerService = fileHandlerService;
}
@PostConstruct
public void startTask(){
ExecutorService executorService = Executors.newFixedThreadPool(1);
executorService.submit(new ConvertTask(previewFactory, cacheService, filePreviewCommonService));
executorService.submit(new ConvertTask(previewFactory, cacheService, fileHandlerService));
logger.info("队列处理文件转换任务启动完成 ");
}
@@ -41,14 +41,14 @@ public class FileConvertQueueTask {
private final Logger logger = LoggerFactory.getLogger(ConvertTask.class);
private final FilePreviewFactory previewFactory;
private final CacheService cacheService;
private final FilePreviewCommonService filePreviewCommonService;
private final FileHandlerService fileHandlerService;
public ConvertTask(FilePreviewFactory previewFactory,
CacheService cacheService,
FilePreviewCommonService filePreviewCommonService) {
FileHandlerService fileHandlerService) {
this.previewFactory = previewFactory;
this.cacheService = cacheService;
this.filePreviewCommonService = filePreviewCommonService;
this.fileHandlerService = fileHandlerService;
}
@Override
@@ -58,7 +58,7 @@ public class FileConvertQueueTask {
try {
url = cacheService.takeQueueTask();
if(url != null){
FileAttribute fileAttribute = filePreviewCommonService.getFileAttribute(url,null);
FileAttribute fileAttribute = fileHandlerService.getFileAttribute(url,null);
FileType fileType = fileAttribute.getType();
logger.info("正在处理预览转换任务，url：{}，预览类型：{}", url, fileType);
if(fileType.equals(FileType.compress) || fileType.equals(FileType.office) || fileType.equals(FileType.cad)) {