From 636b589a9efd57d63065c2d535d8c5557fa91cd0 Mon Sep 17 00:00:00 2001 From: gewuyou Date: Sat, 10 May 2025 19:08:05 +0800 Subject: [PATCH] =?UTF-8?q?ci:=E7=AE=80=E5=8C=96=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=B9=B6=E7=BB=9F=E4=B8=80=20Nacos=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=20=E7=A7=BB=E9=99=A4=E4=BA=86=20application?= =?UTF-8?q?-dev.yml=20=E5=92=8C=20application-test.yml=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=86=97=E4=BD=99=E9=85=8D=E7=BD=AE=20-=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=BA=86=20bootstrap-dev.yml=20=E5=92=8C=20bootstrap-?= =?UTF-8?q?test.yml=20=E4=B8=AD=E7=9A=84=20Nacos=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=20-=20=E5=9C=A8=20bootstrap=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86=20common-db.yaml?= =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=20-=20=E4=BF=AE=E6=94=B9=E4=BA=86=20Docke?= =?UTF-8?q?r=20Compose=20=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.test.yml | 2 +- .../src/main/resources/application-dev.yml | 4 +--- .../src/main/resources/application-test.yml | 4 ---- .../src/main/resources/bootstrap-dev.yml | 11 +++++++---- .../src/main/resources/bootstrap-test.yml | 5 ++++- .../src/main/resources/application-dev.yml | 11 +---------- .../src/main/resources/application-test.yml | 4 ---- .../src/main/resources/bootstrap-dev.yml | 6 +++--- .../src/main/resources/bootstrap-test.yml | 4 ++-- 9 files changed, 19 insertions(+), 32 deletions(-) diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml index 2b22640..737ff70 100644 --- a/docker/docker-compose.test.yml +++ b/docker/docker-compose.test.yml @@ -51,7 +51,7 @@ services: networks: - llmx-net-test environment: - POSTGRES_DB: llmx_core + POSTGRES_DB: llmx_db POSTGRES_USER: llmx POSTGRES_PASSWORD: L4s6f9y3, volumes: diff --git a/llmx-core/llmx-core-service/src/main/resources/application-dev.yml b/llmx-core/llmx-core-service/src/main/resources/application-dev.yml index 31fbee8..54b155f 100644 --- a/llmx-core/llmx-core-service/src/main/resources/application-dev.yml +++ b/llmx-core/llmx-core-service/src/main/resources/application-dev.yml @@ -1,4 +1,2 @@ server: - port: 8081 - - + port: 8081 \ No newline at end of file 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 3ef3967..8091132 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 @@ -1,8 +1,4 @@ server: port: 9002 -spring: - config: - import: - - nacos:llmx-core-service.yml?namespace=1a32d4f4-469a-4e10-ba3b-ce1bc6ba8cc9&group=test diff --git a/llmx-core/llmx-core-service/src/main/resources/bootstrap-dev.yml b/llmx-core/llmx-core-service/src/main/resources/bootstrap-dev.yml index 9559f7f..e01946d 100644 --- a/llmx-core/llmx-core-service/src/main/resources/bootstrap-dev.yml +++ b/llmx-core/llmx-core-service/src/main/resources/bootstrap-dev.yml @@ -1,15 +1,15 @@ spring: cloud: nacos: + ip: 192.168.1.100 username: nacos password: L4s6f9y3, server-addr: 49.235.96.75:8848 - ip: 192.168.1.100 discovery: - server-addr: ${spring.cloud.nacos.server-addr} + ip: ${spring.cloud.nacos.ip} username: ${spring.cloud.nacos.username} password: ${spring.cloud.nacos.password} - ip: ${spring.cloud.nacos.ip} + server-addr: ${spring.cloud.nacos.server-addr} config: file-extension: yaml namespace: a17d57ec-4fd9-44c7-a617-7f6003a0b332 @@ -17,4 +17,7 @@ spring: extension-configs: - data-id: ${spring.application.name}-${spring.profiles.active}.yaml refresh: true - group: ${spring.application.name} \ No newline at end of file + group: ${spring.application.name} + - data-id: common-db.yaml + refresh: true + group: infra \ No newline at end of file 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 index 9a85cbf..416ac0d 100644 --- a/llmx-core/llmx-core-service/src/main/resources/bootstrap-test.yml +++ b/llmx-core/llmx-core-service/src/main/resources/bootstrap-test.yml @@ -15,4 +15,7 @@ spring: extension-configs: - data-id: ${spring.application.name}-${spring.profiles.active}.yaml refresh: true - group: ${spring.application.name} \ No newline at end of file + group: ${spring.application.name} + - data-id: common-db.yaml + refresh: true + group: infra \ No newline at end of file diff --git a/llmx-impl/llmx-impl-bailian/src/main/resources/application-dev.yml b/llmx-impl/llmx-impl-bailian/src/main/resources/application-dev.yml index d7fe24e..0884131 100644 --- a/llmx-impl/llmx-impl-bailian/src/main/resources/application-dev.yml +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/application-dev.yml @@ -1,11 +1,2 @@ server: - 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 服务地址 + port: 8082 \ No newline at end of file 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 ba3f858..f9c0b55 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 @@ -1,6 +1,2 @@ server: port: 9003 -spring: - config: - import: - - nacos:llmx-impl-bailian.yml?namespace=da45f3a6-e7d0-4d92-b075-776adea07d6d&group=test diff --git a/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-dev.yml b/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-dev.yml index 9559f7f..bb79e04 100644 --- a/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-dev.yml +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-dev.yml @@ -1,15 +1,15 @@ spring: cloud: nacos: + ip: 192.168.1.100 username: nacos password: L4s6f9y3, server-addr: 49.235.96.75:8848 - ip: 192.168.1.100 discovery: - server-addr: ${spring.cloud.nacos.server-addr} + ip: ${spring.cloud.nacos.ip} username: ${spring.cloud.nacos.username} password: ${spring.cloud.nacos.password} - ip: ${spring.cloud.nacos.ip} + server-addr: ${spring.cloud.nacos.server-addr} config: file-extension: yaml namespace: a17d57ec-4fd9-44c7-a617-7f6003a0b332 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 index 9a85cbf..b163072 100644 --- a/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-test.yml +++ b/llmx-impl/llmx-impl-bailian/src/main/resources/bootstrap-test.yml @@ -1,13 +1,13 @@ spring: cloud: nacos: - server-addr: llmx-nacos:8848 username: nacos password: L4s6f9y3, + server-addr: llmx-nacos:8848 discovery: - server-addr: ${spring.cloud.nacos.server-addr} username: ${spring.cloud.nacos.username} password: ${spring.cloud.nacos.password} + server-addr: ${spring.cloud.nacos.server-addr} config: file-extension: yaml namespace: 54a289f7-5f4a-4c83-8a0a-199defa35458 -- 2.47.2