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

---
 dsGw/pom.xml                                  | 34 ++++++++++++++++---
 .../java/com/dsideal/gw/GwApplication.java    |  6 +++-
 dsGw/src/main/resources/log4j.properties      | 12 +++++++
 dsGw/src/main/resources/logback.xml           |  8 ++---
 pom.xml                                       |  1 +
 5 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 dsGw/src/main/resources/log4j.properties

diff --git a/dsGw/pom.xml b/dsGw/pom.xml
index 7f089f57..0cd96202 100644
--- a/dsGw/pom.xml
+++ b/dsGw/pom.xml
@@ -21,6 +21,16 @@
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal-undertow</artifactId>
             <version>${jfinal-undertow.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.jfinal</groupId>
@@ -42,13 +52,27 @@
             <version>${hutool.version}</version>
         </dependency>
 
-        <!-- 日志框架 -->
+        <!-- 日志相关 -->
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.5.6</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <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>
-
         <!-- Apache Commons工具集 -->
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/dsGw/src/main/java/com/dsideal/gw/GwApplication.java b/dsGw/src/main/java/com/dsideal/gw/GwApplication.java
index a306b4d3..119d32ff 100644
--- a/dsGw/src/main/java/com/dsideal/gw/GwApplication.java
+++ b/dsGw/src/main/java/com/dsideal/gw/GwApplication.java
@@ -11,12 +11,16 @@ import com.jfinal.plugin.redis.RedisPlugin;
 import com.jfinal.server.undertow.UndertowServer;
 import com.jfinal.template.Engine;
 import lombok.SneakyThrows;
+import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 
 import java.util.*;
-
+import org.slf4j.Logger;
 public class GwApplication extends JFinalConfig {
 
+    private static final Logger logger = LoggerFactory.getLogger(GwApplication.class);
+
+
     /**
      * 功能：获取是否为开发环境
      *
diff --git a/dsGw/src/main/resources/log4j.properties b/dsGw/src/main/resources/log4j.properties
new file mode 100644
index 00000000..625cca1e
--- /dev/null
+++ b/dsGw/src/main/resources/log4j.properties
@@ -0,0 +1,12 @@
+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 9f487643..2c24fb65 100644
--- a/dsGw/src/main/resources/logback.xml
+++ b/dsGw/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="/tmp"/>
+    <property name="LOG_HOME" value="/usr/local/tomcat8/logs"/>
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -13,10 +13,10 @@
     </appender>
     <!-- 按照每天生成日志文件 -->
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/QingLong.log</file>
+        <file>${LOG_HOME}/dsBase.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/dsGw.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
         </rollingPolicy>
@@ -30,7 +30,7 @@
         </triggeringPolicy>
     </appender>
 
-    <root level="WARN">
+    <root level="DEBUG">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
     </root>
diff --git a/pom.xml b/pom.xml
index c172a4e4..e53d4742 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
         <!-- 日志框架 -->
         <slf4j.version>1.7.36</slf4j.version>
         <log4j2.version>2.20.0</log4j2.version>
+        <logback.version>1.5.18</logback.version>
 
         <!-- Jackson JSON处理 -->
         <jackson.version>2.15.3</jackson.version>