From 5f04f9da668e88ddaa756ce25249176180d20fd8 Mon Sep 17 00:00:00 2001
From: "476474485@qq.com" <q8928627q>
Date: Sat, 11 May 2024 14:16:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB=EF=BC=8C=E6=94=BE=E7=94=9F=E4=BA=A7=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=9A=84=E6=97=B6=E5=80=99=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90error=EF=BC=8C=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E4=B8=8D=E6=89=93=E5=8D=B0=EF=BC=8C=E5=8F=AA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml     | 115 +++++++++++++++---
 1 file changed, 97 insertions(+), 18 deletions(-)

diff --git a/buildpackage/src/main/resources/logback-spring.xml b/buildpackage/src/main/resources/logback-spring.xml
index 2b63869a..780f5c31 100644
--- a/buildpackage/src/main/resources/logback-spring.xml
+++ b/buildpackage/src/main/resources/logback-spring.xml
@@ -31,42 +31,121 @@
         </encoder>
     </appender>
     <!-- INFO级别日志输出到文件 -->
-<!--    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
-<!--        <file>${LOG_PATH}/info.log</file>-->
-<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
-<!--            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info.%d{yyyy-MM-dd-HH}.log</fileNamePattern>-->
-<!--            <maxHistory>${MAX_HISTORY}</maxHistory>-->
-<!--        </rollingPolicy>-->
-<!--        <encoder>-->
-<!--            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>-->
-<!--        </encoder>-->
-<!--        &lt;!&ndash;日志文档最大的大小&ndash;&gt;-->
-<!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-<!--            <MaxFileSize>1MB</MaxFileSize>-->
-<!--        </triggeringPolicy>-->
-<!--    </appender>-->
-
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/info.log</file>
+        <!-- 添加filter，只记录INFO级别以上的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- 每个日志文件最大MB -->
             <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
             <!-- 日志文件保留天 -->
             <maxHistory>${MAX_HISTORY}</maxHistory>
-            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/%d{yyyy-MM-dd-HH}/%d{yyyy-MM-dd-HH}.%i.log</fileNamePattern>
+<!--            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info/info_%d{yyyyMMddHH}.%i.log</fileNamePattern>-->
+            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info/info_%d{yyyyMMdd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 日志文件超过最大大小后立即生成新文件 -->
+                <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- WARN级别日志-->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- 每个日志文件最大MB -->
+            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+            <!-- 日志文件保留天 -->
+            <maxHistory>${MAX_HISTORY}</maxHistory>
+            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/warn/warn_%d{yyyyMMdd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <!-- 日志文件超过最大大小后立即生成新文件 -->
                 <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
+        <!-- 添加 WARN只记录WARN级别以上的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>
+
+    <!-- error级别日志-->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- 每个日志文件最大MB -->
+            <!--            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>-->
+            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+            <!-- 日志文件保留天 -->
+            <maxHistory>${MAX_HISTORY}</maxHistory>
+            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/error/error_%d{yyyyMMdd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 日志文件超过最大大小后立即生成新文件 -->
+                <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <!-- 添加 ERROR只记录ERROR级别以上的日志 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+
+
+    <!-- ALL 任意级别日志都会记录在此级别日志-->
+    <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- 每个日志文件最大MB -->
+            <!--            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>-->
+            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+            <!-- 日志文件保留天 -->
+            <maxHistory>${MAX_HISTORY}</maxHistory>
+            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/all/all_%d{yyyyMMdd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 日志文件超过最大大小后立即生成新文件 -->
+                <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+
     <root level="INFO">
         <!-- 控制面板输出 -->
         <appender-ref ref="CONSOLE"/>
         <!-- 按照每天生成日志文档 -->
         <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+        <appender-ref ref="ALL_FILE"/>
     </root>
-</configuration>
\ No newline at end of file
+    <!-- ERROR 级别-->
+    <root level="ERROR">
+        <!-- 按照每天生成日志文档 -->
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+        <appender-ref ref="ALL_FILE"/>
+    </root>
+</configuration>

From 3cd0edd14fc60bafc08d756d0861d87d947d20ee Mon Sep 17 00:00:00 2001
From: "476474485@qq.com" <q8928627q>
Date: Sat, 11 May 2024 14:39:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB=EF=BC=8C=E6=94=BE=E7=94=9F=E4=BA=A7=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=9A=84=E6=97=B6=E5=80=99=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90error=EF=BC=8C=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E4=B8=8D=E6=89=93=E5=8D=B0=EF=BC=8C=E5=8F=AA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hzya/frame/DataSource/impl/DataSourceInitEvent.java  | 0
 .../DataSource/impl/DynamicDataSourceAssistConfiguration.java     | 0
 .../com/hzya/frame/DataSource/impl/EncDataSourceInitEvent.java    | 0
 service/src/main/java/com/hzya/frame/u8c/ax/entity/Ass.java       | 0
 service/src/main/java/com/hzya/frame/u8c/ax/entity/Cashflow.java  | 0
 service/src/main/java/com/hzya/frame/u8c/ax/entity/Voucher.java   | 0
 .../main/java/com/hzya/frame/u8c/ax/entity/VoucherDetails.java    | 0
 .../src/main/java/com/hzya/frame/u8c/ax/entity/VoucherRoot.java   | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 core/src/main/java/com/hzya/frame/DataSource/impl/DataSourceInitEvent.java
 mode change 100755 => 100644 core/src/main/java/com/hzya/frame/DataSource/impl/DynamicDataSourceAssistConfiguration.java
 mode change 100755 => 100644 core/src/main/java/com/hzya/frame/DataSource/impl/EncDataSourceInitEvent.java
 mode change 100755 => 100644 service/src/main/java/com/hzya/frame/u8c/ax/entity/Ass.java
 mode change 100755 => 100644 service/src/main/java/com/hzya/frame/u8c/ax/entity/Cashflow.java
 mode change 100755 => 100644 service/src/main/java/com/hzya/frame/u8c/ax/entity/Voucher.java
 mode change 100755 => 100644 service/src/main/java/com/hzya/frame/u8c/ax/entity/VoucherDetails.java
 mode change 100755 => 100644 service/src/main/java/com/hzya/frame/u8c/ax/entity/VoucherRoot.java

diff --git a/core/src/main/java/com/hzya/frame/DataSource/impl/DataSourceInitEvent.java b/core/src/main/java/com/hzya/frame/DataSource/impl/DataSourceInitEvent.java
old mode 100755
new mode 100644
diff --git a/core/src/main/java/com/hzya/frame/DataSource/impl/DynamicDataSourceAssistConfiguration.java b/core/src/main/java/com/hzya/frame/DataSource/impl/DynamicDataSourceAssistConfiguration.java
old mode 100755
new mode 100644
diff --git a/core/src/main/java/com/hzya/frame/DataSource/impl/EncDataSourceInitEvent.java b/core/src/main/java/com/hzya/frame/DataSource/impl/EncDataSourceInitEvent.java
old mode 100755
new mode 100644
diff --git a/service/src/main/java/com/hzya/frame/u8c/ax/entity/Ass.java b/service/src/main/java/com/hzya/frame/u8c/ax/entity/Ass.java
old mode 100755
new mode 100644
diff --git a/service/src/main/java/com/hzya/frame/u8c/ax/entity/Cashflow.java b/service/src/main/java/com/hzya/frame/u8c/ax/entity/Cashflow.java
old mode 100755
new mode 100644
diff --git a/service/src/main/java/com/hzya/frame/u8c/ax/entity/Voucher.java b/service/src/main/java/com/hzya/frame/u8c/ax/entity/Voucher.java
old mode 100755
new mode 100644
diff --git a/service/src/main/java/com/hzya/frame/u8c/ax/entity/VoucherDetails.java b/service/src/main/java/com/hzya/frame/u8c/ax/entity/VoucherDetails.java
old mode 100755
new mode 100644
diff --git a/service/src/main/java/com/hzya/frame/u8c/ax/entity/VoucherRoot.java b/service/src/main/java/com/hzya/frame/u8c/ax/entity/VoucherRoot.java
old mode 100755
new mode 100644