XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Jenkins修复3-修改nacos配置
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
lzh
2026-01-14 11:12:28 +08:00
parent 282457d53d
commit a20ef566d0
6 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
docker-compose.core.yml
View File

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

11
viewsh-gateway/src/main/resources/application-prod.yaml
View File

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

11
viewsh-module-infra/viewsh-module-infra-server/src/main/resources/application-prod.yaml
View File

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

13
viewsh-module-iot/viewsh-module-iot-gateway/src/main/resources/application-prod.yaml
View File

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

11
viewsh-module-iot/viewsh-module-iot-server/src/main/resources/application-prod.yaml
View File

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

11
viewsh-module-system/viewsh-module-system-server/src/main/resources/application-prod.yaml
View File

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