merge: 合并 upgrade/springboot-4.0 到 develop

- 解决 pom.xml 冲突 (空行)
- 解决 TokenService.java 冲突 (保留 getSigningKey() 方案)
- 包含: JDK 25 + Spring Boot 4.0 特性落地
This commit is contained in:
2026-06-05 09:49:04 +08:00
29 changed files with 533 additions and 142 deletions

View File

@@ -21,10 +21,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>17</source>
<target>17</target>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>UTF-8</encoding>
<compilerArgs>
<arg>-parameters</arg>
@@ -35,7 +35,7 @@
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>