From e23911b1caf8fded42fbbe3420fa7dfcbe986728 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 29 Apr 2025 14:19:51 +0800
Subject: [PATCH] 'commit'
---
dsBase/pom.xml | 19 +++-
.../com/dsideal/dsBase/BaseApplication.java | 5 +
dsBase/src/main/resources/log4j.properties | 12 --
dsBase/src/main/resources/log4j2.xml | 47 ++++++++
dsBase/src/main/resources/logback.xml | 39 -------
dsGw/pom.xml | 11 +-
dsRes/pom.xml | 12 +-
pom.xml | 107 +++++++-----------
8 files changed, 117 insertions(+), 135 deletions(-)
delete mode 100644 dsBase/src/main/resources/log4j.properties
create mode 100644 dsBase/src/main/resources/log4j2.xml
delete mode 100644 dsBase/src/main/resources/logback.xml
diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index f996dd27..b8b41be6 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -37,6 +37,16 @@
com.jfinal
jfinal-undertow
${jfinal-undertow.version}
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.slf4j
+ slf4j-simple
+
+
com.jfinal
@@ -109,15 +119,18 @@
+
org.slf4j
slf4j-api
${slf4j.version}
+
+
- org.slf4j
- slf4j-simple
- ${slf4j.version}
+ org.apache.logging.log4j
+ log4j-slf4j2-impl
+ ${log4j2.version}
org.apache.logging.log4j
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
index afb55a14..d3fd22fa 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
@@ -28,11 +28,14 @@ import com.jfinal.plugin.redis.RedisPlugin;
import com.jfinal.server.undertow.UndertowServer;
import com.jfinal.template.Engine;
import lombok.SneakyThrows;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.Objects;
public class BaseApplication extends JFinalConfig {
+ private static final Logger logger = LoggerFactory.getLogger(BaseApplication.class);
/**
* 功能：获取是否为开发环境
*
@@ -55,9 +58,11 @@ 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/log4j.properties b/dsBase/src/main/resources/log4j.properties
deleted file mode 100644
index 625cca1e..00000000
--- a/dsBase/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/dsBase/src/main/resources/log4j2.xml b/dsBase/src/main/resources/log4j2.xml
new file mode 100644
index 00000000..b5cb0914
--- /dev/null
+++ b/dsBase/src/main/resources/log4j2.xml
@@ -0,0 +1,47 @@
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+ logs
+ application
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dsBase/src/main/resources/logback.xml b/dsBase/src/main/resources/logback.xml
deleted file mode 100644
index 2c24fb65..00000000
--- a/dsBase/src/main/resources/logback.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
- %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40})
- - %msg%n
-
-
-
-
-
- ${LOG_HOME}/dsBase.log
-
-
- ${LOG_HOME}/dsBase.log.%d{yyyy-MM-dd}.log
-
- 30
-
-
-
- %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n
-
-
-
- 100MB
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dsGw/pom.xml b/dsGw/pom.xml
index 0cd96202..dd1f22b8 100644
--- a/dsGw/pom.xml
+++ b/dsGw/pom.xml
@@ -63,16 +63,7 @@
slf4j-simple
${slf4j.version}
-
- org.apache.logging.log4j
- log4j-core
- ${log4j2.version}
-
-
- org.apache.logging.log4j
- log4j-api
- ${log4j2.version}
-
+
commons-io
diff --git a/dsRes/pom.xml b/dsRes/pom.xml
index 1a5753be..62d0aef0 100644
--- a/dsRes/pom.xml
+++ b/dsRes/pom.xml
@@ -88,15 +88,18 @@
+
org.slf4j
- slf4j-simple
+ slf4j-api
${slf4j.version}
+
+
- ch.qos.logback
- logback-classic
- 1.5.6
+ org.apache.logging.log4j
+ log4j-slf4j2-impl
+ ${log4j2.version}
org.apache.logging.log4j
@@ -109,6 +112,7 @@
${log4j2.version}
+
com.fasterxml.jackson.core
diff --git a/pom.xml b/pom.xml
index e53d4742..fb943781 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,99 +28,72 @@
-
-
+
UTF-8
UTF-8
21
21
-
+
+ 3.10.1
+ 3.7.1
+ 3.2.2
+
+
5.2.4
3.7
2022.2
-
+
6.3.0
+ 42.7.5
+ 1.0.5
-
- 0.7.0
-
-
- 2.2.5
+
+ 5.1.5
-
- 0.4.19
+
+ 8.5.17
-
- 1.4.4
+
+ 1.7.36
+ 2.20.0
-
+
2.0.57
+ 2.10.1
+ 2.15.3
+ 2.4
-
- 5.8.37
-
-
- 8.5.17
-
-
- 5.1.5
-
-
- 42.7.5
+
+ 2.1.4
+ 2.3.3
+ 1.1.1
-
+
5.2.5
+ 1.1.0
-
- 2.3
-
-
- 1.17.2
+
+ 4.5.14
+ 0.2.19
-
- 2.10.1
+
+ 0.7.0
-
+
+ 5.8.37
2.14.0
1.5
3.12.0
+ 0.4.19
+ 1.17.2
+ 2.3
+ 2.2.5
-
- 2.1.4
-
-
- 1.7.36
- 2.20.0
- 1.5.18
-
-
- 2.15.3
-
-
- 1.1.0
-
-
+
1.18.38
-
- 2.3.1
- 2.3.3
- 1.1.1
-
- 4.5.14
-
- 0.2.19
-
- 2.4
-
- 2.18.0
-
- 1.0.5
-
- 3.10.1
- 3.7.1
- 3.2.2
+ 1.4.4
\ No newline at end of file