From be146898035b08bb3c6d56a2972a810963511562 Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Mon, 22 Jun 2026 21:05:45 +0800
Subject: [PATCH] =?UTF-8?q?chore(upgrade):=20=E5=8D=87=E7=BA=A7=20Spring?=
 =?UTF-8?q?=20Boot=204.0.6=20=E2=86=92=204.1.0=20=E5=8F=8A=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC=E6=B2=BB=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Spring Boot parent 4.0.6 → 4.1.0 (6 pom)
- springdoc 3.0.2 → 3.0.3, aws-sdk 2.42.36 → 2.46.15, caffeine 3.2.3 → 3.2.4, ip2region 3.3.6 → 3.3.7
- 移除已停更的 lombok-mapstruct-binding (A方案验证通过)
- 构建命令 -DskipTests → -Dmaven.test.skip=true (适配 SB 4.1 AOT 变化)
---
 daxpay-channel/daxpay-channel-alipay/pom.xml   |  7 -------
 daxpay-channel/daxpay-channel-wechat/pom.xml   | 13 -------------
 daxpay-channel/pom.xml                         | 16 +---------------
 daxpay-demo/pom.xml                            |  2 +-
 daxpay-payment/daxpay-payment-admin/pom.xml    |  8 --------
 daxpay-payment/daxpay-payment-common/pom.xml   | 14 --------------
 daxpay-payment/daxpay-payment-merchant/pom.xml |  8 --------
 daxpay-payment/pom.xml                         |  8 +-------
 .../daxpay-platform-capability/pom.xml         |  8 --------
 .../daxpay-platform-service/pom.xml            |  8 --------
 daxpay-platform/pom.xml                        | 18 ++++++------------
 daxpay-plugin/pom.xml                          | 16 +---------------
 daxpay-start/pom.xml                           |  8 +-------
 pom.xml                                        |  6 ------
 14 files changed, 11 insertions(+), 129 deletions(-)

diff --git a/daxpay-channel/daxpay-channel-alipay/pom.xml b/daxpay-channel/daxpay-channel-alipay/pom.xml
index a0edfa206..570bd5b89 100644
--- a/daxpay-channel/daxpay-channel-alipay/pom.xml
+++ b/daxpay-channel/daxpay-channel-alipay/pom.xml
@@ -14,11 +14,4 @@
     <packaging>jar</packaging>
     <description>支付宝官方支付通道</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.alipay.sdk</groupId>
-            <artifactId>alipay-sdk-java</artifactId>
-            <version>${alipay.version}</version>
-        </dependency>
-    </dependencies>
 </project>
diff --git a/daxpay-channel/daxpay-channel-wechat/pom.xml b/daxpay-channel/daxpay-channel-wechat/pom.xml
index e2a40aa13..ceec5cbe3 100644
--- a/daxpay-channel/daxpay-channel-wechat/pom.xml
+++ b/daxpay-channel/daxpay-channel-wechat/pom.xml
@@ -14,17 +14,4 @@
     <packaging>jar</packaging>
     <description>微信支付通道实现</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-pay</artifactId>
-            <version>${wxjava.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
 </project>
diff --git a/daxpay-channel/pom.xml b/daxpay-channel/pom.xml
index df4657dc1..b49f2a1bb 100644
--- a/daxpay-channel/pom.xml
+++ b/daxpay-channel/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/>
     </parent>
 
@@ -32,9 +32,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <mapstruct.version>1.6.3</mapstruct.version>
-        <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
-        <wxjava.version>4.8.4.B</wxjava.version>
-        <alipay.version>4.40.272.ALL</alipay.version>
     </properties>
 
     <dependencies>
@@ -43,12 +40,6 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-mapstruct-binding</artifactId>
-            <scope>provided</scope>
-            <version>${lombok-mapstruct.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-processor</artifactId>
@@ -76,11 +67,6 @@
                             <artifactId>lombok</artifactId>
                             <version>${lombok.version}</version>
                         </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok-mapstruct-binding</artifactId>
-                            <version>${lombok-mapstruct.version}</version>
-                        </path>
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>
diff --git a/daxpay-demo/pom.xml b/daxpay-demo/pom.xml
index c6eeffec5..3b4686cdd 100644
--- a/daxpay-demo/pom.xml
+++ b/daxpay-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
diff --git a/daxpay-payment/daxpay-payment-admin/pom.xml b/daxpay-payment/daxpay-payment-admin/pom.xml
index e9dbf81e9..af0961c02 100644
--- a/daxpay-payment/daxpay-payment-admin/pom.xml
+++ b/daxpay-payment/daxpay-payment-admin/pom.xml
@@ -21,14 +21,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- lombok 配合 mapstruct -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-mapstruct-binding</artifactId>
-            <scope>provided</scope>
-            <version>${lombok-mapstruct.version}</version>
-        </dependency>
-
         <!-- 类型转换处理器 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
diff --git a/daxpay-payment/daxpay-payment-common/pom.xml b/daxpay-payment/daxpay-payment-common/pom.xml
index c31684f4f..29393d010 100644
--- a/daxpay-payment/daxpay-payment-common/pom.xml
+++ b/daxpay-payment/daxpay-payment-common/pom.xml
@@ -21,14 +21,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- lombok 配合 mapstruct -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-mapstruct-binding</artifactId>
-            <scope>provided</scope>
-            <version>${lombok-mapstruct.version}</version>
-        </dependency>
-
         <!-- 类型转换处理器 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -112,12 +104,6 @@
             <artifactId>capability-wechat</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- 支付宝SDK -->
-        <dependency>
-            <groupId>com.alipay.sdk</groupId>
-            <artifactId>alipay-sdk-java</artifactId>
-            <version>${alipay.version}</version>
-        </dependency>
 
     </dependencies>
 
diff --git a/daxpay-payment/daxpay-payment-merchant/pom.xml b/daxpay-payment/daxpay-payment-merchant/pom.xml
index 88412b4eb..01dc01206 100644
--- a/daxpay-payment/daxpay-payment-merchant/pom.xml
+++ b/daxpay-payment/daxpay-payment-merchant/pom.xml
@@ -21,14 +21,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- lombok 配合 mapstruct -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-mapstruct-binding</artifactId>
-            <scope>provided</scope>
-            <version>${lombok-mapstruct.version}</version>
-        </dependency>
-
         <!-- 类型转换处理器 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
diff --git a/daxpay-payment/pom.xml b/daxpay-payment/pom.xml
index c3f43c7fe..058bc07ae 100644
--- a/daxpay-payment/pom.xml
+++ b/daxpay-payment/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -29,7 +29,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- 三方库 -->
         <mapstruct.version>1.6.3</mapstruct.version>
-        <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
         <wxjava.version>4.8.4.B</wxjava.version>
         <alipay.version>4.40.272.ALL</alipay.version>
     </properties>
@@ -48,11 +47,6 @@
                             <artifactId>lombok</artifactId>
                             <version>${lombok.version}</version>
                         </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok-mapstruct-binding</artifactId>
-                            <version>${lombok-mapstruct.version}</version>
-                        </path>
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>
diff --git a/daxpay-platform/daxpay-platform-capability/pom.xml b/daxpay-platform/daxpay-platform-capability/pom.xml
index cf5ee034d..905382966 100644
--- a/daxpay-platform/daxpay-platform-capability/pom.xml
+++ b/daxpay-platform/daxpay-platform-capability/pom.xml
@@ -36,14 +36,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- lombok 配合 mapstruct -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-mapstruct-binding</artifactId>
-            <scope>provided</scope>
-            <version>${lombok-mapstruct.version}</version>
-        </dependency>
-
         <!-- 类型转换处理器 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
diff --git a/daxpay-platform/daxpay-platform-service/pom.xml b/daxpay-platform/daxpay-platform-service/pom.xml
index 7b5be1f88..bc7405fb2 100644
--- a/daxpay-platform/daxpay-platform-service/pom.xml
+++ b/daxpay-platform/daxpay-platform-service/pom.xml
@@ -27,14 +27,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- lombok 配合 mapstruct -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-mapstruct-binding</artifactId>
-            <scope>provided</scope>
-            <version>${lombok-mapstruct.version}</version>
-        </dependency>
-
         <!-- 类型转换处理器 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
diff --git a/daxpay-platform/pom.xml b/daxpay-platform/pom.xml
index d497ae86a..e2e5fa496 100644
--- a/daxpay-platform/pom.xml
+++ b/daxpay-platform/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -25,19 +25,18 @@
     </modules>
 
     <properties>
-        <springdoc.version>3.0.2</springdoc.version>
-        <hutool.version>5.8.44</hutool.version>
+        <springdoc.version>3.0.3</springdoc.version>
+        <hutool.version>5.8.46</hutool.version>
         <bouncycastle.version>1.84</bouncycastle.version>
         <guava.version>33.6.0-jre</guava.version>
         <mybatis-plus.version>3.5.16</mybatis-plus.version>
         <mybatis-plus-join.version>1.5.7</mybatis-plus-join.version>
         <lock4j.version>2.2.7</lock4j.version>
-        <aws-sdk.version>2.42.36</aws-sdk.version>
+        <aws-sdk.version>2.46.15</aws-sdk.version>
         <sa-token.version>1.45.0</sa-token.version>
-        <caffeine.version>3.2.3</caffeine.version>
+        <caffeine.version>3.2.4</caffeine.version>
         <mapstruct.version>1.6.3</mapstruct.version>
-        <ip2region.version>3.3.6</ip2region.version>
-        <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
+        <ip2region.version>3.3.7</ip2region.version>
 
         <java.version>25</java.version>
         <maven.compiler.source>25</maven.compiler.source>
@@ -59,11 +58,6 @@
                             <artifactId>lombok</artifactId>
                             <version>${lombok.version}</version>
                         </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok-mapstruct-binding</artifactId>
-                            <version>${lombok-mapstruct.version}</version>
-                        </path>
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>
diff --git a/daxpay-plugin/pom.xml b/daxpay-plugin/pom.xml
index 34f9d7fcf..0fad8fb23 100644
--- a/daxpay-plugin/pom.xml
+++ b/daxpay-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>cn.daxpay.open</groupId>
@@ -24,7 +24,6 @@
 
         <!-- 三方库 -->
         <mapstruct.version>1.6.3</mapstruct.version>
-        <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
         <wxjava.version>4.8.4.B</wxjava.version>
 
     </properties>
@@ -37,14 +36,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- lombok 配合 mapstruct -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok-mapstruct-binding</artifactId>
-            <scope>provided</scope>
-            <version>${lombok-mapstruct.version}</version>
-        </dependency>
-
         <!-- 类型转换处理器 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -76,11 +67,6 @@
                             <artifactId>lombok</artifactId>
                             <version>${lombok.version}</version>
                         </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok-mapstruct-binding</artifactId>
-                            <version>${lombok-mapstruct.version}</version>
-                        </path>
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>
diff --git a/daxpay-start/pom.xml b/daxpay-start/pom.xml
index 3bea82aeb..79479ea9b 100644
--- a/daxpay-start/pom.xml
+++ b/daxpay-start/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.6</version>
+        <version>4.1.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -25,7 +25,6 @@
 
         <!-- 三方库 -->
         <mapstruct.version>1.6.3</mapstruct.version>
-        <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
     </properties>
 
     <dependencies>
@@ -133,11 +132,6 @@
                             <artifactId>lombok</artifactId>
                             <version>${lombok.version}</version>
                         </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok-mapstruct-binding</artifactId>
-                            <version>${lombok-mapstruct.version}</version>
-                        </path>
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>
diff --git a/pom.xml b/pom.xml
index bced6a876..9836918b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,6 @@
         <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <lombok.version>1.18.46</lombok.version>
-        <lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
         <mapstruct.version>1.6.3</mapstruct.version>
     </properties>
 
@@ -43,11 +42,6 @@
                             <artifactId>lombok</artifactId>
                             <version>${lombok.version}</version>
                         </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok-mapstruct-binding</artifactId>
-                            <version>${lombok-mapstruct.version}</version>
-                        </path>
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>