fix: 修复日志输出bug
This commit is contained in:
parent
cf8e27d18f
commit
ae2f6366c4
@ -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.PrintQueueService;
|
||||||
import com.goeing.printserver.main.service.PrintService;
|
import com.goeing.printserver.main.service.PrintService;
|
||||||
import com.goeing.printserver.main.utils.PdfPrinter;
|
import com.goeing.printserver.main.utils.PdfPrinter;
|
||||||
|
import com.goeing.printserver.main.ws.PrinterClient;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@ -15,13 +16,11 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
// 使用完全限定名称避免与自定义PrintService接口冲突
|
// 使用完全限定名称避免与自定义PrintService接口冲突
|
||||||
import java.awt.print.PrinterJob;
|
import java.awt.print.PrinterJob;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@ -36,7 +35,7 @@ public class PrintController implements PrintService {
|
|||||||
private PrintServerConfig config;
|
private PrintServerConfig config;
|
||||||
|
|
||||||
@Autowired
|
@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";
|
private final String rootPath = System.getProperty("java.io.tmpdir") + File.separator + "goeingprint" + File.separator + "pdfTemp";
|
||||||
|
|
||||||
|
|||||||
@ -20,13 +20,19 @@ public class LogbackConfig {
|
|||||||
public void registerAppender() {
|
public void registerAppender() {
|
||||||
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
|
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);
|
Logger rootLogger = context.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
|
||||||
rootLogger.addAppender(memoryLogAppender);
|
rootLogger.addAppender(memoryLogAppender);
|
||||||
|
|
||||||
|
// 同时添加到 com.goeing.printserver 包级 logger(该 logger 配置了 additivity=false)
|
||||||
|
Logger appLogger = context.getLogger("com.goeing.printserver");
|
||||||
|
appLogger.addAppender(memoryLogAppender);
|
||||||
|
|
||||||
|
// 启动 appender
|
||||||
memoryLogAppender.start();
|
memoryLogAppender.start();
|
||||||
|
|
||||||
// 可选:也加到你的包 logger
|
|
||||||
// Logger appLogger = context.getLogger("com.goeing.printserver");
|
|
||||||
// appLogger.addAppender(memoryLogAppender);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2,15 +2,12 @@ package com.goeing.printserver.main.utils;
|
|||||||
|
|
||||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||||
import ch.qos.logback.core.AppenderBase;
|
import ch.qos.logback.core.AppenderBase;
|
||||||
import cn.hutool.extra.spring.SpringUtil;
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 内存日志追加器,用于缓存日志到内存中
|
* 内存日志追加器,用于缓存日志到内存中
|
||||||
|
|||||||
@ -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 cn.hutool.core.util.StrUtil;
|
||||||
import com.goeing.printserver.main.domain.bo.PrintOption;
|
import com.goeing.printserver.main.domain.bo.PrintOption;
|
||||||
import org.apache.pdfbox.pdmodel.PDDocument;
|
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.Orientation;
|
||||||
import org.apache.pdfbox.printing.PDFPrintable;
|
import org.apache.pdfbox.printing.PDFPrintable;
|
||||||
import org.apache.pdfbox.printing.Scaling;
|
import org.apache.pdfbox.printing.Scaling;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package com.goeing.printserver.main.sse;
|
package com.goeing.printserver.main.ws;
|
||||||
|
|
||||||
import cn.hutool.json.JSONUtil;
|
import cn.hutool.json.JSONUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
@ -42,8 +42,8 @@
|
|||||||
</logger>
|
</logger>
|
||||||
|
|
||||||
<!-- Spring Boot 相关日志 -->
|
<!-- Spring Boot 相关日志 -->
|
||||||
<logger name="org.springframework" level="INFO" />
|
<logger name="org.springframework" level="WARN" />
|
||||||
<logger name="org.springframework.web" level="DEBUG" />
|
<logger name="org.springframework.web" level="WARN" />
|
||||||
|
|
||||||
<!-- Hibernate 相关日志 -->
|
<!-- Hibernate 相关日志 -->
|
||||||
<logger name="org.hibernate" level="WARN" />
|
<logger name="org.hibernate" level="WARN" />
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user