Merge remote-tracking branch 'origin/dev' into dev

custom-server-starter/src/main/resources/application.yml

@@ -137,7 +137,11 @@ management:
     web:
       base-path: /api/v3/actuator
       exposure:
-        include: metrics,health
+        include: health
+  endpoint:
+    health:
+      probes:
+        enabled: false
 jomalls:
   job:
     execute: true

custom-server-starter/src/main/resources/logback-spring.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="300 seconds" debug="false">
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
     <property name="max.history.days" value="30"/>
     <property name="max.file.size" value="50MB"/>
     <property name="max.total.size" value="2GB"/>
@@ -15,12 +15,29 @@
             <pattern>${log.pattern}</pattern>
             <charset>UTF-8</charset>
         </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
     </appender>
 
     <!-- ==================== 文件输出 ==================== -->
+    <!-- 系统日志：仅 DEBUG -->
+    <appender name="file_debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/sys-debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>${max.file.size}</maxFileSize>
+            <maxHistory>${max.history.days}</maxHistory>
+            <totalSizeCap>${max.total.size}</totalSizeCap>
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
     <!-- 系统日志：仅 INFO -->
     <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.path}/sys-info.log</file>
@@ -83,7 +100,12 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-
+    <appender name="async_file_debug" class="ch.qos.logback.classic.AsyncAppender">
+        <neverBlock>true</neverBlock>
+        <queueSize>4096</queueSize>
+        <discardingThreshold>0</discardingThreshold>
+        <appender-ref ref="file_debug"/>
+    </appender>
     <appender name="async_file_info" class="ch.qos.logback.classic.AsyncAppender">
         <neverBlock>true</neverBlock>
         <queueSize>512</queueSize>
@@ -104,18 +126,17 @@
     </appender>
 
     <!-- ==================== 框架日志级别控制 ==================== -->
+    <!-- MyBatis / MyBatis-Plus SQL 日志（排查问题时打开） -->
     <!--
-    MyBatis / MyBatis-Plus：默认关闭 SQL 日志，排查问题时临时打开
     <logger name="org.mybatis" level="DEBUG"/>
     <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
-    -->
-    <springProfile name="default">
-        <logger name="com.jomalls.custom" level="DEBUG"/>
-    </springProfile>
+    <logger name="com.jomalls.custom" level="DEBUG"/>
+     -->
 
     <!-- ==================== 根配置 ==================== -->
     <root level="INFO">
         <appender-ref ref="console"/>
+        <appender-ref ref="async_file_debug"/>
         <appender-ref ref="async_file_info"/>
         <appender-ref ref="async_file_warn"/>
         <appender-ref ref="async_file_error"/>