From 7448455ac0568cbc5aca6b633f6eb4d82efac668 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 07 十一月 2023 09:17:10 +0800
Subject: [PATCH] 优化系统登录的信息
---
src/main/java/com/ots/project/tool/ShellTool.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/ShellTool.java b/src/main/java/com/ots/project/tool/ShellTool.java
index 2b4c2c8..07dff39 100644
--- a/src/main/java/com/ots/project/tool/ShellTool.java
+++ b/src/main/java/com/ots/project/tool/ShellTool.java
@@ -1,6 +1,7 @@
package com.ots.project.tool;
import com.ots.common.utils.spring.SpringUtils;
import com.ots.common.utils.text.CharsetKit;
+import com.ots.project.tool.libreoffice.Office2PDFUtils;
import lombok.extern.slf4j.Slf4j;
import org.jodconverter.core.DocumentConverter;
import org.jodconverter.core.office.OfficeException;
@@ -15,14 +16,19 @@
@Component
public class ShellTool {
+// @Autowired
+// private DocumentConverter documentConverter;
+
@Autowired
- private DocumentConverter documentConverter;
+ private Office2PDFUtils office2PDFUtils;
+
private static ShellTool shellTool;
@PostConstruct
public void init(){
shellTool = this;
- shellTool.documentConverter = documentConverter;
+ //shellTool.documentConverter = documentConverter;
+ shellTool.office2PDFUtils = office2PDFUtils;
}
public static ShellTool builder(){
@@ -58,7 +64,8 @@
public static void execNewLibreofficeCommand(String type, String sourcePath, String targetPath) throws OfficeException {
//浣跨敤鏂囦欢鏂瑰紡杞崲鎴怭DF
- shellTool.documentConverter.convert(new File(sourcePath)).to(new File(targetPath)).execute();
+ //shellTool.documentConverter.convert(new File(sourcePath)).to(new File(targetPath)).execute();
+ shellTool.office2PDFUtils.office2Pdf(sourcePath,targetPath);
}
private static String exec(String command) {
--
Gitblit v1.9.1