From dada22dfa4eaa1406fcfc564516fb6b8ec0b50a8 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 16 Dec 2025 13:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 38 ++++++++++++++-----
 HnRealNameBmw/pom.xml                         |  2 +-
 .../src/main/resources/bootstrap.yml          |  6 ++-
 HnRealNameMw/pom.xml                          |  1 +
 HnRealNameMw/src/main/resources/bootstrap.yml |  6 ++-
 hn-czl-service/pom.xml                        |  2 +-
 .../bonus-common/bonus-common-core/pom.xml    |  1 +
 hn-gateway/bonus-gateway/pom.xml              |  2 +-
 hn_czl_screen/pom.xml                         |  2 +-
 9 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2788c5d..ba39c46 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="30706c6d-35cd-44ba-b6ec-9865ccea7a75" name="Changes" comment="用户管理及下拉选查询接口开发">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/HnRealNameBmw/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameBmw/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/HnRealNameBmw/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/resources/bootstrap.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/HnRealNameMw/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameMw/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/HnRealNameMw/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameMw/src/main/resources/bootstrap.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hn-czl-service/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-czl-service/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hn-gateway/bonus-common/bonus-common-core/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-common/bonus-common-core/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hn-gateway/bonus-gateway/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-gateway/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hn_czl_screen/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn_czl_screen/pom.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -31,6 +38,11 @@
         <option name="userSettingsFile" value="D:\maven\apache-maven-3.6.1\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
+    <option name="importingSettings">
+      <MavenImportingSettings>
+        <option name="jdkForImporter" value="1.8" />
+      </MavenImportingSettings>
+    </option>
   </component>
   <component name="ProjectColorInfo">{
   &quot;customColor&quot;: &quot;&quot;,
@@ -64,8 +76,8 @@
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
     "SONARLINT_PRECOMMIT_ANALYSIS": "true",
-    "Spring Boot.BonusGatewayApplication.executor": "Debug",
-    "Spring Boot.CzlScreenApplication.executor": "Debug",
+    "Spring Boot.BonusGatewayApplication.executor": "Run",
+    "Spring Boot.CzlScreenApplication.executor": "Run",
     "Spring Boot.CzlServiceApplication.executor": "Run",
     "Spring Boot.HnRealNameBmwApplication.executor": "Run",
     "Spring Boot.LdlzApplication.executor": "Run",
@@ -84,7 +96,7 @@
     "project.structure.proportion": "0.15",
     "project.structure.side.proportion": "0.43843496",
     "run.configurations.included.in.services": "true",
-    "settings.editor.selected.configurable": "reference.projectsettings.compiler.javacompiler",
+    "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
@@ -126,7 +138,7 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.CzlServiceApplication">
+  <component name="RunManager" selected="Spring Boot.BonusGatewayApplication">
     <configuration name="BonusGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
       <module name="bonus-gateway" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.bonus.gateway.BonusGatewayApplication" />
@@ -213,11 +225,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Spring Boot.CzlServiceApplication" />
-        <item itemvalue="Spring Boot.LdlzApplication" />
         <item itemvalue="Spring Boot.BonusGatewayApplication" />
         <item itemvalue="Spring Boot.CzlScreenApplication" />
+        <item itemvalue="Spring Boot.CzlServiceApplication" />
         <item itemvalue="Spring Boot.RnmwApplication" />
+        <item itemvalue="Spring Boot.LdlzApplication" />
       </list>
     </recent_temporary>
   </component>
@@ -244,7 +256,7 @@
       <workItem from="1765424267744" duration="6360000" />
       <workItem from="1765509604008" duration="11703000" />
       <workItem from="1765847372970" duration="757000" />
-      <workItem from="1765855068157" duration="514000" />
+      <workItem from="1765855068157" duration="2140000" />
     </task>
     <task id="LOCAL-00001" summary="修改新增用户">
       <option name="closed" value="true" />
@@ -358,7 +370,15 @@
       <option name="project" value="LOCAL" />
       <updated>1765855232396</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="用户管理及下拉选查询接口开发">
+      <option name="closed" value="true" />
+      <created>1765855698513</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1765855698513</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/HnRealNameBmw/pom.xml b/HnRealNameBmw/pom.xml
index 2f977e9..28bea77 100644
--- a/HnRealNameBmw/pom.xml
+++ b/HnRealNameBmw/pom.xml
@@ -368,7 +368,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<scope>provided</scope>
+			<version>1.18.24</version>
 		</dependency>
 
 		<!-- Swagger 注解 -->
diff --git a/HnRealNameBmw/src/main/resources/bootstrap.yml b/HnRealNameBmw/src/main/resources/bootstrap.yml
index baa8905..d5bef71 100644
--- a/HnRealNameBmw/src/main/resources/bootstrap.yml
+++ b/HnRealNameBmw/src/main/resources/bootstrap.yml
@@ -20,7 +20,8 @@ spring:
     nacos:
       config:
         server-addr: 127.0.0.1:8848
-        namespace: 07736b2e-9922-415e-8624-50b275be556e
+        namespace: 289db019-a290-4903-ac1a-5d341af8b272
+        # namespace: 07736b2e-9922-415e-8624-50b275be556e
         # 配置文件格式
         file-extension: yml
         group: DEFAULT_GROUP
@@ -28,7 +29,8 @@ spring:
       discovery:
         # nacos地址
         server-addr: 127.0.0.1:8848
-        namespace: 07736b2e-9922-415e-8624-50b275be556e
+        namespace: 289db019-a290-4903-ac1a-5d341af8b272
+        # namespace: 07736b2e-9922-415e-8624-50b275be556e
 
 logging:
   level:
diff --git a/HnRealNameMw/pom.xml b/HnRealNameMw/pom.xml
index 2045e8a..8cc91d4 100644
--- a/HnRealNameMw/pom.xml
+++ b/HnRealNameMw/pom.xml
@@ -162,6 +162,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version> <!-- 替换原1.16.18，仅支持JDK1.8 -->
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/HnRealNameMw/src/main/resources/bootstrap.yml b/HnRealNameMw/src/main/resources/bootstrap.yml
index ba10a6b..2ff1dc9 100644
--- a/HnRealNameMw/src/main/resources/bootstrap.yml
+++ b/HnRealNameMw/src/main/resources/bootstrap.yml
@@ -20,7 +20,8 @@ spring:
     nacos:
       config:
         server-addr: 127.0.0.1:8848
-        namespace: 07736b2e-9922-415e-8624-50b275be556e
+        namespace: 289db019-a290-4903-ac1a-5d341af8b272
+        # namespace: 07736b2e-9922-415e-8624-50b275be556e
         # 配置文件格式
         file-extension: yml
         group: DEFAULT_GROUP
@@ -28,7 +29,8 @@ spring:
       discovery:
         # nacos地址
         server-addr: 127.0.0.1:8848
-        namespace: 07736b2e-9922-415e-8624-50b275be556e
+        namespace: 289db019-a290-4903-ac1a-5d341af8b272
+        # namespace: 07736b2e-9922-415e-8624-50b275be556e
 
 
 logging:
diff --git a/hn-czl-service/pom.xml b/hn-czl-service/pom.xml
index 50797cb..fd3a6d6 100644
--- a/hn-czl-service/pom.xml
+++ b/hn-czl-service/pom.xml
@@ -232,7 +232,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.16.18</version>
+			<version>1.18.24</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/hn-gateway/bonus-common/bonus-common-core/pom.xml b/hn-gateway/bonus-common/bonus-common-core/pom.xml
index 87fb193..cf63c35 100644
--- a/hn-gateway/bonus-common/bonus-common-core/pom.xml
+++ b/hn-gateway/bonus-common/bonus-common-core/pom.xml
@@ -125,6 +125,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
diff --git a/hn-gateway/bonus-gateway/pom.xml b/hn-gateway/bonus-gateway/pom.xml
index 39713d1..8a1072d 100644
--- a/hn-gateway/bonus-gateway/pom.xml
+++ b/hn-gateway/bonus-gateway/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
+            <version>1.18.24</version> <!-- 替换原1.16.18，仅支持JDK1.8 -->
         </dependency>
 
         <dependency>
diff --git a/hn_czl_screen/pom.xml b/hn_czl_screen/pom.xml
index 8789e1e..46ab38e 100644
--- a/hn_czl_screen/pom.xml
+++ b/hn_czl_screen/pom.xml
@@ -218,7 +218,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.16.18</version>
+			<version>1.18.24</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>