ci:简化配置文件并统一 Nacos 配置- 移除了 application-dev.yml 和 application-test.yml 中的冗余配置
All checks were successful
CI/CD Pipeline / build-and-deploy (push) Successful in 2m27s

- 调整了 bootstrap-dev.yml 和 bootstrap-test.yml 中的 Nacos 配置格式
- 在 bootstrap 文件中添加了 common-db.yaml 配置
- 修改了 Docker Compose 文件中的数据库名称
This commit is contained in:
gewuyou 2025-05-10 19:08:05 +08:00
parent f3882418d9
commit 636b589a9e
9 changed files with 19 additions and 32 deletions

View File

@ -51,7 +51,7 @@ services:
networks: networks:
- llmx-net-test - llmx-net-test
environment: environment:
POSTGRES_DB: llmx_core POSTGRES_DB: llmx_db
POSTGRES_USER: llmx POSTGRES_USER: llmx
POSTGRES_PASSWORD: L4s6f9y3, POSTGRES_PASSWORD: L4s6f9y3,
volumes: volumes:

View File

@ -1,4 +1,2 @@
server: server:
port: 8081 port: 8081

View File

@ -1,8 +1,4 @@
server: server:
port: 9002 port: 9002
spring:
config:
import:
- nacos:llmx-core-service.yml?namespace=1a32d4f4-469a-4e10-ba3b-ce1bc6ba8cc9&group=test

View File

@ -1,15 +1,15 @@
spring: spring:
cloud: cloud:
nacos: nacos:
ip: 192.168.1.100
username: nacos username: nacos
password: L4s6f9y3, password: L4s6f9y3,
server-addr: 49.235.96.75:8848 server-addr: 49.235.96.75:8848
ip: 192.168.1.100
discovery: discovery:
server-addr: ${spring.cloud.nacos.server-addr} ip: ${spring.cloud.nacos.ip}
username: ${spring.cloud.nacos.username} username: ${spring.cloud.nacos.username}
password: ${spring.cloud.nacos.password} password: ${spring.cloud.nacos.password}
ip: ${spring.cloud.nacos.ip} server-addr: ${spring.cloud.nacos.server-addr}
config: config:
file-extension: yaml file-extension: yaml
namespace: a17d57ec-4fd9-44c7-a617-7f6003a0b332 namespace: a17d57ec-4fd9-44c7-a617-7f6003a0b332
@ -18,3 +18,6 @@ spring:
- data-id: ${spring.application.name}-${spring.profiles.active}.yaml - data-id: ${spring.application.name}-${spring.profiles.active}.yaml
refresh: true refresh: true
group: ${spring.application.name} group: ${spring.application.name}
- data-id: common-db.yaml
refresh: true
group: infra

View File

@ -16,3 +16,6 @@ spring:
- data-id: ${spring.application.name}-${spring.profiles.active}.yaml - data-id: ${spring.application.name}-${spring.profiles.active}.yaml
refresh: true refresh: true
group: ${spring.application.name} group: ${spring.application.name}
- data-id: common-db.yaml
refresh: true
group: infra

View File

@ -1,11 +1,2 @@
server: server:
port: 8082 port: 8082
spring:
config:
import: classpath:bootstrap-dev.yml
application:
name: llmx-impl-baiLian
cloud:
nacos:
discovery:
server-addr: 49.235.96.75:8848 # Nacos 服务地址

View File

@ -1,6 +1,2 @@
server: server:
port: 9003 port: 9003
spring:
config:
import:
- nacos:llmx-impl-bailian.yml?namespace=da45f3a6-e7d0-4d92-b075-776adea07d6d&group=test

View File

@ -1,15 +1,15 @@
spring: spring:
cloud: cloud:
nacos: nacos:
ip: 192.168.1.100
username: nacos username: nacos
password: L4s6f9y3, password: L4s6f9y3,
server-addr: 49.235.96.75:8848 server-addr: 49.235.96.75:8848
ip: 192.168.1.100
discovery: discovery:
server-addr: ${spring.cloud.nacos.server-addr} ip: ${spring.cloud.nacos.ip}
username: ${spring.cloud.nacos.username} username: ${spring.cloud.nacos.username}
password: ${spring.cloud.nacos.password} password: ${spring.cloud.nacos.password}
ip: ${spring.cloud.nacos.ip} server-addr: ${spring.cloud.nacos.server-addr}
config: config:
file-extension: yaml file-extension: yaml
namespace: a17d57ec-4fd9-44c7-a617-7f6003a0b332 namespace: a17d57ec-4fd9-44c7-a617-7f6003a0b332

View File

@ -1,13 +1,13 @@
spring: spring:
cloud: cloud:
nacos: nacos:
server-addr: llmx-nacos:8848
username: nacos username: nacos
password: L4s6f9y3, password: L4s6f9y3,
server-addr: llmx-nacos:8848
discovery: discovery:
server-addr: ${spring.cloud.nacos.server-addr}
username: ${spring.cloud.nacos.username} username: ${spring.cloud.nacos.username}
password: ${spring.cloud.nacos.password} password: ${spring.cloud.nacos.password}
server-addr: ${spring.cloud.nacos.server-addr}
config: config:
file-extension: yaml file-extension: yaml
namespace: 54a289f7-5f4a-4c83-8a0a-199defa35458 namespace: 54a289f7-5f4a-4c83-8a0a-199defa35458