From 549e4f3b9750f02d8d37ffa5c2ec35b9a4cd770f Mon Sep 17 00:00:00 2001 From: gewuyou Date: Sat, 10 May 2025 13:41:55 +0800 Subject: [PATCH] =?UTF-8?q?build(deps):=20=E6=B7=BB=E5=8A=A0=20spring-clou?= =?UTF-8?q?d-starter-bootstrap=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 llmx-core 和 llmx-impl-bailian 模块中添加 spring-cloud-starter-bootstrap 依赖 - 更新 gradle/libs.versions.toml 文件，添加 springCloudStarter-bootstrap 依赖项 - 修改 application.yml 和 bootstrap.yml 文件，设置 spring.profiles.active 为 dev -移除 nacos 配置导入语句 --- build.gradle.kts | 1 + gradle/libs.versions.toml | 2 +- llmx-core/llmx-core-service/build.gradle.kts | 2 +- .../llmx-core-service/src/main/resources/application-test.yml | 1 - .../src/main/resources/{nacos-test.yml => bootstrap-test.yml} | 0 llmx-core/llmx-core-service/src/main/resources/bootstrap.yml | 3 +++ .../llmx-impl-bailian/src/main/resources/application-test.yml | 4 ---- .../llmx-impl-bailian/src/main/resources/application.yml | 2 ++ .../src/main/resources/{nacos-test.yml => bootstrap-test.yml} | 0 llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap.yml | 3 +++ 10 files changed, 11 insertions(+), 7 deletions(-) rename llmx-core/llmx-core-service/src/main/resources/{nacos-test.yml => bootstrap-test.yml} (100%) create mode 100644 llmx-core/llmx-core-service/src/main/resources/bootstrap.yml rename llmx-impl/llmx-impl-bailian/src/main/resources/{nacos-test.yml => bootstrap-test.yml} (100%) create mode 100644 llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap.yml diff --git a/build.gradle.kts b/build.gradle.kts index f685e60..320eca6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -78,6 +78,7 @@ subprojects { // Nacos 服务发现和配置 implementation(libs.springCloudStarter.alibaba.nacos.discovery) implementation(libs.springCloudStarter.alibaba.nacos.config) + implementation(libs.springCloudStarter.bootstrap) // 核心spi依赖 implementation(project(Modules.Core.SPI)) // okHttp依赖 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d3f400a..de1f6f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -45,7 +45,7 @@ springCloudStarter-alibaba-nacos-discovery = { group = "com.alibaba.cloud", name springCloudStarter-alibaba-nacos-config = { group = "com.alibaba.cloud", name = "spring-cloud-starter-alibaba-nacos-config", version.ref = "spring-cloud-starter-alibaba-nacos-discovery-version" } springCloudStarter-loadbalancer = { group = "org.springframework.cloud", name = "spring-cloud-starter-loadbalancer" } springCloudStarter-openfeign = { group = "org.springframework.cloud", name = "spring-cloud-starter-openfeign" } - +springCloudStarter-bootstrap = { group = "org.springframework.cloud", name = "spring-cloud-starter-bootstrap" } # SpringBootStarter springBootStarter-webflux = { group = "org.springframework.boot", name = "spring-boot-starter-webflux" } springBootStarter-web = { group = "org.springframework.boot", name = "spring-boot-starter-web" } diff --git a/llmx-core/llmx-core-service/build.gradle.kts b/llmx-core/llmx-core-service/build.gradle.kts index c8c72af..8116df6 100644 --- a/llmx-core/llmx-core-service/build.gradle.kts +++ b/llmx-core/llmx-core-service/build.gradle.kts @@ -4,10 +4,10 @@ extra { setProperty(ProjectFlags.USE_SPRING_CLOUD_BOM,true) } dependencies { - val libs = rootProject.libs // Nacos 服务发现和配置 implementation(libs.springCloudStarter.alibaba.nacos.discovery) implementation(libs.springCloudStarter.alibaba.nacos.config) + implementation(libs.springCloudStarter.bootstrap) // WebClient 和 Spring Cloud LoadBalancer implementation(libs.springBootStarter.webflux) diff --git a/llmx-core/llmx-core-service/src/main/resources/application-test.yml b/llmx-core/llmx-core-service/src/main/resources/application-test.yml index 3e862cb..3ef3967 100644 --- a/llmx-core/llmx-core-service/src/main/resources/application-test.yml +++ b/llmx-core/llmx-core-service/src/main/resources/application-test.yml @@ -3,7 +3,6 @@ server: spring: config: import: - - classpath:nacos-test.yml - nacos:llmx-core-service.yml?namespace=1a32d4f4-469a-4e10-ba3b-ce1bc6ba8cc9&group=test diff --git a/llmx-core/llmx-core-service/src/main/resources/nacos-test.yml b/llmx-core/llmx-core-service/src/main/resources/bootstrap-test.yml similarity index 100% rename from llmx-core/llmx-core-service/src/main/resources/nacos-test.yml rename to llmx-core/llmx-core-service/src/main/resources/bootstrap-test.yml diff --git a/llmx-core/llmx-core-service/src/main/resources/bootstrap.yml b/llmx-core/llmx-core-service/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..3d7808a --- /dev/null +++ b/llmx-core/llmx-core-service/src/main/resources/bootstrap.yml @@ -0,0 +1,3 @@ +spring: + profiles: + active: dev diff --git a/llmx-impl/llmx-impl-bailian/src/main/resources/application-test.yml b/llmx-impl/llmx-impl-bailian/src/main/resources/application-test.yml index c475634..ba3f858 100644 --- a/llmx-impl/llmx-impl-bailian/src/main/resources/application-test.yml +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/application-test.yml @@ -3,8 +3,4 @@ server: spring: config: import: - - classpath:nacos-test.yml - nacos:llmx-impl-bailian.yml?namespace=da45f3a6-e7d0-4d92-b075-776adea07d6d&group=test - application: - name: llmx-impl-bailian - diff --git a/llmx-impl/llmx-impl-bailian/src/main/resources/application.yml b/llmx-impl/llmx-impl-bailian/src/main/resources/application.yml index caf4dfc..66ff8f8 100644 --- a/llmx-impl/llmx-impl-bailian/src/main/resources/application.yml +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/application.yml @@ -1,3 +1,5 @@ spring: + application: + name: llmx-impl-bailian profiles: active: dev \ No newline at end of file diff --git a/llmx-impl/llmx-impl-bailian/src/main/resources/nacos-test.yml b/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-test.yml similarity index 100% rename from llmx-impl/llmx-impl-bailian/src/main/resources/nacos-test.yml rename to llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-test.yml diff --git a/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap.yml b/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..3d7808a --- /dev/null +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap.yml @@ -0,0 +1,3 @@ +spring: + profiles: + active: dev