From 2b97778ecc5b105c64d98aac15e34d2bf6d15940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com>
Date: Sat, 10 Sep 2022 22:53:36 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20mica-mqtt-example=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20tinylog=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/mica-mqtt-example/pom.xml             | 49 ++++++++++---------
 .../src/main/resources/log4j2.properties      |  9 ----
 .../src/main/resources/tinylog.properties     |  8 +++
 pom.xml                                       | 18 +++++++
 4 files changed, 53 insertions(+), 31 deletions(-)
 delete mode 100644 example/mica-mqtt-example/src/main/resources/log4j2.properties
 create mode 100644 example/mica-mqtt-example/src/main/resources/tinylog.properties

diff --git a/example/mica-mqtt-example/pom.xml b/example/mica-mqtt-example/pom.xml
index 6b4b6635..1483fef2 100644
--- a/example/mica-mqtt-example/pom.xml
+++ b/example/mica-mqtt-example/pom.xml
@@ -14,7 +14,6 @@
     </parent>
 
     <properties>
-        <log4j2.version>2.17.2</log4j2.version>
         <graalvm.version>22.0.0.2</graalvm.version>
         <mainClass.server>net.dreamlu.iot.mqtt.server.MqttServerTest</mainClass.server>
         <mainClass.client>net.dreamlu.iot.mqtt.client.MqttClientTest</mainClass.client>
@@ -37,6 +36,10 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
     <profiles>
         <profile>
             <id>jar</id>
@@ -50,45 +53,47 @@
                     <artifactId>caffeine</artifactId>
                     <version>2.9.2</version>
                 </dependency>
-                <!-- 非 GraalVM 环境用 log4j2 -->
+                <!-- 非 GraalVM 环境用 tinylog -->
+                <dependency>
+                    <groupId>org.tinylog</groupId>
+                    <artifactId>slf4j-tinylog</artifactId>
+                </dependency>
                 <dependency>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-slf4j-impl</artifactId>
-                    <version>${log4j2.version}</version>
+                    <groupId>org.tinylog</groupId>
+                    <artifactId>tinylog-impl</artifactId>
                 </dependency>
             </dependencies>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
+                        <artifactId>maven-jar-plugin</artifactId>
                         <version>3.2.0</version>
-                        <executions>
-                            <execution>
-                                <id>copy-dependencies</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>copy-dependencies</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>target/lib</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <version>3.2.0</version>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.1.1</version>
                         <configuration>
                             <archive>
                                 <manifest>
-                                    <addClasspath>true</addClasspath>
-                                    <classpathPrefix>lib/</classpathPrefix>
                                     <mainClass>${mainClass.server}</mainClass>
                                 </manifest>
                             </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                            <appendAssemblyId>false</appendAssemblyId>
                         </configuration>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/example/mica-mqtt-example/src/main/resources/log4j2.properties b/example/mica-mqtt-example/src/main/resources/log4j2.properties
deleted file mode 100644
index f2be5310..00000000
--- a/example/mica-mqtt-example/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-log4j.rootLogger = DEBUG
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d [%t] %-5p %c{2} - %m%n
-
-# debug
-rootLogger.level = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
diff --git a/example/mica-mqtt-example/src/main/resources/tinylog.properties b/example/mica-mqtt-example/src/main/resources/tinylog.properties
new file mode 100644
index 00000000..e654301c
--- /dev/null
+++ b/example/mica-mqtt-example/src/main/resources/tinylog.properties
@@ -0,0 +1,8 @@
+writer        = console
+writer.format = {date: HH:mm:ss.SSS} [{thread}] {level} {class-name}.{method} : {message}
+writer.level = info
+# level
+level@org.tio = warn
+level@org.tio.client.TioClient = off
+level@org.tio.server = info
+level@net.dreamlu = info
diff --git a/pom.xml b/pom.xml
index 8fd087e3..8dc617e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
         <fastjson.version>1.2.83</fastjson.version>
         <micrometer-core.version>1.9.0</micrometer-core.version>
         <jfinal.version>5.0.1</jfinal.version>
+        <tinylog.version>2.4.1</tinylog.version>
         <junit-jupiter.version>5.8.2</junit-jupiter.version>
         <lombok.version>1.18.24</lombok.version>
     </properties>
@@ -111,6 +112,23 @@
                 <artifactId>mica-mqtt-client-spring-boot-starter</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <!-- tinylog 内存占用更小、性能更好，适合边缘设备 -->
+            <dependency>
+                <groupId>org.tinylog</groupId>
+                <artifactId>slf4j-tinylog</artifactId>
+                <version>${tinylog.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.tinylog</groupId>
+                <artifactId>tinylog-impl</artifactId>
+                <version>${tinylog.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>animal-sniffer-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>