JCNC/LLMX
2
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(llmx): 重构配置文件并增强 Nacos 配置支持 #27

Merged
gewuyou merged 1 commits from dev into test 2025-05-10 11:37:49 +08:00
Conversation 0 Commits 1 Files Changed 12 +38 -53
12 changed files with 38 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44bba93112 - Show all commits

1
build.gradle.kts
View File

@ -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依赖

3
docker/docker-compose.test.yml
View File

@ -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:

1
gradle/libs.versions.toml
View File

@ -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" }

1
llmx-core/llmx-core-service/build.gradle.kts
View File

@ -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)

9
llmx-core/llmx-core-service/src/main/resources/application-test.yml
View File

@ -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

6
llmx-core/llmx-core-service/src/main/resources/bootstrap-test.yml
View File

@ -1,6 +0,0 @@
spring:
cloud:
nacos:
server-addr: llmx-nacos:8848
discovery:
server-addr: ${spring.cloud.nacos.server-addr}

14
llmx-core/llmx-core-service/src/main/resources/nacos-test.yml Normal file
View File

@ -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
llmx-impl/llmx-impl-bailian/src/main/resources/application-prod.yml → llmx-impl/llmx-impl-bailian/src/main/resources/application-master.yml
View File

@ -2,7 +2,7 @@ server:
port: 9003
spring:
application:
name: llmx-impl-baiLian
name: llmx-impl-bailian
cloud:
nacos:
discovery:

17
llmx-impl/llmx-impl-bailian/src/main/resources/application-test.yml
View File

@ -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

15
llmx-impl/llmx-impl-bailian/src/main/resources/application.yml
View File

@ -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

6
llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-test.yml
View File

@ -1,6 +0,0 @@
spring:
cloud:
nacos:
server-addr: llmx-nacos:8848
discovery:
server-addr: ${spring.cloud.nacos.server-addr}

14
llmx-impl/llmx-impl-bailian/src/main/resources/nacos-test.yml Normal file
View File

@ -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