diff --git a/build.gradle.kts b/build.gradle.kts index 1e755df..f685e60 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -77,6 +77,7 @@ subprojects { dependencies { // Nacos 服务发现和配置 implementation(libs.springCloudStarter.alibaba.nacos.discovery) + implementation(libs.springCloudStarter.alibaba.nacos.config) // 核心spi依赖 implementation(project(Modules.Core.SPI)) // okHttp依赖 diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml index 8f3f9de..7500bbb 100644 --- a/docker/docker-compose.test.yml +++ b/docker/docker-compose.test.yml @@ -11,7 +11,8 @@ services: - llmx-net-test environment: MODE: standalone # 显式指定为单体模式 - NACOS_AUTH_ENABLE: "false" # 👈 关闭鉴权 + NACOS_AUTH_ENABLE: "true" # ✅ 开启鉴权 + NACOS_AUTH_CACHE_ENABLE: "false" volumes: - llmx-nacos-volume:/nacos/data llmx-core-service: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c45ef2..d3f400a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,6 +42,7 @@ aliyun-bailian = { group = "com.aliyun", name = "bailian20231229", version.ref = # SrpingCloud springCloudStarter-alibaba-nacos-discovery = { group = "com.alibaba.cloud", name = "spring-cloud-starter-alibaba-nacos-discovery", version.ref = "spring-cloud-starter-alibaba-nacos-discovery-version" } +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" } diff --git a/llmx-core/llmx-core-service/build.gradle.kts b/llmx-core/llmx-core-service/build.gradle.kts index a1e96b5..c8c72af 100644 --- a/llmx-core/llmx-core-service/build.gradle.kts +++ b/llmx-core/llmx-core-service/build.gradle.kts @@ -7,6 +7,7 @@ dependencies { val libs = rootProject.libs // Nacos 服务发现和配置 implementation(libs.springCloudStarter.alibaba.nacos.discovery) + implementation(libs.springCloudStarter.alibaba.nacos.config) // 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 0b5b82a..53ea532 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 @@ -2,13 +2,6 @@ server: port: 9002 spring: config: - import: classpath:bootstrap-test.yml -llmx: - model-route: - modelServiceMap: - qwen-turbo: llmx-impl-bailian - qwen-max: llmx-impl-bailian - qwen-plus: llmx-impl-bailian - qwen-vl-max-latest: llmx-impl-bailian + import: classpath:nacos-test.yml diff --git a/llmx-core/llmx-core-service/src/main/resources/bootstrap-test.yml b/llmx-core/llmx-core-service/src/main/resources/bootstrap-test.yml deleted file mode 100644 index d22c560..0000000 --- a/llmx-core/llmx-core-service/src/main/resources/bootstrap-test.yml +++ /dev/null @@ -1,6 +0,0 @@ -spring: - cloud: - nacos: - server-addr: llmx-nacos:8848 - discovery: - server-addr: ${spring.cloud.nacos.server-addr} \ No newline at end of file diff --git a/llmx-core/llmx-core-service/src/main/resources/nacos-test.yml b/llmx-core/llmx-core-service/src/main/resources/nacos-test.yml new file mode 100644 index 0000000..548e46f --- /dev/null +++ b/llmx-core/llmx-core-service/src/main/resources/nacos-test.yml @@ -0,0 +1,14 @@ +spring: + cloud: + nacos: + server-addr: llmx-nacos:8848 + discovery: + server-addr: ${spring.cloud.nacos.server-addr} + config: + server-addr: ${spring.cloud.nacos.server-addr} + file-extension: yaml + namespace: 8720bd0b-1a64-418e-a922-7b92cd16d54b + shared-configs: + - data-id: llmx-core-service.yml + refresh: true + group: test \ No newline at end of file diff --git a/llmx-impl/llmx-impl-bailian/src/main/resources/application-prod.yml b/llmx-impl/llmx-impl-bailian/src/main/resources/application-master.yml similarity index 96% rename from llmx-impl/llmx-impl-bailian/src/main/resources/application-prod.yml rename to llmx-impl/llmx-impl-bailian/src/main/resources/application-master.yml index 276545e..292217d 100644 --- a/llmx-impl/llmx-impl-bailian/src/main/resources/application-prod.yml +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/application-master.yml @@ -2,7 +2,7 @@ server: port: 9003 spring: application: - name: llmx-impl-baiLian + name: llmx-impl-bailian cloud: nacos: discovery: 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 5e8cc5b..44b2dde 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 @@ -2,20 +2,7 @@ server: port: 9003 spring: config: - import: classpath:bootstrap-test.yml + import: classpath:nacos-test.yml application: name: llmx-impl-bailian -# 阿里云配置 -aliyun: - # DashScope服务配置 - dash: - # 访问凭证配置 - scope: - access-key-id: LTAI5tHiA2Ry3XTAfoSEJW6z # 阿里云访问密钥ID - access-key-secret: K5sf4FxZZuUgLEFnyfepBfMqFGmDcD # 阿里云访问密钥密钥 - endpoint: bailian.cn-beijing.aliyuncs.com # 阿里云服务端点 - workspace-id: llm-axfkuqft05uzbjpi # 工作区ID - api-key: sk-78af4dd964a94f4cb373851064dbdc12 # API密钥 - app-id: 3fae0bbab2e54a90a37aa02cd12dd62c # 应用ID - base-url: https://dashscope.aliyuncs.com/api/v1/apps/ # 基础API URL - multimodality-url: https://dashscope.aliyuncs.com/api/v1/services/aigc/multimodal-generation/generation + 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 e7bb9d6..caf4dfc 100644 --- a/llmx-impl/llmx-impl-bailian/src/main/resources/application.yml +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/application.yml @@ -1,18 +1,3 @@ spring: - application: - name: llmx-impl-baiLian profiles: - active: dev -# 阿里云配置 -aliyun: - # DashScope服务配置 - dash: - # 访问凭证配置 - scope: - access-key-id: LTAI5tHiA2Ry3XTAfoSEJW6z # 阿里云访问密钥ID - access-key-secret: K5sf4FxZZuUgLEFnyfepBfMqFGmDcD # 阿里云访问密钥密钥 - endpoint: bailian.cn-beijing.aliyuncs.com # 阿里云服务端点 - workspace-id: llm-axfkuqft05uzbjpi # 工作区ID - api-key: sk-78af4dd964a94f4cb373851064dbdc12 # API密钥 - app-id: 3fae0bbab2e54a90a37aa02cd12dd62c # 应用ID - base-url: https://dashscope.aliyuncs.com/api/v1/apps/ # 基础API URL \ No newline at end of file + active: dev \ No newline at end of file diff --git a/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-test.yml b/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-test.yml deleted file mode 100644 index d22c560..0000000 --- a/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-test.yml +++ /dev/null @@ -1,6 +0,0 @@ -spring: - cloud: - nacos: - server-addr: llmx-nacos:8848 - discovery: - server-addr: ${spring.cloud.nacos.server-addr} \ 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/nacos-test.yml new file mode 100644 index 0000000..1eee04e --- /dev/null +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/nacos-test.yml @@ -0,0 +1,14 @@ +spring: + cloud: + nacos: + server-addr: llmx-nacos:8848 + discovery: + server-addr: ${spring.cloud.nacos.server-addr} + config: + server-addr: ${spring.cloud.nacos.server-addr} + file-extension: yaml + namespace: 2067164e-f3c1-4545-86eb-db13912af42e + shared-configs: + - data-id: llmx-impl-bailian.yml + refresh: true + group: test \ No newline at end of file