From a20ef566d0b7d8a9ad6b709bf02cf352ed58e477 Mon Sep 17 00:00:00 2001 From: lzh Date: Wed, 14 Jan 2026 11:12:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20Jenkins=E4=BF=AE=E5=A4=8D3-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9nacos=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.core.yml | 58 +++++++++---------- .../src/main/resources/application-prod.yaml | 11 ++-- .../src/main/resources/application-prod.yaml | 11 ++-- .../src/main/resources/application-prod.yaml | 13 ++--- .../src/main/resources/application-prod.yaml | 11 ++-- .../src/main/resources/application-prod.yaml | 11 ++-- 6 files changed, 54 insertions(+), 61 deletions(-) diff --git a/docker-compose.core.yml b/docker-compose.core.yml index c231059..564d835 100644 --- a/docker-compose.core.yml +++ b/docker-compose.core.yml @@ -22,11 +22,11 @@ services: JAVA_OPTS: "-Xms512m -Xmx1024m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" # ===== Nacos 配置 ===== - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # TODO: 填入实际的命名空间 UUID - SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # TODO: 填入实际的命名空间 UUID - SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 + NACOS_USERNAME: nacos + NACOS_PASSWORD: 9oDxX~}e7DeP + NACOS_ADDR: 172.17.16.14:8848 + NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" + NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # ===== Redis 配置 ===== SPRING_DATA_REDIS_HOST: 172.17.16.14 @@ -57,12 +57,12 @@ services: SPRING_PROFILES_ACTIVE: prod JAVA_OPTS: "-Xms512m -Xmx1024m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" - # Nacos - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # TODO: 填入命名空间 UUID - SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # TODO: 填入命名空间 UUID - SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 + # ===== Nacos 配置 ===== + NACOS_USERNAME: nacos + NACOS_PASSWORD: 9oDxX~}e7DeP + NACOS_ADDR: 172.17.16.14:8848 + NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" + NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # 数据库 SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.14:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true @@ -99,12 +99,12 @@ services: TZ: Asia/Shanghai SPRING_PROFILES_ACTIVE: prod JAVA_OPTS: "-Xms512m -Xmx1024m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" - - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" - SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" - SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 + + NACOS_USERNAME: nacos + NACOS_PASSWORD: 9oDxX~}e7DeP + NACOS_ADDR: 172.17.16.14:8848 + NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" + NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.14:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root @@ -134,12 +134,12 @@ services: TZ: Asia/Shanghai SPRING_PROFILES_ACTIVE: prod JAVA_OPTS: "-Xms1024m -Xmx2048m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" - - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" - SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" - SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 + + NACOS_USERNAME: nacos + NACOS_PASSWORD: 9oDxX~}e7DeP + NACOS_ADDR: 172.17.16.14:8848 + NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" + NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.14:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root @@ -176,12 +176,12 @@ services: TZ: Asia/Shanghai SPRING_PROFILES_ACTIVE: prod JAVA_OPTS: "-Xms1024m -Xmx2048m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" - - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" - SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" - SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 + + NACOS_USERNAME: nacos + NACOS_PASSWORD: 9oDxX~}e7DeP + NACOS_ADDR: 172.17.16.14:8848 + NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" + NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_DATA_REDIS_HOST: 172.17.16.14 SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD" diff --git a/viewsh-gateway/src/main/resources/application-prod.yaml b/viewsh-gateway/src/main/resources/application-prod.yaml index a916929..3e01731 100644 --- a/viewsh-gateway/src/main/resources/application-prod.yaml +++ b/viewsh-gateway/src/main/resources/application-prod.yaml @@ -3,17 +3,16 @@ spring: cloud: nacos: - server-addr: 127.0.0.1:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:127.0.0.1:8848} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: "" + namespace: ${NACOS_DISCOVERY_NAMESPACE:prod} group: DEFAULT_GROUP - ip: 127.0.0.1 metadata: version: 1.0.0 config: - namespace: "" + namespace: ${NACOS_CONFIG_NAMESPACE:prod} group: DEFAULT_GROUP file-extension: yaml refresh-enabled: true diff --git a/viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml b/viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml index 364d93d..31e150a 100644 --- a/viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml +++ b/viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml @@ -3,17 +3,16 @@ spring: cloud: nacos: - server-addr: 127.0.0.1:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:127.0.0.1:8848} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: "" + namespace: ${NACOS_DISCOVERY_NAMESPACE:prod} group: DEFAULT_GROUP - ip: 127.0.0.1 metadata: version: 1.0.0 config: - namespace: "" + namespace: ${NACOS_CONFIG_NAMESPACE:prod} group: DEFAULT_GROUP file-extension: yaml refresh-enabled: true diff --git a/viewsh-module-iot/viewsh-module-iot-gateway/src/main/resources/application-prod.yaml b/viewsh-module-iot/viewsh-module-iot-gateway/src/main/resources/application-prod.yaml index 07be0ff..7ae6f39 100644 --- a/viewsh-module-iot/viewsh-module-iot-gateway/src/main/resources/application-prod.yaml +++ b/viewsh-module-iot/viewsh-module-iot-gateway/src/main/resources/application-prod.yaml @@ -1,21 +1,18 @@ --- #################### 注册中心 + 配置中心相关配置 #################### ---- #################### 注册中心 + 配置中心相关配置 #################### - spring: cloud: nacos: - server-addr: 127.0.0.1:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:127.0.0.1:8848} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: "" + namespace: ${NACOS_DISCOVERY_NAMESPACE:prod} group: DEFAULT_GROUP - ip: 127.0.0.1 metadata: version: 1.0.0 config: - namespace: "" + namespace: ${NACOS_CONFIG_NAMESPACE:prod} group: DEFAULT_GROUP file-extension: yaml refresh-enabled: true diff --git a/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml b/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml index e7223a6..5ea356c 100644 --- a/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml +++ b/viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml @@ -3,17 +3,16 @@ spring: cloud: nacos: - server-addr: 127.0.0.1:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:127.0.0.1:8848} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: "" + namespace: ${NACOS_DISCOVERY_NAMESPACE:prod} group: DEFAULT_GROUP - ip: 127.0.0.1 metadata: version: 1.0.0 config: - namespace: "" + namespace: ${NACOS_CONFIG_NAMESPACE:prod} group: DEFAULT_GROUP file-extension: yaml refresh-enabled: true diff --git a/viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml b/viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml index f5bc554..c193e8f 100644 --- a/viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml +++ b/viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml @@ -3,17 +3,16 @@ spring: cloud: nacos: - server-addr: 127.0.0.1:8848 - username: nacos - password: nacos + server-addr: ${NACOS_ADDR:127.0.0.1:8848} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - namespace: "" + namespace: ${NACOS_DISCOVERY_NAMESPACE:prod} group: DEFAULT_GROUP - ip: 127.0.0.1 metadata: version: 1.0.0 config: - namespace: "" + namespace: ${NACOS_CONFIG_NAMESPACE:prod} group: DEFAULT_GROUP file-extension: yaml refresh-enabled: true