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

refactor(deploy): 迁移CI/CD至双服务器架构
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 
- Jenkinsfile: Registry改为Infra内网172.17.16.7:5000，部署目标改为Prod内网172.17.16.14
- docker-compose: 镜像源改为172.17.16.7:5000，MySQL改为172.17.16.8，Redis改为172.17.16.13，RocketMQ改为腾讯云TDMQ
- 所有模块application-prod.yaml: 统一更新MySQL/Redis/RocketMQ默认连接地址
- deploy.sh: Registry地址同步更新

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
lzh
2026-02-13 10:41:54 +08:00
parent c9195f78e9
commit 547da7cfd2
9 changed files with 879 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

@@ -17,15 +17,15 @@ pipeline {
} }
environment { environment {
// 镜像仓库配置 // 镜像仓库配置（Infra 服务器内网地址，Prod 服务器可通过内网拉取）
REGISTRY = 'localhost:5000' REGISTRY = '172.17.16.7:5000'
DEPS_IMAGE = "${REGISTRY}/aiot-deps:latest" DEPS_IMAGE = "${REGISTRY}/aiot-deps:latest"
// 服务配置 // 服务配置
CORE_SERVICES = 'viewsh-gateway,viewsh-module-system-server,viewsh-module-infra-server,viewsh-module-iot-server,viewsh-module-iot-gateway,viewsh-module-ops-server' CORE_SERVICES = 'viewsh-gateway,viewsh-module-system-server,viewsh-module-infra-server,viewsh-module-iot-server,viewsh-module-iot-gateway,viewsh-module-ops-server'
// 部署配置 // 部署配置（Prod 服务器内网地址）
DEPLOY_HOST = '172.19.0.1' DEPLOY_HOST = '172.17.16.14'
DEPLOY_PATH = '/opt/aiot-platform-cloud' DEPLOY_PATH = '/opt/aiot-platform-cloud'
SSH_KEY = '/var/jenkins_home/.ssh/id_rsa' SSH_KEY = '/var/jenkins_home/.ssh/id_rsa'

58
docker-compose.core.yml
View File

@@ -10,7 +10,7 @@ volumes:
services: services:
viewsh-gateway: viewsh-gateway:
image: ${REGISTRY_HOST:-localhost:5000}/viewsh-gateway:${IMAGE_TAG:-latest} image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-gateway:${IMAGE_TAG:-latest}
container_name: aiot-gateway container_name: aiot-gateway
restart: on-failure:5 restart: on-failure:5
ports: ports:
@@ -31,9 +31,9 @@ services:
NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
# ===== Redis 配置 ===== # ===== Redis 配置 =====
SPRING_DATA_REDIS_HOST: 172.17.16.14 SPRING_DATA_REDIS_HOST: 172.17.16.13
SPRING_DATA_REDIS_PORT: 6379 SPRING_DATA_REDIS_PORT: 6379
SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD" SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
volumes: volumes:
- app-logs:/app/logs - app-logs:/app/logs
@@ -50,7 +50,7 @@ services:
start_period: 120s start_period: 120s
viewsh-module-system-server: viewsh-module-system-server:
image: ${REGISTRY_HOST:-localhost:5000}/viewsh-module-system-server:${IMAGE_TAG:-latest} image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-system-server:${IMAGE_TAG:-latest}
container_name: aiot-system-server container_name: aiot-system-server
restart: on-failure:5 restart: on-failure:5
ports: ports:
@@ -68,13 +68,13 @@ services:
NACOS_CONFIG_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_URL: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root # TODO: 填入数据库用户名 SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root # TODO: 填入数据库用户名
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "65p^VTPi9Qd+" # TODO: 填入数据库密码 SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "tKi8rfUJjVrf@" # TODO: 填入数据库密码
# Redis # Redis
SPRING_DATA_REDIS_HOST: 172.17.16.14 SPRING_DATA_REDIS_HOST: 172.17.16.13
SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD" # TODO: 填入 Redis 密码 SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1" # TODO: 填入 Redis 密码
# 微信配置 (解决 appid 不能为 null) # 微信配置 (解决 appid 不能为 null)
WX_MP_APP_ID: "wx5b23ba7a5589ecbb" WX_MP_APP_ID: "wx5b23ba7a5589ecbb"
@@ -103,7 +103,7 @@ services:
condition: service_healthy condition: service_healthy
viewsh-module-infra-server: viewsh-module-infra-server:
image: ${REGISTRY_HOST:-localhost:5000}/viewsh-module-infra-server:${IMAGE_TAG:-latest} image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-infra-server:${IMAGE_TAG:-latest}
container_name: aiot-infra-server container_name: aiot-infra-server
restart: on-failure:5 restart: on-failure:5
ports: ports:
@@ -119,12 +119,12 @@ services:
NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
NACOS_CONFIG_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_URL: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "65p^VTPi9Qd+" SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "tKi8rfUJjVrf@"
SPRING_DATA_REDIS_HOST: 172.17.16.14 SPRING_DATA_REDIS_HOST: 172.17.16.13
SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD" SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
# XXL-Job 调度中心地址 # XXL-Job 调度中心地址
XXL_JOB_ADMIN_ADDRESSES: http://172.17.16.14:19090/xxl-job-admin XXL_JOB_ADMIN_ADDRESSES: http://172.17.16.14:19090/xxl-job-admin
@@ -142,7 +142,7 @@ services:
condition: service_healthy condition: service_healthy
viewsh-module-iot-server: viewsh-module-iot-server:
image: ${REGISTRY_HOST:-localhost:5000}/viewsh-module-iot-server:${IMAGE_TAG:-latest} image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-iot-server:${IMAGE_TAG:-latest}
container_name: aiot-iot-server container_name: aiot-iot-server
restart: on-failure:5 restart: on-failure:5
ports: ports:
@@ -158,14 +158,14 @@ services:
NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
NACOS_CONFIG_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_URL: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "65p^VTPi9Qd+" SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "tKi8rfUJjVrf@"
SPRING_DATA_REDIS_HOST: 172.17.16.14 SPRING_DATA_REDIS_HOST: 172.17.16.13
SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD" SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
ROCKETMQ_NAME_SERVER: 172.17.16.14:9876 ROCKETMQ_NAME_SERVER: rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080
# TDengine # TDengine
TDENGINE_HOST: 172.17.16.14 TDENGINE_HOST: 172.17.16.14
@@ -194,7 +194,7 @@ services:
condition: service_healthy condition: service_healthy
viewsh-module-iot-gateway: viewsh-module-iot-gateway:
image: ${REGISTRY_HOST:-localhost:5000}/viewsh-module-iot-gateway:${IMAGE_TAG:-latest} image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-iot-gateway:${IMAGE_TAG:-latest}
container_name: aiot-iot-gateway container_name: aiot-iot-gateway
restart: on-failure:5 restart: on-failure:5
ports: ports:
@@ -207,10 +207,10 @@ services:
SPRING_PROFILES_ACTIVE: prod SPRING_PROFILES_ACTIVE: prod
JAVA_OPTS: "-Xms1024m -Xmx2048m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" JAVA_OPTS: "-Xms1024m -Xmx2048m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs"
SPRING_DATA_REDIS_HOST: 172.17.16.14 SPRING_DATA_REDIS_HOST: 172.17.16.13
SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD" SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
ROCKETMQ_NAME_SERVER: 172.17.16.14:9876 ROCKETMQ_NAME_SERVER: rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080
# 添加这一行 # 添加这一行
VIEWSH_IOT_GATEWAY_RPC_URL: "http://aiot-iot-server:48091" VIEWSH_IOT_GATEWAY_RPC_URL: "http://aiot-iot-server:48091"
volumes: volumes:
@@ -224,7 +224,7 @@ services:
- viewsh-module-iot-server - viewsh-module-iot-server
viewsh-module-ops-server: viewsh-module-ops-server:
image: ${REGISTRY_HOST:-localhost:5000}/viewsh-module-ops-server:${IMAGE_TAG:-latest} image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-ops-server:${IMAGE_TAG:-latest}
container_name: aiot-ops-server container_name: aiot-ops-server
restart: on-failure:5 restart: on-failure:5
ports: ports:
@@ -240,14 +240,14 @@ services:
NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
NACOS_CONFIG_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_URL: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "65p^VTPi9Qd+" SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "tKi8rfUJjVrf@"
SPRING_DATA_REDIS_HOST: 172.17.16.14 SPRING_DATA_REDIS_HOST: 172.17.16.13
SPRING_DATA_REDIS_PASSWORD: "9kHXcZ1ojFsD" SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
ROCKETMQ_NAME_SERVER: 172.17.16.14:9876 ROCKETMQ_NAME_SERVER: rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080
# XXL-Job 调度中心地址 # XXL-Job 调度中心地址
XXL_JOB_ADMIN_ADDRESSES: http://172.17.16.14:19090/xxl-job-admin XXL_JOB_ADMIN_ADDRESSES: http://172.17.16.14:19090/xxl-job-admin

2
scripts/deploy.sh
View File

@@ -15,7 +15,7 @@ NC='\033[0m' # No Color
# 配置 # 配置
COMPOSE_FILE="docker-compose.core.yml" COMPOSE_FILE="docker-compose.core.yml"
REGISTRY="localhost:5000" REGISTRY="172.17.16.7:5000"
HEALTH_CHECK_TIMEOUT=120 HEALTH_CHECK_TIMEOUT=120
HEALTH_CHECK_INTERVAL=5 HEALTH_CHECK_INTERVAL=5

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

@@ -21,7 +21,7 @@ spring:
spring: spring:
data: data:
redis: redis:
host: 127.0.0.1 host: 172.17.16.13
port: 6379 port: 6379
database: 0 database: 0
password: "" password: ""

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

@@ -57,18 +57,18 @@ spring:
primary: master primary: master
datasource: datasource:
master: master:
url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:aiot_platform}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true url: jdbc:mysql://${MYSQL_HOST:172.17.16.8}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:aiot-platform-test}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: ${MYSQL_USER:root} username: ${MYSQL_USER:root}
password: ${MYSQL_PASSWORD:} password: ${MYSQL_PASSWORD:}
slave: slave:
lazy: true lazy: true
url: jdbc:mysql://${MYSQL_SLAVE_HOST:${MYSQL_HOST:127.0.0.1}}:${MYSQL_SLAVE_PORT:${MYSQL_PORT:3306}}/${MYSQL_DATABASE:aiot_platform}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true url: jdbc:mysql://${MYSQL_SLAVE_HOST:${MYSQL_HOST:172.17.16.8}}:${MYSQL_SLAVE_PORT:${MYSQL_PORT:3306}}/${MYSQL_DATABASE:aiot-platform-test}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: ${MYSQL_SLAVE_USER:${MYSQL_USER:root}} username: ${MYSQL_SLAVE_USER:${MYSQL_USER:root}}
password: ${MYSQL_SLAVE_PASSWORD:${MYSQL_PASSWORD:}} password: ${MYSQL_SLAVE_PASSWORD:${MYSQL_PASSWORD:}}
data: data:
redis: redis:
host: ${REDIS_HOST:127.0.0.1} host: ${REDIS_HOST:172.17.16.13}
port: ${REDIS_PORT:6379} port: ${REDIS_PORT:6379}
database: ${REDIS_DATABASE:0} database: ${REDIS_DATABASE:0}
password: ${REDIS_PASSWORD:} password: ${REDIS_PASSWORD:}
@@ -83,7 +83,7 @@ spring:
--- #################### MQ 消息队列相关配置 #################### --- #################### MQ 消息队列相关配置 ####################
rocketmq: rocketmq:
name-server: ${ROCKETMQ_NAMESRV_ADDR:127.0.0.1:9876} name-server: ${ROCKETMQ_NAMESRV_ADDR:rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080}
spring: spring:
rabbitmq: rabbitmq:

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

@@ -9,7 +9,7 @@ spring:
# Redis 配置 # Redis 配置
data: data:
redis: redis:
host: ${REDIS_HOST:127.0.0.1} host: ${REDIS_HOST:172.17.16.13}
port: ${REDIS_PORT:6379} port: ${REDIS_PORT:6379}
database: ${REDIS_DATABASE:0} database: ${REDIS_DATABASE:0}
password: ${REDIS_PASSWORD:} password: ${REDIS_PASSWORD:}
@@ -19,7 +19,7 @@ spring:
# rocketmq 配置项，对应 RocketMQProperties 配置类 # rocketmq 配置项，对应 RocketMQProperties 配置类
rocketmq: rocketmq:
name-server: ${ROCKETMQ_NAMESRV_ADDR:127.0.0.1:9876} name-server: ${ROCKETMQ_NAMESRV_ADDR:rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080}
# Producer 配置项 # Producer 配置项
producer: producer:
group: ${spring.application.name}_PRODUCER group: ${spring.application.name}_PRODUCER

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

@@ -55,12 +55,12 @@ spring:
primary: master primary: master
datasource: datasource:
master: master:
url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:aiot_platform}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true url: jdbc:mysql://${MYSQL_HOST:172.17.16.8}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:aiot-platform-test}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: ${MYSQL_USER:root} username: ${MYSQL_USER:root}
password: ${MYSQL_PASSWORD:} password: ${MYSQL_PASSWORD:}
slave: slave:
lazy: true lazy: true
url: jdbc:mysql://${MYSQL_SLAVE_HOST:${MYSQL_HOST:127.0.0.1}}:${MYSQL_SLAVE_PORT:${MYSQL_PORT:3306}}/${MYSQL_DATABASE:aiot_platform}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true url: jdbc:mysql://${MYSQL_SLAVE_HOST:${MYSQL_HOST:172.17.16.8}}:${MYSQL_SLAVE_PORT:${MYSQL_PORT:3306}}/${MYSQL_DATABASE:aiot-platform-test}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: ${MYSQL_SLAVE_USER:${MYSQL_USER:root}} username: ${MYSQL_SLAVE_USER:${MYSQL_USER:root}}
password: ${MYSQL_SLAVE_PASSWORD:${MYSQL_PASSWORD:}} password: ${MYSQL_SLAVE_PASSWORD:${MYSQL_PASSWORD:}}
tdengine: tdengine:
@@ -73,7 +73,7 @@ spring:
data: data:
redis: redis:
host: ${REDIS_HOST:127.0.0.1} host: ${REDIS_HOST:172.17.16.13}
port: ${REDIS_PORT:6379} port: ${REDIS_PORT:6379}
database: ${REDIS_DATABASE:0} database: ${REDIS_DATABASE:0}
password: ${REDIS_PASSWORD:} password: ${REDIS_PASSWORD:}
@@ -88,7 +88,7 @@ spring:
--- #################### MQ 消息队列相关配置 #################### --- #################### MQ 消息队列相关配置 ####################
rocketmq: rocketmq:
name-server: ${ROCKETMQ_NAMESRV_ADDR:127.0.0.1:9876} name-server: ${ROCKETMQ_NAMESRV_ADDR:rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080}
spring: spring:
# 禁用 RabbitMQ 自动配置（如果不需要 RabbitMQ，避免启动时连接失败） # 禁用 RabbitMQ 自动配置（如果不需要 RabbitMQ，避免启动时连接失败）

22
viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-prod.yaml
View File

@@ -59,27 +59,27 @@ spring:
primary: master primary: master
datasource: datasource:
master: master:
url: ${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL} url: jdbc:mysql://${MYSQL_HOST:172.17.16.8}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:aiot-platform-test}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: ${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME} username: ${MYSQL_USER:root}
password: ${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD} password: ${MYSQL_PASSWORD:}
slave: # 模拟从库，可根据自己需要修改 slave: # 模拟从库，可根据自己需要修改
lazy: true # 开启懒加载，保证启动速度 lazy: true # 开启懒加载，保证启动速度
url: ${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_SLAVE_URL:${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL}} url: jdbc:mysql://${MYSQL_SLAVE_HOST:${MYSQL_HOST:172.17.16.8}}:${MYSQL_SLAVE_PORT:${MYSQL_PORT:3306}}/${MYSQL_DATABASE:aiot-platform-test}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: ${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_SLAVE_USERNAME:${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME}} username: ${MYSQL_SLAVE_USER:${MYSQL_USER:root}}
password: ${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_SLAVE_PASSWORD:${SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD}} password: ${MYSQL_SLAVE_PASSWORD:${MYSQL_PASSWORD:}}
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
data: data:
redis: redis:
host: ${SPRING_DATA_REDIS_HOST:127.0.0.1} # 地址 host: ${REDIS_HOST:172.17.16.13} # 地址
port: ${SPRING_DATA_REDIS_PORT:6379} # 端口 port: ${REDIS_PORT:6379} # 端口
database: ${SPRING_DATA_REDIS_DATABASE:0} # 数据库索引 database: ${REDIS_DATABASE:0} # 数据库索引
password: ${SPRING_DATA_REDIS_PASSWORD} # 密码 password: ${REDIS_PASSWORD:} # 密码
--- #################### MQ 消息队列相关配置 #################### --- #################### MQ 消息队列相关配置 ####################
# rocketmq 配置项，对应 RocketMQProperties 配置类 # rocketmq 配置项，对应 RocketMQProperties 配置类
rocketmq: rocketmq:
name-server: ${ROCKETMQ_NAME_SERVER:127.0.0.1:9876} # RocketMQ Namesrv name-server: ${ROCKETMQ_NAME_SERVER:rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080} # RocketMQ Namesrv
spring: spring:
# RabbitMQ 配置项，对应 RabbitProperties 配置类 # RabbitMQ 配置项，对应 RabbitProperties 配置类

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

@@ -56,19 +56,19 @@ spring:
primary: master primary: master
datasource: datasource:
master: master:
url: jdbc:mysql://127.0.0.1:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true url: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: root username: root
password: root password: root
slave: # 从库配置（可选） slave: # 从库配置（可选）
lazy: true lazy: true
url: jdbc:mysql://127.0.0.1:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true url: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
username: root username: root
password: root password: root
# Redis 配置 # Redis 配置
data: data:
redis: redis:
host: 127.0.0.1 host: 172.17.16.13
port: 6379 port: 6379
database: 0 database: 0
password: "" password: ""
@@ -84,7 +84,7 @@ spring:
# rocketmq 配置项 # rocketmq 配置项
rocketmq: rocketmq:
name-server: ${ROCKETMQ_NAMESRV_ADDR:127.0.0.1:9876} name-server: ${ROCKETMQ_NAMESRV_ADDR:rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080}
spring: spring:
# RabbitMQ 配置项（可选） # RabbitMQ 配置项（可选）