From 92ca92bee6d4682f2eb6f388174d39afd2263874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Wed, 3 Dec 2025 18:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81Java25=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  1 +
 server/pom.xml                                | 11 +++++-----
 .../service/impl/JsonFilePreviewImpl.java     | 15 ++++++++-----
 .../service/impl/SimTextFilePreviewImpl.java  | 21 +++++++++++++------
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index fdf282ea..6a8c566a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
 
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
         <!-- web end -->
 
         <!-- poi start -->
@@ -181,6 +176,12 @@
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
             <version>${pdfbox.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
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;