refactor(llmx): 重构配置文件并增强 Nacos 配置支持
All checks were successful
CI/CD Pipeline / build-and-deploy (push) Successful in 7m17s
All checks were successful
CI/CD Pipeline / build-and-deploy (push) Successful in 7m17s
- 移除 application.yml 中的阿里云配置 -重命名 application-prod.yml 为 application-master.yml - 更新 application-test.yml 文件,移除阿里云配置 - 删除 bootstrap-test.yml 文件- 新增 nacos-test.yml 文件,用于 Nacos 配置- 更新 build.gradle.kts 文件,添加 Nacos 配置支持- 更新 docker-compose.test.yml,开启 Nacos 鉴权
This commit is contained in:
parent
f4d8aee52d
commit
44bba93112
@ -77,6 +77,7 @@ subprojects {
|
|||||||
dependencies {
|
dependencies {
|
||||||
// Nacos 服务发现和配置
|
// Nacos 服务发现和配置
|
||||||
implementation(libs.springCloudStarter.alibaba.nacos.discovery)
|
implementation(libs.springCloudStarter.alibaba.nacos.discovery)
|
||||||
|
implementation(libs.springCloudStarter.alibaba.nacos.config)
|
||||||
// 核心spi依赖
|
// 核心spi依赖
|
||||||
implementation(project(Modules.Core.SPI))
|
implementation(project(Modules.Core.SPI))
|
||||||
// okHttp依赖
|
// okHttp依赖
|
||||||
|
|||||||
@ -11,7 +11,8 @@ services:
|
|||||||
- llmx-net-test
|
- llmx-net-test
|
||||||
environment:
|
environment:
|
||||||
MODE: standalone # 显式指定为单体模式
|
MODE: standalone # 显式指定为单体模式
|
||||||
NACOS_AUTH_ENABLE: "false" # 👈 关闭鉴权
|
NACOS_AUTH_ENABLE: "true" # ✅ 开启鉴权
|
||||||
|
NACOS_AUTH_CACHE_ENABLE: "false"
|
||||||
volumes:
|
volumes:
|
||||||
- llmx-nacos-volume:/nacos/data
|
- llmx-nacos-volume:/nacos/data
|
||||||
llmx-core-service:
|
llmx-core-service:
|
||||||
|
|||||||
@ -42,6 +42,7 @@ aliyun-bailian = { group = "com.aliyun", name = "bailian20231229", version.ref =
|
|||||||
|
|
||||||
# SrpingCloud
|
# 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-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-loadbalancer = { group = "org.springframework.cloud", name = "spring-cloud-starter-loadbalancer" }
|
||||||
springCloudStarter-openfeign = { group = "org.springframework.cloud", name = "spring-cloud-starter-openfeign" }
|
springCloudStarter-openfeign = { group = "org.springframework.cloud", name = "spring-cloud-starter-openfeign" }
|
||||||
|
|
||||||
|
|||||||
@ -7,6 +7,7 @@ dependencies {
|
|||||||
val libs = rootProject.libs
|
val libs = rootProject.libs
|
||||||
// Nacos 服务发现和配置
|
// Nacos 服务发现和配置
|
||||||
implementation(libs.springCloudStarter.alibaba.nacos.discovery)
|
implementation(libs.springCloudStarter.alibaba.nacos.discovery)
|
||||||
|
implementation(libs.springCloudStarter.alibaba.nacos.config)
|
||||||
|
|
||||||
// WebClient 和 Spring Cloud LoadBalancer
|
// WebClient 和 Spring Cloud LoadBalancer
|
||||||
implementation(libs.springBootStarter.webflux)
|
implementation(libs.springBootStarter.webflux)
|
||||||
|
|||||||
@ -2,13 +2,6 @@ server:
|
|||||||
port: 9002
|
port: 9002
|
||||||
spring:
|
spring:
|
||||||
config:
|
config:
|
||||||
import: classpath:bootstrap-test.yml
|
import: classpath:nacos-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
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +0,0 @@
|
|||||||
spring:
|
|
||||||
cloud:
|
|
||||||
nacos:
|
|
||||||
server-addr: llmx-nacos:8848
|
|
||||||
discovery:
|
|
||||||
server-addr: ${spring.cloud.nacos.server-addr}
|
|
||||||
@ -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
|
||||||
@ -2,7 +2,7 @@ server:
|
|||||||
port: 9003
|
port: 9003
|
||||||
spring:
|
spring:
|
||||||
application:
|
application:
|
||||||
name: llmx-impl-baiLian
|
name: llmx-impl-bailian
|
||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
@ -2,20 +2,7 @@ server:
|
|||||||
port: 9003
|
port: 9003
|
||||||
spring:
|
spring:
|
||||||
config:
|
config:
|
||||||
import: classpath:bootstrap-test.yml
|
import: classpath:nacos-test.yml
|
||||||
application:
|
application:
|
||||||
name: llmx-impl-bailian
|
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
|
|
||||||
|
|||||||
@ -1,18 +1,3 @@
|
|||||||
spring:
|
spring:
|
||||||
application:
|
|
||||||
name: llmx-impl-baiLian
|
|
||||||
profiles:
|
profiles:
|
||||||
active: dev
|
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
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
spring:
|
|
||||||
cloud:
|
|
||||||
nacos:
|
|
||||||
server-addr: llmx-nacos:8848
|
|
||||||
discovery:
|
|
||||||
server-addr: ${spring.cloud.nacos.server-addr}
|
|
||||||
@ -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
|
||||||
Loading…
x
Reference in New Issue
Block a user