From 13655445d2203a7c12f5c5bb183cf5c752eab073 Mon Sep 17 00:00:00 2001
From: zhangjf <zhangjf@example.com>
Date: Thu, 26 Feb 2026 19:12:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=90=8E=E5=8F=B0API=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- service.properties: 移除重复日志配置(已由env.properties定义)
- logback-spring.xml: ERROR日志只输出到error.log
  - AOP_FILE/APP_FILE/SQL_FILE/CONSOLE添加ERROR过滤器
  - 更新注释说明配置来源于env.properties
---
 .../src/main/resources/application.yml        |   6 +-
 .../src/main/resources/logback-spring.xml     | 117 ++++++++++++++----
 .../src/main/resources/service.properties     |   5 +-
 3 files changed, 99 insertions(+), 29 deletions(-)

diff --git a/worklog-api/src/main/resources/application.yml b/worklog-api/src/main/resources/application.yml
index b00d434..5746843 100644
--- a/worklog-api/src/main/resources/application.yml
+++ b/worklog-api/src/main/resources/application.yml
@@ -12,7 +12,11 @@ server:
 spring:
   application:
     name: worklog-api
-  
+
+  # 导入 service.properties，使其参数对 logback-spring.xml 的 springProperty 可见
+  config:
+    import: optional:classpath:service.properties
+
   # Jackson 配置
   jackson:
     time-zone: GMT+8
diff --git a/worklog-api/src/main/resources/logback-spring.xml b/worklog-api/src/main/resources/logback-spring.xml
index ccbf44a..f891d3a 100644
--- a/worklog-api/src/main/resources/logback-spring.xml
+++ b/worklog-api/src/main/resources/logback-spring.xml
@@ -1,25 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 从环境变量读取配置 -->
-    <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="worklog-api"/>
-    <springProperty scope="context" name="LOG_PATH" source="logging.file.path" defaultValue="./logs"/>
-    <springProperty scope="context" name="LOG_LEVEL_ROOT" source="logging.level.root" defaultValue="INFO"/>
-    <springProperty scope="context" name="LOG_LEVEL_APP" source="logging.level.app" defaultValue="DEBUG"/>
-    
-    <!-- 日志格式：强制包含 traceId 和 spanId -->
+    <!-- 从 env.properties 读取配置（生产环境由 start.sh 注入为系统属性，开发环境通过 spring.config.import 加载） -->
+    <springProperty scope="context" name="APP_NAME" source="APP_NAME" defaultValue="worklog-api"/>
+    <springProperty scope="context" name="LOG_PATH" source="LOG_PATH" defaultValue="./logs"/>
+    <springProperty scope="context" name="LOG_LEVEL_ROOT" source="LOG_LEVEL_ROOT" defaultValue="INFO"/>
+    <springProperty scope="context" name="LOG_LEVEL_APP" source="LOG_LEVEL_APP" defaultValue="DEBUG"/>
+
+    <!-- 日志格式：包含 traceId 和 spanId -->
     <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId:-}][%X{spanId:-}] %-5level %logger{50} - %msg%n"/>
-    
-    <!-- 控制台输出 -->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+
+    <!-- ===== Appenders ===== -->
+
+    <!-- 1. AOP日志：ApiLogAspect 请求/响应日志（不含ERROR，ERROR只输出到error.log） -->
+    <appender name="AOP_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH}/aop.log</file>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
         <encoder>
             <pattern>${LOG_PATTERN}</pattern>
             <charset>UTF-8</charset>
         </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/aop-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
     </appender>
 
-    <!-- 应用日志文件输出 - 直接输出到 logs/ 目录 -->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- 2. 应用日志：com.wjbl.worklog 业务日志（不含ERROR，ERROR只输出到error.log） -->
+    <appender name="APP_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_PATH}/app.log</file>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
         <encoder>
             <pattern>${LOG_PATTERN}</pattern>
             <charset>UTF-8</charset>
@@ -31,9 +49,14 @@
         </rollingPolicy>
     </appender>
 
-    <!-- SQL日志文件输出 - MyBatis-Plus SQL 日志独立输出 -->
+    <!-- 3. SQL日志：数据库操作日志（不含ERROR，ERROR只输出到error.log） -->
     <appender name="SQL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_PATH}/sql.log</file>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
         <encoder>
             <pattern>${LOG_PATTERN}</pattern>
             <charset>UTF-8</charset>
@@ -45,21 +68,65 @@
         </rollingPolicy>
     </appender>
 
-    <!-- MyBatis-Plus SQL日志 -->
-    <logger name="com.wjbl.worklog.data.mapper" level="DEBUG" additivity="false">
-        <appender-ref ref="SQL_FILE"/>
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-    
-    <!-- MyBatis-Plus 框架日志 -->
-    <logger name="com.baomidou.mybatisplus" level="DEBUG" additivity="false">
-        <appender-ref ref="SQL_FILE"/>
-        <appender-ref ref="CONSOLE"/>
+    <!-- 4. 异常日志：所有 ERROR 级别日志集中输出 -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH}/error.log</file>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>${LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <!-- 控制台输出（开发环境调试用，不含ERROR，ERROR只输出到error.log） -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+        <encoder>
+            <pattern>${LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- ===== Loggers ===== -->
+
+    <!-- ApiLogAspect → aop.log（比 com.wjbl.worklog 更具体，优先匹配） -->
+    <logger name="com.wjbl.worklog.config.ApiLogAspect" level="DEBUG" additivity="false">
+        <appender-ref ref="AOP_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
     </logger>
 
-    <!-- 根日志级别 -->
+    <!-- MyBatis Mapper SQL → sql.log -->
+    <logger name="com.wjbl.worklog.data.mapper" level="DEBUG" additivity="false">
+        <appender-ref ref="SQL_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </logger>
+
+    <!-- MyBatis-Plus 框架 SQL → sql.log -->
+    <logger name="com.baomidou.mybatisplus" level="DEBUG" additivity="false">
+        <appender-ref ref="SQL_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </logger>
+
+    <!-- com.wjbl.worklog 业务日志 → app.log（ApiLogAspect 和 mapper 已被上方更具体的 logger 拦截） -->
+    <logger name="com.wjbl.worklog" level="${LOG_LEVEL_APP}" additivity="false">
+        <appender-ref ref="APP_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </logger>
+
+    <!-- 根日志：其余所有日志 → stdout.log -->
     <root level="${LOG_LEVEL_ROOT}">
+        <appender-ref ref="ERROR_FILE"/>
         <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE"/>
     </root>
 </configuration>
diff --git a/worklog-api/src/main/resources/service.properties b/worklog-api/src/main/resources/service.properties
index ec0e785..3c08c8b 100644
--- a/worklog-api/src/main/resources/service.properties
+++ b/worklog-api/src/main/resources/service.properties
@@ -18,8 +18,7 @@ TENANT_ID=
 MAIN_CLASS=com.wjbl.worklog.WorklogApplication
 
 # ==================== 个性化覆盖配置（可选） ====================
-# 如果当前服务需要使用不同的日志路径，可在此覆盖
+# 生产环境可在 conf/service.properties 中覆盖以下参数：
 # LOG_PATH=/var/logs/worklog-api
-
-# 如果当前服务需要使用不同的日志级别，可在此覆盖
+# LOG_LEVEL_ROOT=WARN
 # LOG_LEVEL_APP=INFO