Skip to content

Commit 59ac8ef

Browse files
gitchenjhklboke
gitchenjh
authored and
klboke
committed
优化：添加日志
1 parent 9cc0267 commit 59ac8ef

File tree

9 files changed

+31
-33
lines changed

9 files changed

+31
-33
lines changed

‎jodconverter-web/src/main/java/cn/keking/service/FileConverQueueTask.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,27 @@ public ConverTask(FilePreviewFactory previewFactory, CacheService cacheService,
5656
@Override
5757
public void run() {
5858
while (true) {
59+
String url = null;
5960
try {
60-
String url = cacheService.takeQueueTask();
61+
url = cacheService.takeQueueTask();
6162
if(url != null){
6263
FileAttribute fileAttribute = fileUtils.getFileAttribute(url);
63-
logger.info("正在处理转换任务，文件名称【{}】",fileAttribute.getName());
64-
FileType fileType=fileAttribute.getType();
65-
if(fileType.equals(FileType.compress) || fileType.equals(FileType.office) || fileType.equals(FileType.cad)){
66-
FilePreview filePreview=previewFactory.get(fileAttribute);
64+
FileType fileType = fileAttribute.getType();
65+
logger.info("正在处理预览转换任务，url：{}，预览类型：{}", url, fileType);
66+
if(fileType.equals(FileType.compress) || fileType.equals(FileType.office) || fileType.equals(FileType.cad)) {
67+
FilePreview filePreview = previewFactory.get(fileAttribute);
6768
filePreview.filePreviewHandle(url, new ExtendedModelMap(), fileAttribute);
69+
} else {
70+
logger.info("预览类型无需处理，url：{}，预览类型：{}", url, fileType);
6871
}
6972
}
7073
} catch (Exception e) {
7174
try {
7275
Thread.sleep(1000*10);
73-
}catch (Exception ex){
76+
} catch (Exception ex){
7477
ex.printStackTrace();
7578
}
76-
e.printStackTrace();
79+
logger.info("处理预览转换任务异常，url：{}", url, e);
7780
}
7881
}
7982
}

‎jodconverter-web/src/main/java/cn/keking/utils/CadToPdf.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public boolean cadToPdf(String inputFilePath, String outputFilePath) {
4343
cadImage.close();
4444
return true;
4545
} catch (FileNotFoundException e) {
46-
logger.error("PDFFileNotFoundException", e);
46+
logger.error("PDFFileNotFoundException，inputFilePath：{}", inputFilePath, e);
4747
return false;
4848
}
4949
}

‎jodconverter-web/src/main/java/cn/keking/utils/ConverterUtils.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ public class ConverterUtils {
3333

3434
private final Logger logger = LoggerFactory.getLogger(ConverterUtils.class);
3535

36-
// @Value("${office.home}")
37-
// String officeHome;
38-
// OpenOfficeConnection connection;
39-
OfficeManager officeManager;
36+
private OfficeManager officeManager;
4037

4138
@PostConstruct
4239
public void initOfficeManager() {

‎jodconverter-web/src/main/java/cn/keking/utils/DownloadUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public ReturnResponse<String> downLoad(FileAttribute fileAttribute, String file
8484
}
8585
return response;
8686
} catch (IOException e) {
87-
LOGGER.error("文件下载失败", e);
87+
LOGGER.error("文件下载失败，url：{}", urlAddress, e);
8888
response.setCode(1);
8989
response.setContent(null);
9090
if (e instanceof FileNotFoundException) {

‎jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class FileUtils {
3636
String fileDir = ConfigConstants.getFileDir();
3737

3838
/**
39-
* 已转换过的文件集合(redis缓存)
39+
* 已转换过的文件集合(缓存)
4040
* @return
4141
*/
4242
public Map<String, String> listConvertedFiles() {

‎jodconverter-web/src/main/java/cn/keking/utils/PdfUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@Component
1919
public class PdfUtils {
2020

21-
private final Logger LOGGER = LoggerFactory.getLogger(PdfUtils.class);
21+
private final Logger logger = LoggerFactory.getLogger(PdfUtils.class);
2222

2323
@Autowired
2424
FileUtils fileUtils;
@@ -57,7 +57,7 @@ public List<String> pdf2jpg(String pdfFilePath, String pdfName, String baseUrl)
5757
doc.close();
5858
fileUtils.addConvertedPdfImage(pdfFilePath, pageCount);
5959
} catch (IOException e) {
60-
LOGGER.error("Convert pdf to jpg exception", e);
60+
logger.error("Convert pdf to jpg exception, pdfFilePath：{}", pdfFilePath, e);
6161
}
6262
return imageUrls;
6363
}

‎jodconverter-web/src/main/java/cn/keking/utils/ShedulerClean.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@ConditionalOnExpression("'${cache.clean.enabled:false}'.equals('true')")
1818
public class ShedulerClean {
1919

20-
private static final Logger LOGGER = LoggerFactory.getLogger(ShedulerClean.class);
20+
private final Logger logger = LoggerFactory.getLogger(ShedulerClean.class);
2121

2222
@Autowired
2323
private CacheService cacheService;
@@ -27,9 +27,9 @@ public class ShedulerClean {
2727
//默认每晚3点执行一次
2828
@Scheduled(cron = "${cache.clean.cron:0 0 3 * * ?}")
2929
public void clean() {
30-
LOGGER.info("Cache clean start");
30+
logger.info("Cache clean start");
3131
cacheService.cleanCache();
3232
DeleteFileUtil.deleteDirectory(fileDir);
33-
LOGGER.info("Cache clean end");
33+
logger.info("Cache clean end");
3434
}
3535
}

‎jodconverter-web/src/main/java/cn/keking/utils/ZipReader.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,6 @@ public ZipExtractorWorker(List<Map<String, ZipArchiveEntry>> entriesToBeExtracte
427427

428428
@Override
429429
public void run() {
430-
System.out.println("解析压缩文件开始《《《《《《《《《《《《《《《《《《《《《《《");
431430
for (Map<String, ZipArchiveEntry> entryMap : entriesToBeExtracted) {
432431
String childName = entryMap.keySet().iterator().next();
433432
ZipArchiveEntry entry = entryMap.values().iterator().next();
@@ -445,7 +444,6 @@ public void run() {
445444
if (new File(filePath).exists()) {
446445
new File(filePath).delete();
447446
}
448-
System.out.println("解析压缩文件结束《《《《《《《《《《《《《《《《《《《《《《《");
449447
}
450448

451449

‎jodconverter-web/src/main/java/cn/keking/web/controller/OnlinePreviewController.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.keking.web.controller;
22

3+
import cn.keking.hutool.URLUtil;
34
import cn.keking.model.FileAttribute;
45
import cn.keking.service.FilePreview;
56
import cn.keking.service.FilePreviewFactory;
@@ -30,7 +31,7 @@
3031
@Controller
3132
public class OnlinePreviewController {
3233

33-
private static final Logger LOGGER = LoggerFactory.getLogger(OnlinePreviewController.class);
34+
private final Logger logger = LoggerFactory.getLogger(OnlinePreviewController.class);
3435

3536
@Autowired
3637
private FilePreviewFactory previewFactory;
@@ -52,22 +53,20 @@ public String onlinePreview(String url, Model model, HttpServletRequest req) {
5253
req.setAttribute("fileKey", req.getParameter("fileKey"));
5354
model.addAttribute("officePreviewType", req.getParameter("officePreviewType"));
5455
FilePreview filePreview = previewFactory.get(fileAttribute);
56+
logger.info("预览文件url：{}，previewType：{}", url, fileAttribute.getType());
5557
return filePreview.filePreviewHandle(url, model, fileAttribute);
5658
}
5759

5860

5961
@RequestMapping(value = "/picturesPreview")
60-
public String picturesPreview(Model model, HttpServletRequest req) throws UnsupportedEncodingException {
62+
public String picturesPreview(Model model, HttpServletRequest req) {
6163
String urls = req.getParameter("urls");
6264
String currentUrl = req.getParameter("currentUrl");
63-
// 路径转码
64-
String decodedUrl = URLDecoder.decode(urls, "utf-8");
65-
String decodedCurrentUrl = URLDecoder.decode(currentUrl, "utf-8");
66-
// 抽取文件并返回文件列表
67-
String[] imgs = decodedUrl.split("\\|");
65+
logger.info("预览文件url：{}，urls：{}", currentUrl, urls);
66+
String[] imgs = urls.split("\\|");
6867
List imgurls = Arrays.asList(imgs);
6968
model.addAttribute("imgurls", imgurls);
70-
model.addAttribute("currentUrl",decodedCurrentUrl);
69+
model.addAttribute("currentUrl", currentUrl);
7170
return "picture";
7271
}
7372
/**
@@ -80,9 +79,9 @@ public String picturesPreview(Model model, HttpServletRequest req) throws Unsupp
8079
@RequestMapping(value = "/getCorsFile", method = RequestMethod.GET)
8180
public void getCorsFile(String urlPath, HttpServletResponse resp) {
8281
InputStream inputStream = null;
82+
logger.info("下载跨域pdf文件url：{}", urlPath);
8383
try {
84-
String strUrl = urlPath.trim();
85-
URL url = new URL(new URI(strUrl).toASCIIString());
84+
URL url = new URL(URLUtil.normalize(urlPath, true));
8685
//打开请求连接
8786
URLConnection connection = url.openConnection();
8887
HttpURLConnection httpURLConnection = (HttpURLConnection) connection;
@@ -93,8 +92,8 @@ public void getCorsFile(String urlPath, HttpServletResponse resp) {
9392
while (-1 != (len = inputStream.read(bs))) {
9493
resp.getOutputStream().write(bs, 0, len);
9594
}
96-
} catch (IOException | URISyntaxException e) {
97-
LOGGER.error("下载pdf文件失败", e);
95+
} catch (IOException e) {
96+
logger.error("下载跨域pdf文件异常，url：{}", urlPath, e);
9897
} finally {
9998
if (inputStream != null) {
10099
IOUtils.closeQuietly(inputStream);
@@ -109,6 +108,7 @@ public void getCorsFile(String urlPath, HttpServletResponse resp) {
109108
@GetMapping("/addTask")
110109
@ResponseBody
111110
public String addQueueTask(String url) {
111+
logger.info("添加转码队列url：{}", url);
112112
cacheService.addQueueTask(url);
113113
return "success";
114114
}

0 commit comments

Comments
 (0)