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:

llmx-core/llmx-core-service/src/main/resources/application-dev.yml

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

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
 
 

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
@@ -18,3 +18,6 @@ spring:
           - data-id: ${spring.application.name}-${spring.profiles.active}.yaml
             refresh: true
             group: ${spring.application.name}
+          - data-id: common-db.yaml
+            refresh: true
+            group: infra

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

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

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 服务地址

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

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

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