merge: 合并 upgrade/springboot-4.0 到 develop

- 解决 pom.xml 冲突 (空行)
- 解决 TokenService.java 冲突 (保留 getSigningKey() 方案)
- 包含: JDK 25 + Spring Boot 4.0 特性落地

openhis-server-new/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.14</version>
+        <version>4.0.6</version>
         <relativePath />
     </parent>
 
@@ -23,8 +23,8 @@
         <core.version>0.0.1-SNAPSHOT</core.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>  <!-- 将21改为17 -->
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <java.version>25</java.version>
+        <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.28</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
@@ -37,10 +37,10 @@
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.12.6</jwt.version>
         <!-- override dependency version -->
-        <lombok.version>1.18.34</lombok.version>  <!-- 替换为 -->
+        <lombok.version>1.18.38</lombok.version>  <!-- 替换为 -->
         <mybatis-plus.version>3.5.16</mybatis-plus.version>
         <flowable.version>7.1.0</flowable.version>
-        <postgresql.version>42.7.4</postgresql.version>
+        <postgresql.version>42.7.10</postgresql.version>
         <aviator.version>5.3.3</aviator.version>
         <httpclient.version>4.5.14</httpclient.version>
         <fastjson2.version>2.0.61</fastjson2.version>
@@ -312,6 +312,7 @@
                 <version>${jwt.version}</version>
                 <scope>runtime</scope>
             </dependency>
+
             <!-- 验证码 -->
             <dependency>
                 <groupId>pro.fessional</groupId>