From 835cb1a3d173ce08832b57b2228d50874d45e162 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 29 Apr 2025 14:27:01 +0800
Subject: [PATCH] 'commit'

---
 dsBase/pom.xml                                | 25 ++++++++--
 .../com/dsideal/dsBase/BaseApplication.java   |  2 -
 dsBase/src/main/resources/log4j2.xml          | 47 -------------------
 dsBase/src/main/resources/logback.xml         | 36 ++++++++++++++
 dsRes/pom.xml                                 | 22 ++++-----
 pom.xml                                       |  1 +
 6 files changed, 69 insertions(+), 64 deletions(-)
 delete mode 100644 dsBase/src/main/resources/log4j2.xml
 create mode 100644 dsBase/src/main/resources/logback.xml

diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index b8b41be6..9d1bdaad 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -118,6 +118,7 @@
             <version>${thumbnailator.version}</version>
         </dependency>
 
+        <!-- 日志相关 -->
         <!-- 日志相关 -->
         <!-- SLF4J API -->
         <dependency>
@@ -126,12 +127,23 @@
             <version>${slf4j.version}</version>
         </dependency>
 
-        <!-- Log4j2 实现 -->
+        <!-- Logback实现 -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j2-impl</artifactId>
-            <version>${log4j2.version}</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-access</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <!-- 添加Log4j2的依赖管理 -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
@@ -142,6 +154,11 @@
             <artifactId>log4j-api</artifactId>
             <version>${log4j2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <version>${log4j2.version}</version>
+        </dependency>
 
         <!-- JSON处理 -->
         <dependency>
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
index d3fd22fa..0ec76c56 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
@@ -58,11 +58,9 @@ public class BaseApplication extends JFinalConfig {
     }
 
     public static void main(String[] args) {
-        logger.info("Starting application...");
         System.out.println("当前环境: " + getEnvPrefix());
         String configFile = "undertow.properties";
         UndertowServer.create(BaseApplication.class, configFile).start();
-        logger.info("Application started successfully!");
     }
 
     /**
diff --git a/dsBase/src/main/resources/log4j2.xml b/dsBase/src/main/resources/log4j2.xml
deleted file mode 100644
index b5cb0914..00000000
--- a/dsBase/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Properties>
-        <Property name="LOG_PATTERN">%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Property>
-        <Property name="LOG_FILE_PATH">logs</Property>
-        <Property name="LOG_FILE_NAME">application</Property>
-    </Properties>
-
-    <Appenders>
-        <!-- 控制台输出 -->
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="${LOG_PATTERN}"/>
-        </Console>
-
-        <!-- 文件输出 -->
-        <RollingFile name="FileAppender"
-                     fileName="${LOG_FILE_PATH}/${LOG_FILE_NAME}.log"
-                     filePattern="${LOG_FILE_PATH}/${LOG_FILE_NAME}-%d{yyyy-MM-dd}-%i.log">
-            <PatternLayout pattern="${LOG_PATTERN}"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1"/>
-                <SizeBasedTriggeringPolicy size="10MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="10"/>
-        </RollingFile>
-    </Appenders>
-
-    <Loggers>
-        <!-- 自定义包的日志级别 -->
-        <Logger name="com.dsideal" level="debug" additivity="false">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="FileAppender"/>
-        </Logger>
-
-        <!-- JFinal相关日志 -->
-        <Logger name="com.jfinal" level="info" additivity="false">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="FileAppender"/>
-        </Logger>
-
-        <!-- 根日志级别 -->
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="FileAppender"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/dsBase/src/main/resources/logback.xml b/dsBase/src/main/resources/logback.xml
new file mode 100644
index 00000000..62595c75
--- /dev/null
+++ b/dsBase/src/main/resources/logback.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 定义日志文件的存储地址 -->
+    <property name="LOG_HOME" value="logs" />
+
+    <!-- 控制台输出 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_HOME}/application.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/application.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 日志级别 -->
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="FILE" />
+    </root>
+
+    <!-- 自定义包的日志级别 -->
+    <logger name="com.dsideal" level="DEBUG"/>
+    <logger name="com.jfinal" level="INFO"/>
+</configuration>
\ No newline at end of file
diff --git a/dsRes/pom.xml b/dsRes/pom.xml
index 62d0aef0..5c612905 100644
--- a/dsRes/pom.xml
+++ b/dsRes/pom.xml
@@ -87,6 +87,7 @@
             <version>2.3.0</version>
         </dependency>
 
+        <!-- 日志相关 -->
         <!-- 日志相关 -->
         <!-- SLF4J API -->
         <dependency>
@@ -95,24 +96,23 @@
             <version>${slf4j.version}</version>
         </dependency>
 
-        <!-- Log4j2 实现 -->
+        <!-- Logback实现 -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j2-impl</artifactId>
-            <version>${log4j2.version}</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>${log4j2.version}</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-access</artifactId>
+            <version>${logback.version}</version>
         </dependency>
 
-
         <!-- JSON处理 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index fb943781..c8bdf141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
 
         <!-- 日志框架 -->
         <slf4j.version>1.7.36</slf4j.version>
+        <logback.version>1.2.11</logback.version>
         <log4j2.version>2.20.0</log4j2.version>
 
         <!-- JSON处理 -->