From fd56568ea8c39066a25b75cfbdcf10c4d11da54a Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 16 Dec 2025 14:03:11 +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                           | 44 ++++++++++++-------
 .../src/main/resources/bootstrap.yml          |  2 +
 HnRealNameMw/src/main/resources/bootstrap.yml |  2 +
 .../src/main/resources/bootstrap.yml          |  2 +
 .../src/main/resources/bootstrap-dev.yml      |  2 +
 .../src/main/resources/bootstrap-druid.yml    |  3 ++
 .../src/main/resources/bootstrap-prod.yml     |  2 +
 .../src/main/resources/bootstrap.yml          |  2 +
 realname-app/pom.xml                          |  2 +-
 realname-app/src/main/resources/bootstrap.yml |  8 +++-
 10 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ba39c46..5e271b5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,16 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="30706c6d-35cd-44ba-b6ec-9865ccea7a75" name="Changes" comment="用户管理及下拉选查询接口开发">
+    <list default="true" id="30706c6d-35cd-44ba-b6ec-9865ccea7a75" name="Changes" comment="统一版本">
       <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" />
+      <change beforePath="$PROJECT_DIR$/hn-czl-service/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-czl-service/src/main/resources/bootstrap.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hn-gateway/bonus-gateway/src/main/resources/bootstrap-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-gateway/src/main/resources/bootstrap-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-druid.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-prod.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hn_czl_screen/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/hn_czl_screen/src/main/resources/bootstrap.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/realname-app/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/realname-app/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/realname-app/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/realname-app/src/main/resources/bootstrap.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -76,14 +77,14 @@
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
     "SONARLINT_PRECOMMIT_ANALYSIS": "true",
-    "Spring Boot.BonusGatewayApplication.executor": "Run",
+    "Spring Boot.BonusGatewayApplication.executor": "Debug",
     "Spring Boot.CzlScreenApplication.executor": "Run",
     "Spring Boot.CzlServiceApplication.executor": "Run",
     "Spring Boot.HnRealNameBmwApplication.executor": "Run",
     "Spring Boot.LdlzApplication.executor": "Run",
-    "Spring Boot.RealNameAppApplication.executor": "Debug",
+    "Spring Boot.RealNameAppApplication.executor": "Run",
     "Spring Boot.RnamaApplication.executor": "Run",
-    "Spring Boot.RnmwApplication.executor": "Debug",
+    "Spring Boot.RnmwApplication.executor": "Run",
     "git-widget-placeholder": "main",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "F:/workspace/idea/hn_cloud_service",
@@ -138,7 +139,7 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.BonusGatewayApplication">
+  <component name="RunManager" selected="Spring Boot.RealNameAppApplication">
     <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" />
@@ -225,11 +226,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Spring Boot.BonusGatewayApplication" />
-        <item itemvalue="Spring Boot.CzlScreenApplication" />
-        <item itemvalue="Spring Boot.CzlServiceApplication" />
         <item itemvalue="Spring Boot.RnmwApplication" />
+        <item itemvalue="Spring Boot.CzlScreenApplication" />
+        <item itemvalue="Spring Boot.BonusGatewayApplication" />
         <item itemvalue="Spring Boot.LdlzApplication" />
+        <item itemvalue="Spring Boot.CzlServiceApplication" />
       </list>
     </recent_temporary>
   </component>
@@ -256,7 +257,7 @@
       <workItem from="1765424267744" duration="6360000" />
       <workItem from="1765509604008" duration="11703000" />
       <workItem from="1765847372970" duration="757000" />
-      <workItem from="1765855068157" duration="2140000" />
+      <workItem from="1765855068157" duration="4670000" />
     </task>
     <task id="LOCAL-00001" summary="修改新增用户">
       <option name="closed" value="true" />
@@ -378,7 +379,15 @@
       <option name="project" value="LOCAL" />
       <updated>1765855698513</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="统一版本">
+      <option name="closed" value="true" />
+      <created>1765861921592</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1765861921592</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -400,7 +409,8 @@
     <MESSAGE value="自动登录" />
     <MESSAGE value="添加app子服务" />
     <MESSAGE value="用户管理及下拉选查询接口开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="用户管理及下拉选查询接口开发" />
+    <MESSAGE value="统一版本" />
+    <option name="LAST_COMMIT_MESSAGE" value="统一版本" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/HnRealNameBmw/src/main/resources/bootstrap.yml b/HnRealNameBmw/src/main/resources/bootstrap.yml
index d5bef71..b3e092a 100644
--- a/HnRealNameBmw/src/main/resources/bootstrap.yml
+++ b/HnRealNameBmw/src/main/resources/bootstrap.yml
@@ -25,6 +25,8 @@ spring:
         # 配置文件格式
         file-extension: yml
         group: DEFAULT_GROUP
+        #共享配置文件
+        shared-dataids: application-dev.yml
       # nacos.core.auth.enabled=true 开启权限验证
       discovery:
         # nacos地址
diff --git a/HnRealNameMw/src/main/resources/bootstrap.yml b/HnRealNameMw/src/main/resources/bootstrap.yml
index 2ff1dc9..4cbe1f4 100644
--- a/HnRealNameMw/src/main/resources/bootstrap.yml
+++ b/HnRealNameMw/src/main/resources/bootstrap.yml
@@ -25,6 +25,8 @@ spring:
         # 配置文件格式
         file-extension: yml
         group: DEFAULT_GROUP
+        #共享配置文件
+        shared-dataids: application-dev.yml
       # nacos.core.auth.enabled=true 开启权限验证
       discovery:
         # nacos地址
diff --git a/hn-czl-service/src/main/resources/bootstrap.yml b/hn-czl-service/src/main/resources/bootstrap.yml
index b942316..3485d6b 100644
--- a/hn-czl-service/src/main/resources/bootstrap.yml
+++ b/hn-czl-service/src/main/resources/bootstrap.yml
@@ -33,6 +33,8 @@ spring:
         # 配置文件格式
         file-extension: yml
         group: DEFAULT_GROUP
+        #共享配置文件
+        shared-dataids: application-dev.yml
 
 logging:
   level:
diff --git a/hn-gateway/bonus-gateway/src/main/resources/bootstrap-dev.yml b/hn-gateway/bonus-gateway/src/main/resources/bootstrap-dev.yml
index bcac266..b398308 100644
--- a/hn-gateway/bonus-gateway/src/main/resources/bootstrap-dev.yml
+++ b/hn-gateway/bonus-gateway/src/main/resources/bootstrap-dev.yml
@@ -16,6 +16,8 @@ spring:
         namespace: 289db019-a290-4903-ac1a-5d341af8b272
         # 配置文件格式
         file-extension: yml
+        #共享配置文件
+        shared-dataids: application-dev.yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-druid.yml b/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-druid.yml
index 2d6f160..08fee11 100644
--- a/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-druid.yml
+++ b/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-druid.yml
@@ -10,6 +10,7 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
         namespace: 289db019-a290-4903-ac1a-5d341af8b272
+
        # namespace: 07736b2e-9922-415e-8624-50b275be556e
       config:
         server-addr: 127.0.0.1:8848
@@ -18,3 +19,5 @@ spring:
         # 配置文件格式
         file-extension: yml
         group: DEFAULT_GROUP
+        #共享配置文件
+        shared-dataids: application-dev.yml
\ No newline at end of file
diff --git a/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-prod.yml b/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-prod.yml
index 840d1e5..eeddbcc 100644
--- a/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-prod.yml
+++ b/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-prod.yml
@@ -16,3 +16,5 @@ spring:
                 # 配置文件格式
                 file-extension: yml
                 group: DEFAULT_GROUP
+                #共享配置文件
+                shared-dataids: application-dev.yml
\ No newline at end of file
diff --git a/hn_czl_screen/src/main/resources/bootstrap.yml b/hn_czl_screen/src/main/resources/bootstrap.yml
index c08e023..e90f28f 100644
--- a/hn_czl_screen/src/main/resources/bootstrap.yml
+++ b/hn_czl_screen/src/main/resources/bootstrap.yml
@@ -33,6 +33,8 @@ spring:
         # 配置文件格式
         file-extension: yml
         group: DEFAULT_GROUP
+        #共享配置文件
+        shared-dataids: application-dev.yml
 
 
 logging:
diff --git a/realname-app/pom.xml b/realname-app/pom.xml
index e35651f..5c8311d 100644
--- a/realname-app/pom.xml
+++ b/realname-app/pom.xml
@@ -181,7 +181,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <!--jackson core-->
diff --git a/realname-app/src/main/resources/bootstrap.yml b/realname-app/src/main/resources/bootstrap.yml
index 8142010..933d13d 100644
--- a/realname-app/src/main/resources/bootstrap.yml
+++ b/realname-app/src/main/resources/bootstrap.yml
@@ -20,15 +20,19 @@ 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
+        #共享配置文件
+        shared-dataids: application-dev.yml
       # nacos.core.auth.enabled=true 开启权限验证
       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: