From 741341001211091a4454a46c74392ee5740e0d16 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 29 Apr 2025 14:30:13 +0800
Subject: [PATCH] 'commit'

---
 dsBase/pom.xml                           |  1 -
 dsGw/pom.xml                             | 35 ++++++++++++++++--
 dsGw/src/main/resources/log4j.properties | 12 ------
 dsGw/src/main/resources/logback.xml      | 47 +++++++++++-------------
 4 files changed, 54 insertions(+), 41 deletions(-)
 delete mode 100644 dsGw/src/main/resources/log4j.properties

diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 9d1bdaad..daad059e 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -118,7 +118,6 @@
             <version>${thumbnailator.version}</version>
         </dependency>
 
-        <!-- 日志相关 -->
         <!-- 日志相关 -->
         <!-- SLF4J API -->
         <dependency>
diff --git a/dsGw/pom.xml b/dsGw/pom.xml
index dd1f22b8..e90bd811 100644
--- a/dsGw/pom.xml
+++ b/dsGw/pom.xml
@@ -53,15 +53,44 @@
         </dependency>
 
         <!-- 日志相关 -->
+        <!-- SLF4J API -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
+
+        <!-- Logback实现 -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j.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>
+            <version>${log4j2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <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>
 
         <!-- Apache Commons工具集 -->
diff --git a/dsGw/src/main/resources/log4j.properties b/dsGw/src/main/resources/log4j.properties
deleted file mode 100644
index 625cca1e..00000000
--- a/dsGw/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-log4j.rootLogger=WARN, console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.conversionPattern=%5p [%t] (%F:%L) - %m%n
-
-log4j.appender.mq=org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender
-log4j.appender.mq.Topic=TOPIC_MEIWEI_SMS_NOTICE_TEST
-log4j.appender.mq.Tag=PID_MEIWEI_SMS_RETRY_TIMEOUT
-log4j.appender.mq.ProducerGroup=meiwei-producer-retry
-log4j.appender.mq.NameServerAddress=127.0.0.1:9876;127.0.0.1:9877
-log4j.appender.mq.layout=org.apache.log4j.PatternLayout
-log4j.appender.mq.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-4r [%t] (%F:%L) %
\ No newline at end of file
diff --git a/dsGw/src/main/resources/logback.xml b/dsGw/src/main/resources/logback.xml
index 2c24fb65..62595c75 100644
--- a/dsGw/src/main/resources/logback.xml
+++ b/dsGw/src/main/resources/logback.xml
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false">
-    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="/usr/local/tomcat8/logs"/>
+<configuration>
+    <!-- 定义日志文件的存储地址 -->
+    <property name="LOG_HOME" value="logs" />
+
     <!-- 控制台输出 -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40})
-                - %msg%n
-            </pattern>
+    <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}/dsBase.log</file>
+        <file>${LOG_HOME}/application.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <MaxHistory>30</MaxHistory>
+            <fileNamePattern>${LOG_HOME}/application.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>30</maxHistory>
         </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n</pattern>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
         </encoder>
-        <!--日志文件最大的大小-->
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
     </appender>
 
-    <root level="DEBUG">
-        <appender-ref ref="STDOUT" />
+    <!-- 日志级别 -->
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
         <appender-ref ref="FILE" />
     </root>
-    <logger level="debug" additivity="false">
-    </logger>
+
+    <!-- 自定义包的日志级别 -->
+    <logger name="com.dsideal" level="DEBUG"/>
+    <logger name="com.jfinal" level="INFO"/>
 </configuration>
\ No newline at end of file