diff --git a/pom.xml b/pom.xml
index fdf282ea..6a8c566a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
${java.version}
+ ${java.version}
${java.version}
UTF-8
diff --git a/server/pom.xml b/server/pom.xml
index 1f5e46a7..8a650a60 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -54,11 +54,6 @@
org.springframework.boot
spring-boot-starter-actuator
-
- org.projectlombok
- lombok
- true
-
@@ -181,6 +176,12 @@
org.apache.pdfbox
pdfbox
${pdfbox.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.pdfbox
diff --git a/server/src/main/java/cn/keking/service/impl/JsonFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/JsonFilePreviewImpl.java
index 18e0f559..07a33fff 100644
--- a/server/src/main/java/cn/keking/service/impl/JsonFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/JsonFilePreviewImpl.java
@@ -7,9 +7,9 @@ import cn.keking.service.FileHandlerService;
import cn.keking.service.FilePreview;
import cn.keking.utils.DownloadUtils;
import cn.keking.utils.KkFileUtils;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.ui.Model;
import org.springframework.web.util.HtmlUtils;
@@ -25,14 +25,19 @@ import java.nio.file.Paths;
* @since 2025/01/11
* JSON 文件预览处理实现
*/
-@Slf4j
@Service
-@RequiredArgsConstructor
public class JsonFilePreviewImpl implements FilePreview {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JsonFilePreviewImpl.class);
+
private final FileHandlerService fileHandlerService;
private final OtherFilePreviewImpl otherFilePreview;
+ public JsonFilePreviewImpl(FileHandlerService fileHandlerService, OtherFilePreviewImpl otherFilePreview) {
+ this.fileHandlerService = fileHandlerService;
+ this.otherFilePreview = otherFilePreview;
+ }
+
@Override
public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
String fileName = fileAttribute.getName();
@@ -63,7 +68,7 @@ public class JsonFilePreviewImpl implements FilePreview {
try {
fileData = HtmlUtils.htmlEscape(readJsonFile(filePath, fileName));
} catch (IOException e) {
- log.error("读取JSON文件失败: {}", filePath, e);
+ LOGGER.error("读取JSON文件失败: {}", filePath, e);
}
String base64Data = Base64.encodeBase64String(fileData.getBytes(StandardCharsets.UTF_8));
model.addAttribute("textData", base64Data);
diff --git a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
index 64a8e9e5..1a55849d 100644
--- a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
@@ -8,28 +8,37 @@ import cn.keking.service.FilePreview;
import cn.keking.utils.DownloadUtils;
import cn.keking.utils.EncodingDetects;
import cn.keking.utils.KkFileUtils;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.ui.Model;
import org.springframework.web.util.HtmlUtils;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
/**
* Created by kl on 2018/1/17.
* Content :处理文本文件
*/
-@Slf4j
@Service
-@RequiredArgsConstructor
public class SimTextFilePreviewImpl implements FilePreview {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SimTextFilePreviewImpl.class);
+
private final FileHandlerService fileHandlerService;
private final OtherFilePreviewImpl otherFilePreview;
+ public SimTextFilePreviewImpl(FileHandlerService fileHandlerService, OtherFilePreviewImpl otherFilePreview) {
+ this.fileHandlerService = fileHandlerService;
+ this.otherFilePreview = otherFilePreview;
+ }
+
@Override
public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
String fileName = fileAttribute.getName();
@@ -56,7 +65,7 @@ public class SimTextFilePreviewImpl implements FilePreview {
try {
fileData = HtmlUtils.htmlEscape(textData(filePath,fileName));
} catch (IOException e) {
- log.error("读取文本文件失败: {}", filePath, e);
+ LOGGER.error("读取文本文件失败: {}", filePath, e);
}
model.addAttribute("textData", Base64.encodeBase64String(fileData.getBytes(StandardCharsets.UTF_8)));
return TXT_FILE_PREVIEW_PAGE;