diff --git a/src/main/java/com/goeing/printserver/main/PrintController.java b/src/main/java/com/goeing/printserver/main/PrintController.java
index 6de0bf9..cebb3ba 100644
--- a/src/main/java/com/goeing/printserver/main/PrintController.java
+++ b/src/main/java/com/goeing/printserver/main/PrintController.java
@@ -8,6 +8,7 @@ import com.goeing.printserver.main.domain.request.PrintRequest;
import com.goeing.printserver.main.service.PrintQueueService;
import com.goeing.printserver.main.service.PrintService;
import com.goeing.printserver.main.utils.PdfPrinter;
+import com.goeing.printserver.main.ws.PrinterClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,13 +16,11 @@ import org.springframework.web.bind.annotation.*;
// 使用完全限定名称避免与自定义PrintService接口冲突
import java.awt.print.PrinterJob;
import java.io.File;
-import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.stream.Collectors;
@RestController
@@ -36,7 +35,7 @@ public class PrintController implements PrintService {
private PrintServerConfig config;
@Autowired
- private com.goeing.printserver.main.sse.PrinterClient printerClient;
+ private PrinterClient printerClient;
private final String rootPath = System.getProperty("java.io.tmpdir") + File.separator + "goeingprint" + File.separator + "pdfTemp";
diff --git a/src/main/java/com/goeing/printserver/main/config/LogbackConfig.java b/src/main/java/com/goeing/printserver/main/config/LogbackConfig.java
index 0eac398..bf6defc 100644
--- a/src/main/java/com/goeing/printserver/main/config/LogbackConfig.java
+++ b/src/main/java/com/goeing/printserver/main/config/LogbackConfig.java
@@ -20,13 +20,19 @@ public class LogbackConfig {
public void registerAppender() {
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-// // 添加 appender 到 root logger
+ // 将 Spring 管理的 appender 关联到 Logback 的上下文
+ memoryLogAppender.setContext(context);
+
+// / 添加 appender 到 root logger(供其它包使用)
Logger rootLogger = context.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
rootLogger.addAppender(memoryLogAppender);
+
+ // 同时添加到 com.goeing.printserver 包级 logger(该 logger 配置了 additivity=false)
+ Logger appLogger = context.getLogger("com.goeing.printserver");
+ appLogger.addAppender(memoryLogAppender);
+
+ // 启动 appender
memoryLogAppender.start();
- // 可选:也加到你的包 logger
-// Logger appLogger = context.getLogger("com.goeing.printserver");
-// appLogger.addAppender(memoryLogAppender);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/goeing/printserver/main/utils/MemoryLogAppender.java b/src/main/java/com/goeing/printserver/main/utils/MemoryLogAppender.java
index 3bc0bba..398a4a4 100644
--- a/src/main/java/com/goeing/printserver/main/utils/MemoryLogAppender.java
+++ b/src/main/java/com/goeing/printserver/main/utils/MemoryLogAppender.java
@@ -2,15 +2,12 @@ package com.goeing.printserver.main.utils;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.AppenderBase;
-import cn.hutool.extra.spring.SpringUtil;
import lombok.Getter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.ConcurrentLinkedQueue;
/**
* 内存日志追加器,用于缓存日志到内存中
diff --git a/src/main/java/com/goeing/printserver/main/utils/PdfPrinter.java b/src/main/java/com/goeing/printserver/main/utils/PdfPrinter.java
index 96190c7..a12e2ec 100644
--- a/src/main/java/com/goeing/printserver/main/utils/PdfPrinter.java
+++ b/src/main/java/com/goeing/printserver/main/utils/PdfPrinter.java
@@ -1,10 +1,8 @@
-package com.goeing.printserver.main.utils;// src/main/java/com/example/printer/PdfPrinter.java
+package com.goeing.printserver.main.utils;
import cn.hutool.core.util.StrUtil;
import com.goeing.printserver.main.domain.bo.PrintOption;
import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.printing.PDFPageable;
import org.apache.pdfbox.printing.Orientation;
import org.apache.pdfbox.printing.PDFPrintable;
import org.apache.pdfbox.printing.Scaling;
diff --git a/src/main/java/com/goeing/printserver/main/sse/PrinterClient.java b/src/main/java/com/goeing/printserver/main/ws/PrinterClient.java
similarity index 99%
rename from src/main/java/com/goeing/printserver/main/sse/PrinterClient.java
rename to src/main/java/com/goeing/printserver/main/ws/PrinterClient.java
index 0e399a1..9795734 100644
--- a/src/main/java/com/goeing/printserver/main/sse/PrinterClient.java
+++ b/src/main/java/com/goeing/printserver/main/ws/PrinterClient.java
@@ -1,4 +1,4 @@
-package com.goeing.printserver.main.sse;
+package com.goeing.printserver.main.ws;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 691a872..2effd6a 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -42,8 +42,8 @@
-
-
+
+