统一版本

This commit is contained in:
haozq 2025-12-16 14:03:11 +08:00
parent dada22dfa4
commit fd56568ea8
10 changed files with 49 additions and 20 deletions

View File

@ -4,16 +4,17 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <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$/.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$/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$/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-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-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/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-gateway/bonus-gateway/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-gateway/pom.xml" 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_czl_screen/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn_czl_screen/pom.xml" 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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -76,14 +77,14 @@
"RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.git.unshallow": "true", "RunOnceActivity.git.unshallow": "true",
"SONARLINT_PRECOMMIT_ANALYSIS": "true", "SONARLINT_PRECOMMIT_ANALYSIS": "true",
"Spring Boot.BonusGatewayApplication.executor": "Run", "Spring Boot.BonusGatewayApplication.executor": "Debug",
"Spring Boot.CzlScreenApplication.executor": "Run", "Spring Boot.CzlScreenApplication.executor": "Run",
"Spring Boot.CzlServiceApplication.executor": "Run", "Spring Boot.CzlServiceApplication.executor": "Run",
"Spring Boot.HnRealNameBmwApplication.executor": "Run", "Spring Boot.HnRealNameBmwApplication.executor": "Run",
"Spring Boot.LdlzApplication.executor": "Run", "Spring Boot.LdlzApplication.executor": "Run",
"Spring Boot.RealNameAppApplication.executor": "Debug", "Spring Boot.RealNameAppApplication.executor": "Run",
"Spring Boot.RnamaApplication.executor": "Run", "Spring Boot.RnamaApplication.executor": "Run",
"Spring Boot.RnmwApplication.executor": "Debug", "Spring Boot.RnmwApplication.executor": "Run",
"git-widget-placeholder": "main", "git-widget-placeholder": "main",
"kotlin-language-version-configured": "true", "kotlin-language-version-configured": "true",
"last_opened_file_path": "F:/workspace/idea/hn_cloud_service", "last_opened_file_path": "F:/workspace/idea/hn_cloud_service",
@ -138,7 +139,7 @@
</set> </set>
</option> </option>
</component> </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"> <configuration name="BonusGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
<module name="bonus-gateway" /> <module name="bonus-gateway" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.bonus.gateway.BonusGatewayApplication" /> <option name="SPRING_BOOT_MAIN_CLASS" value="com.bonus.gateway.BonusGatewayApplication" />
@ -225,11 +226,11 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <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.RnmwApplication" />
<item itemvalue="Spring Boot.CzlScreenApplication" />
<item itemvalue="Spring Boot.BonusGatewayApplication" />
<item itemvalue="Spring Boot.LdlzApplication" /> <item itemvalue="Spring Boot.LdlzApplication" />
<item itemvalue="Spring Boot.CzlServiceApplication" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -256,7 +257,7 @@
<workItem from="1765424267744" duration="6360000" /> <workItem from="1765424267744" duration="6360000" />
<workItem from="1765509604008" duration="11703000" /> <workItem from="1765509604008" duration="11703000" />
<workItem from="1765847372970" duration="757000" /> <workItem from="1765847372970" duration="757000" />
<workItem from="1765855068157" duration="2140000" /> <workItem from="1765855068157" duration="4670000" />
</task> </task>
<task id="LOCAL-00001" summary="修改新增用户"> <task id="LOCAL-00001" summary="修改新增用户">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -378,7 +379,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1765855698513</updated> <updated>1765855698513</updated>
</task> </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 /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -400,7 +409,8 @@
<MESSAGE value="自动登录" /> <MESSAGE value="自动登录" />
<MESSAGE value="添加app子服务" /> <MESSAGE value="添加app子服务" />
<MESSAGE value="用户管理及下拉选查询接口开发" /> <MESSAGE value="用户管理及下拉选查询接口开发" />
<option name="LAST_COMMIT_MESSAGE" value="用户管理及下拉选查询接口开发" /> <MESSAGE value="统一版本" />
<option name="LAST_COMMIT_MESSAGE" value="统一版本" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>

View File

@ -25,6 +25,8 @@ spring:
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
group: DEFAULT_GROUP group: DEFAULT_GROUP
#共享配置文件
shared-dataids: application-dev.yml
# nacos.core.auth.enabled=true 开启权限验证 # nacos.core.auth.enabled=true 开启权限验证
discovery: discovery:
# nacos地址 # nacos地址

View File

@ -25,6 +25,8 @@ spring:
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
group: DEFAULT_GROUP group: DEFAULT_GROUP
#共享配置文件
shared-dataids: application-dev.yml
# nacos.core.auth.enabled=true 开启权限验证 # nacos.core.auth.enabled=true 开启权限验证
discovery: discovery:
# nacos地址 # nacos地址

View File

@ -33,6 +33,8 @@ spring:
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
group: DEFAULT_GROUP group: DEFAULT_GROUP
#共享配置文件
shared-dataids: application-dev.yml
logging: logging:
level: level:

View File

@ -16,6 +16,8 @@ spring:
namespace: 289db019-a290-4903-ac1a-5d341af8b272 namespace: 289db019-a290-4903-ac1a-5d341af8b272
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
#共享配置文件
shared-dataids: application-dev.yml
# 共享配置 # 共享配置
shared-configs: shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

View File

@ -10,6 +10,7 @@ spring:
discovery: discovery:
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272 namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e # namespace: 07736b2e-9922-415e-8624-50b275be556e
config: config:
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
@ -18,3 +19,5 @@ spring:
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
group: DEFAULT_GROUP group: DEFAULT_GROUP
#共享配置文件
shared-dataids: application-dev.yml

View File

@ -16,3 +16,5 @@ spring:
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
group: DEFAULT_GROUP group: DEFAULT_GROUP
#共享配置文件
shared-dataids: application-dev.yml

View File

@ -33,6 +33,8 @@ spring:
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
group: DEFAULT_GROUP group: DEFAULT_GROUP
#共享配置文件
shared-dataids: application-dev.yml
logging: logging:

View File

@ -181,7 +181,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.16.18</version> <version>1.18.24</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--jackson core--> <!--jackson core-->

View File

@ -20,15 +20,19 @@ spring:
nacos: nacos:
config: config:
server-addr: 127.0.0.1:8848 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 file-extension: yml
group: DEFAULT_GROUP group: DEFAULT_GROUP
#共享配置文件
shared-dataids: application-dev.yml
# nacos.core.auth.enabled=true 开启权限验证 # nacos.core.auth.enabled=true 开启权限验证
discovery: discovery:
# nacos地址 # nacos地址
server-addr: 127.0.0.1:8848 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: logging:
level: level: