From 6b3f1bdab5cb1f937f8b4d980472ac4b73f8f58b Mon Sep 17 00:00:00 2001
From: huangping <huangping@craftlabs.cn>
Date: Tue, 28 Apr 2026 18:39:54 +0800
Subject: [PATCH] chore: upgrade Spring Boot 3.4.5 -> 4.0.0 with compiler and
 SecurityConfig fixes

- Move maven-compiler-plugin from pluginManagement to plugins for proper release 17 inheritance
- Remove deprecated UserDetailsServiceAutoConfiguration exclude (removed in Boot 4.0)
- Switch MyBatis-Plus to boot4-starter
---
 services/delivery-platform-api/pom.xml        |  2 +-
 .../platform/api/PlatformApplication.java     |  3 +-
 services/license-webhook-ingress/pom.xml      |  2 +-
 services/pom.xml                              | 28 ++++++++++---------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/services/delivery-platform-api/pom.xml b/services/delivery-platform-api/pom.xml
index 4867b7c..c7b7434 100644
--- a/services/delivery-platform-api/pom.xml
+++ b/services/delivery-platform-api/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/PlatformApplication.java b/services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/PlatformApplication.java
index 72c888b..3fc9a68 100644
--- a/services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/PlatformApplication.java
+++ b/services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/PlatformApplication.java
@@ -3,10 +3,9 @@ package cn.craftlabs.platform.api;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 
-@SpringBootApplication(exclude = UserDetailsServiceAutoConfiguration.class)
+@SpringBootApplication
 @EnableMethodSecurity
 @MapperScan("cn.craftlabs.platform.api.persistence")
 public class PlatformApplication {
diff --git a/services/license-webhook-ingress/pom.xml b/services/license-webhook-ingress/pom.xml
index ea5ed46..87fae30 100644
--- a/services/license-webhook-ingress/pom.xml
+++ b/services/license-webhook-ingress/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
diff --git a/services/pom.xml b/services/pom.xml
index 73525af..2a73ebf 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -18,14 +18,14 @@
 
     <properties>
         <java.version>17</java.version>
-        <spring-boot.version>3.4.5</spring-boot.version>
-        <!-- 平台数据访问：PostgreSQL 15 + MyBatis-Plus（Spring Boot 3 用 boot3-starter） -->
+        <spring-boot.version>4.0.0</spring-boot.version>
+        <!-- 平台数据访问：PostgreSQL 15 + MyBatis-Plus（Spring Boot 4 用 boot4-starter） -->
         <mybatis-plus.version>3.5.15</mybatis-plus.version>
     </properties>
 
     <!--
-      说明：选用 Spring Boot 3.4.x LTS 以保证多数环境可解析；
-      产品文档目标 4.0.* 可在父 POM 升级 spring-boot.version 并全量回归。
+      Spring Boot 4.0.x — 与 docs/平台架构思路.md 对齐。
+      MyBatis-Plus 使用 boot4-starter。
     -->
     <dependencyManagement>
         <dependencies>
@@ -38,13 +38,23 @@
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <release>${java.version}</release>
+                </configuration>
+            </plugin>
+        </plugins>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -59,14 +69,6 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.13.0</version>
-                    <configuration>
-                        <release>${java.version}</release>
-                    </configuration>
-                </plugin>
                 <!-- 子模块显式引用后，在 validate 阶段禁止引入客户端 JNI SDK -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>