From 9341c9469a14ae81261fada740fa04d3c3ac5de1 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 8 Feb 2025 09:34:31 +0800
Subject: [PATCH] =?UTF-8?q?pom=20tools=20=E9=80=9A=E7=94=A8=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=20=E6=97=A5=E5=BF=97=E5=AD=98=E5=82=A8=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback.xml            |  2 +-
 .../src/main/resources/logback.xml            |  2 +-
 .../src/main/resources/logback.xml            |  2 +-
 .../src/main/resources/logback.xml            |  2 +-
 cash-common/cash-common-tools/pom.xml         |  8 +++++
 cash-service/account-service/pom.xml          |  5 ---
 cash-service/pom.xml                          |  5 ---
 pom.xml                                       | 31 +++++++++++++++++--
 8 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/cash-api/account-server/src/main/resources/logback.xml b/cash-api/account-server/src/main/resources/logback.xml
index a5faaf2f..95aef584 100644
--- a/cash-api/account-server/src/main/resources/logback.xml
+++ b/cash-api/account-server/src/main/resources/logback.xml
@@ -17,7 +17,7 @@
         <file>logs/account/logback.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--生成日志文件名称-->
-            <fileNamePattern>logs/account/logback/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
+            <fileNamePattern>logs/account/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <maxFileSize>20MB</maxFileSize>
diff --git a/cash-api/order-server/src/main/resources/logback.xml b/cash-api/order-server/src/main/resources/logback.xml
index 39acd478..9a50e46e 100644
--- a/cash-api/order-server/src/main/resources/logback.xml
+++ b/cash-api/order-server/src/main/resources/logback.xml
@@ -17,7 +17,7 @@
         <file>logs/order/logback.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--生成日志文件名称-->
-            <fileNamePattern>logs/order/logback/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
+            <fileNamePattern>logs/order/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <maxFileSize>20MB</maxFileSize>
diff --git a/cash-api/product-server/src/main/resources/logback.xml b/cash-api/product-server/src/main/resources/logback.xml
index 3f9b3389..07cb8cb9 100644
--- a/cash-api/product-server/src/main/resources/logback.xml
+++ b/cash-api/product-server/src/main/resources/logback.xml
@@ -17,7 +17,7 @@
         <file>logs/product/logback.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--生成日志文件名称-->
-            <fileNamePattern>logs/product/logback/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
+            <fileNamePattern>logs/product/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <maxFileSize>20MB</maxFileSize>
diff --git a/cash-api/system-server/src/main/resources/logback.xml b/cash-api/system-server/src/main/resources/logback.xml
index 712d1c64..1c82335a 100644
--- a/cash-api/system-server/src/main/resources/logback.xml
+++ b/cash-api/system-server/src/main/resources/logback.xml
@@ -17,7 +17,7 @@
         <file>logs/system/logback.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--生成日志文件名称-->
-            <fileNamePattern>logs/system/logback/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
+            <fileNamePattern>logs/system/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <maxFileSize>20MB</maxFileSize>
diff --git a/cash-common/cash-common-tools/pom.xml b/cash-common/cash-common-tools/pom.xml
index ab1f290b..bc394850 100644
--- a/cash-common/cash-common-tools/pom.xml
+++ b/cash-common/cash-common-tools/pom.xml
@@ -17,6 +17,14 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/cash-service/account-service/pom.xml b/cash-service/account-service/pom.xml
index 371e8435..b862208a 100644
--- a/cash-service/account-service/pom.xml
+++ b/cash-service/account-service/pom.xml
@@ -23,11 +23,6 @@
             <artifactId>cash-common-sa-token</artifactId>
             <version>1.0.0</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.czg</groupId>
-            <artifactId>cash-common-tools</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/cash-service/pom.xml b/cash-service/pom.xml
index f6cba234..11288da7 100644
--- a/cash-service/pom.xml
+++ b/cash-service/pom.xml
@@ -33,11 +33,6 @@
             <artifactId>cash-common-tools</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.czg</groupId>
-            <artifactId>cash-sdk</artifactId>
-            <version>1.0.0</version>
-        </dependency>
 
         <dependency>
             <groupId>com.mybatis-flex</groupId>
diff --git a/pom.xml b/pom.xml
index e2ca572b..c247c0a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,16 +44,41 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
+        <!-- spring-boot-starter-test 的漏洞的依赖处理 -->
+        <!-- start -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <!-- 排除有漏洞的依赖 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.xmlunit</groupId>
+                    <artifactId>xmlunit-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>2.4.11</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <version>2.10.0</version>
+            <scope>test</scope>
         </dependency>
+        <!-- end -->
         <!--
         <dependency>
             <groupId>org.springframework.cloud</groupId>