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

chore: update gateway config for local dev and docker
All checks were successful
aiot-platform CI/CD / build-and-deploy (push) Successful in 8m10s
Details

Browse Source
This commit is contained in:
lzh
2025-12-18 15:26:11 +08:00
parent 527b9d7d44
commit e3c1e8a7f3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitea/workflows/cicd.yaml
View File

@@ -113,7 +113,7 @@ jobs:
docker rm $CONTAINER_NAME || true docker rm $CONTAINER_NAME || true
# 覆盖 RPC 地址，使其指向 aiot-server 容器 # 覆盖 RPC 地址，使其指向 aiot-server 容器
# 同时注入数据库和 Redis 配置 # 注入 Redis 配置 (网关需要连 Redis 做消息总线)
docker run -d \ docker run -d \
--name $CONTAINER_NAME \ --name $CONTAINER_NAME \
--network $NETWORK_NAME \ --network $NETWORK_NAME \
@@ -121,6 +121,6 @@ jobs:
-p 1883:1883 \ -p 1883:1883 \
-p 8092:8092 \ -p 8092:8092 \
-e VIEWSHANGHAI_IOT_GATEWAY_RPC_URL="http://aiot-server:48080" \ -e VIEWSHANGHAI_IOT_GATEWAY_RPC_URL="http://aiot-server:48080" \
-e MYSQL_HOST="$MYSQL_HOST" \
-e REDIS_HOST="$REDIS_HOST" \ -e REDIS_HOST="$REDIS_HOST" \
$([ -n "$REDIS_PASSWORD" ] && echo "-e REDIS_PASSWORD=$REDIS_PASSWORD" || echo "") \
"${IMAGE_NAME}:latest" "${IMAGE_NAME}:latest"

14
viewshanghai-module-iot/viewshanghai-module-iot-gateway/src/main/resources/application.yaml
View File

@@ -7,17 +7,17 @@ spring:
# Redis 配置 # Redis 配置
data: data:
redis: redis:
host: 127.0.0.1 # Redis 服务器地址 host: ${REDIS_HOST:124.221.55.225} # Redis 服务器地址
port: 6379 # Redis 服务器端口 port: ${REDIS_PORT:6379} # Redis 服务器端口
database: 0 # Redis 数据库索引 database: ${REDIS_DATABASE:0} # Redis 数据库索引
# password: # Redis 密码，如果有的话 password: ${REDIS_PASSWORD:9kHXcZ1ojFsD} # Redis 密码
timeout: 30000ms # 连接超时时间 timeout: 30000ms # 连接超时时间
--- #################### 消息队列相关 #################### --- #################### 消息队列相关 ####################
# rocketmq 配置项，对应 RocketMQProperties 配置类 # rocketmq 配置项，对应 RocketMQProperties 配置类
rocketmq: rocketmq:
name-server: 127.0.0.1:9876 # RocketMQ Namesrv name-server: ${ROCKETMQ_NAMESERVER:124.221.55.225:9876} # RocketMQ Namesrv
# Producer 配置项 # Producer 配置项
producer: producer:
group: ${spring.application.name}_PRODUCER # 生产者分组 group: ${spring.application.name}_PRODUCER # 生产者分组
@@ -34,7 +34,7 @@ viewshanghai:
gateway: gateway:
# 设备 RPC 配置 # 设备 RPC 配置
rpc: rpc:
url: http://127.0.0.1:48080 # 主程序 API 地址 url: ${VIEWSHANGHAI_IOT_GATEWAY_RPC_URL:http://124.221.55.225:48080} # 主程序 API 地址
connect-timeout: 30s connect-timeout: 30s
read-timeout: 30s read-timeout: 30s
# 设备 Token 配置 # 设备 Token 配置
@@ -56,7 +56,7 @@ viewshanghai:
emqx: emqx:
enabled: false enabled: false
http-port: 8090 # MQTT HTTP 服务端口 http-port: 8090 # MQTT HTTP 服务端口
mqtt-host: 127.0.0.1 # MQTT Broker 地址 mqtt-host: ${EMQX_HOST:124.221.55.225} # MQTT Broker 地址
mqtt-port: 1883 # MQTT Broker 端口 mqtt-port: 1883 # MQTT Broker 端口
mqtt-username: admin # MQTT 用户名 mqtt-username: admin # MQTT 用户名
mqtt-password: public # MQTT 密码 mqtt-password: public # MQTT 密码