From 79d451931d6704bf543072d936c1a6c03224714b Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Mon, 22 Dec 2025 12:10:55 +0800
Subject: [PATCH] =?UTF-8?q?```=20feat(core-admin):=20=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?Lombok=20=E4=BE=9D=E8=B5=96=E5=B9=B6=E5=8D=87=E7=BA=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 core-admin 模块中显式添加了 Lombok 依赖，并将 Lombok 版本从 1.18.26 升级至 1.18.38。
同时，将 Lombok 依赖统一管理到父 pom 的 dependencyManagement 中，并配置 Maven 编译插件以支持注解处理器。
此外，引入 core-common 通用工具模块依赖，移除了冗余的 Maven 构建配置注释。
```
---
 openhis-server-new/core-admin/pom.xml | 49 ++++++---------------------
 openhis-server-new/pom.xml            | 25 ++++++++------
 2 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/openhis-server-new/core-admin/pom.xml b/openhis-server-new/core-admin/pom.xml
index 8fc2c124..cbfcd0ca 100644
--- a/openhis-server-new/core-admin/pom.xml
+++ b/openhis-server-new/core-admin/pom.xml
@@ -25,6 +25,11 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
         <!-- swagger3-->
         <dependency>
@@ -66,45 +71,13 @@
             <groupId>com.core</groupId>
             <artifactId>core-flowable</artifactId>
         </dependency>
-
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.core</groupId>
+            <artifactId>core-common</artifactId>
+        </dependency>
     </dependencies>
 
-<!--        <build>-->
-<!--            <plugins>-->
-<!--                <plugin>-->
-<!--                    <groupId>org.springframework.boot</groupId>-->
-<!--                    <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                    <version>2.5.15</version>-->
-<!--                    <configuration>-->
-<!--                        <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;-->
-<!--                    </configuration>-->
-<!--                    <executions>-->
-<!--                        <execution>-->
-<!--                            <goals>-->
-<!--                                <goal>repackage</goal>-->
-<!--                            </goals>-->
-<!--                        </execution>-->
-<!--                    </executions>-->
-<!--                </plugin>-->
-<!--                <plugin>-->
-<!--                    <groupId>org.apache.maven.plugins</groupId>-->
-<!--                    <artifactId>maven-war-plugin</artifactId>-->
-<!--                    <version>3.1.0</version>-->
-<!--                    <configuration>-->
-<!--                        <failOnMissingWebXml>false</failOnMissingWebXml>-->
-<!--                        <warName>${project.artifactId}</warName>-->
-<!--                    </configuration>-->
-<!--                </plugin>-->
-<!--                <plugin>-->
-<!--                    <groupId>org.apache.maven.plugins</groupId>-->
-<!--                    <artifactId>maven-compiler-plugin</artifactId>-->
-<!--                    <configuration>-->
-<!--                        <source>8</source>-->
-<!--                        <target>8</target>-->
-<!--                    </configuration>-->
-<!--                </plugin>-->
-<!--            </plugins>-->
-<!--            <finalName>${project.artifactId}</finalName>-->
-<!--        </build>-->
+
 
 </project>
\ No newline at end of file
diff --git a/openhis-server-new/pom.xml b/openhis-server-new/pom.xml
index e771210e..68d3afc6 100644
--- a/openhis-server-new/pom.xml
+++ b/openhis-server-new/pom.xml
@@ -38,7 +38,7 @@
         <!-- override dependency version -->
         <tomcat.version>9.0.96</tomcat.version>
         <logback.version>1.2.13</logback.version>
-        <lombok.version>1.18.26</lombok.version>
+        <lombok.version>1.18.38</lombok.version>
         <mybatis-plus.version>3.5.3</mybatis-plus.version>
         <flowable.version>6.8.0</flowable.version>
         <postgresql.version>42.2.27</postgresql.version>
@@ -56,15 +56,6 @@
         <mysql-connector-j.version>9.4.0</mysql-connector-j.version>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
@@ -73,7 +64,12 @@
                 <artifactId>mysql-connector-j</artifactId>
                 <version>${mysql-connector-j.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <!-- pdf依赖-->
             <dependency>
                 <groupId>com.itextpdf</groupId>
@@ -357,6 +353,13 @@
                     <source>${java.version}</source>
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
         </plugins>