From e166e13f90a3b27208dfa02160a586ea5f990e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E6=95=8F?= <zhoumin@axzo.cn>
Date: Wed, 8 Jan 2025 17:17:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(server):=20=E8=B0=83=E6=95=B4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=EF=BC=8C=E6=8E=A5=E5=85=A5axzo-logger-spring-boot-sta?=
 =?UTF-8?q?rter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orgmanax-server/pom.xml                       |   5 +
 .../src/main/resources/logback-spring.xml     | 112 +-----------------
 2 files changed, 11 insertions(+), 106 deletions(-)

diff --git a/orgmanax-server/pom.xml b/orgmanax-server/pom.xml
index b9a05fb..46c00a7 100644
--- a/orgmanax-server/pom.xml
+++ b/orgmanax-server/pom.xml
@@ -35,6 +35,11 @@
             <artifactId>orgmanax-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.axzo.framework</groupId>
+            <artifactId>axzo-logger-spring-boot-starter</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
         <!---->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
diff --git a/orgmanax-starter/src/main/resources/logback-spring.xml b/orgmanax-starter/src/main/resources/logback-spring.xml
index c0138a3..7a01894 100644
--- a/orgmanax-starter/src/main/resources/logback-spring.xml
+++ b/orgmanax-starter/src/main/resources/logback-spring.xml
@@ -1,109 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 引用 Spring Boot 的 logback 基础配置 -->
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-
-    <springProperty scope="context" name="appName" source="spring.application.name"/>
-    <springProperty scope="context" name="LOG_PREFIX" source="logback.path" defaultValue="/mnt/app-logdata"/>
-
-    <property name="POD_NAMESPACE" value="${MY_POD_NAMESPACE:-local}"/>
-    <property name="LOG_FILE" value="${appName}.log"/>
-
-    <!--日志路径-->
-    <property name="LOG_PATH" value="${LOG_PREFIX}/${POD_NAMESPACE}/${appName}"/>
-    <!-- 日志最大的历史 7天 -->
-    <property name="MAX_HISTORY" value="7"/>
-
-    <!--默认日志输出模式-->
-    <property name="PATTERN_CONSOLE"
-              value="%date{HH:mm:ss} %highlight(%-5level) [%X{ctxLogId}] [%15thread] %cyan([%class{36}#%M:%L]) %msg%n"/>
-    <property name="PATTERN_FILE"
-              value="%date{yyyy-MM-dd HH:mm:ss} %-5level --- [%15thread] [%X{ctxLogId}] %logger: %msg%n"/>
-    <contextName>${appName}</contextName>
-
-    <!-- 控制台 Appender -->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${PATTERN_CONSOLE}</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="ch.qos.logback.classic.PatternLayout">
-                <pattern>${PATTERN_FILE}</pattern>
-            </layout>
-        </encoder>
-        <!-- 日志文件名 -->
-        <file>${LOG_PATH}/${LOG_FILE}</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 滚动后的日志文件名 -->
-            <fileNamePattern>${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_PATH}/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}</fileNamePattern>
-            <!-- 启动服务时，是否清理历史日志，一般不建议清理 -->
-            <cleanHistoryOnStart>${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}</cleanHistoryOnStart>
-            <!-- 日志文件，到达多少容量，进行滚动 -->
-            <maxFileSize>${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}</maxFileSize>
-            <!-- 日志文件的总大小，0 表示不限制 -->
-            <totalSizeCap>${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-1GB}</totalSizeCap>
-            <!-- 日志文件的保留天数 -->
-            <maxHistory>${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}</maxHistory>
-        </rollingPolicy>
-    </appender>
-
-    <!-- 异步写入日志，提升性能 -->
-    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志。默认的，如果队列的 80% 已满,则会丢弃 TRACT、DEBUG、INFO 级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度，该值会影响性能。默认值为 256 -->
-        <queueSize>256</queueSize>
-        <appender-ref ref="FILE"/>
-    </appender>
-
-    <!--  控制台输出LOGSTASH JSON日志 -->
-    <appender name="LOGSTASH" class="ch.qos.logback.core.ConsoleAppender" addtivity="false">
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <timestamp>
-                    <fieldName>@timestamp</fieldName>
-                    <pattern>yyyy-MM-dd'T'HH:mm:ss.SSSx</pattern>
-                    <timeZone>GMT+8</timeZone>
-                </timestamp>
-                <pattern>
-                    <pattern>
-                        {
-                        "app":"${appName}",
-                        "level":"%level",
-                        "traceId":"%X{ctxLogId}",
-                        "thread":"%thread",
-                        "class":"%logger{40}",
-                        "message":"%replace(%message){'^(.{3000}).*$', '$1'}",
-                        "error_level":"%X{errorLevel}",
-                        "error_type":"%X{errorType}",
-                        "stack_trace":"%exception{20}"
-                        }
-                    </pattern>
-                </pattern>
-            </providers>
-        </encoder>
-    </appender>
-    <!-- 本地环境 -->
-    <springProfile name="local">
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-        </root>
+    <!-- 导入安心筑全局日志配置 -->
+    <include resource="logback/logback-axzo.xml"/>
+    <!-- 覆盖开发环境日志配置 -->
+    <springProfile name="local,dev,test">
+        <logger name="cn.axzo" level="DEBUG"/>
     </springProfile>
-    <springProfile name="dev,test,pre,live,default">
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="ASYNC"/>
-        </root>
-    </springProfile>
-    <!-- 其它环境 -->
-    <springProfile name="master">
-        <root level="INFO">
-            <appender-ref ref="LOGSTASH"/>
-        </root>
-    </springProfile>
-
-</configuration>
+</configuration>
\ No newline at end of file