diff --git a/springboot/fastbee-admin/src/main/resources/application-dev.yml b/springboot/fastbee-admin/src/main/resources/application-dev.yml index 83e4ccd2..633be5c0 100644 --- a/springboot/fastbee-admin/src/main/resources/application-dev.yml +++ b/springboot/fastbee-admin/src/main/resources/application-dev.yml @@ -72,7 +72,7 @@ spring: # sip 配置 sip: - enabled: true # 是否启用视频监控SIP,true为启用 + enabled: false # 是否启用视频监控SIP,true为启用 ## 本地调试时,绑定网卡局域网IP,设备在同一局域网,设备接入IP填写绑定IP ## 部署服务端时,默认绑定容器IP,设备接入IP填写服务器公网IP #ip: 177.7.0.13 diff --git a/springboot/fastbee-admin/src/main/resources/application.yml b/springboot/fastbee-admin/src/main/resources/application.yml index 95909cb1..b730500c 100644 --- a/springboot/fastbee-admin/src/main/resources/application.yml +++ b/springboot/fastbee-admin/src/main/resources/application.yml @@ -2,7 +2,7 @@ fastbee: name: fastbee # 名称 version: 3.8.5 # 版本 - copyrightYear: 2023 # 版权年份 + copyrightYear: 2024 # 版权年份 demoEnabled: true # 实例演示开关 # 文件路径,以uploadPath结尾 示例( Windows配置 D:/uploadPath,Linux配置 /uploadPath) profile: /uploadPath @@ -23,12 +23,12 @@ server: # 基于netty的服务器 broker: must-pass: false # 客户端连接是否需要密码 - enabled: true # mqttBroker类型选择, true: 基于netty的mqttBroker和webSocket false: emq的mqttBroker + enabled: true # 需要配置为true broker-node: node1 port: 1883 websocket-port: 8083 websocket-path: /mqtt - keep-alive: 70 # 默认的全部客户端心跳上传时间 + keep-alive: 30 # 默认的全部客户端心跳上传时间 # Spring配置 spring: diff --git a/vue/src/views/iot/device/running-status.vue b/vue/src/views/iot/device/running-status.vue index e4be4b4f..8b51916b 100644 --- a/vue/src/views/iot/device/running-status.vue +++ b/vue/src/views/iot/device/running-status.vue @@ -442,7 +442,7 @@ export default { if (topics[4] == 'reply') { this.$modal.notifySuccess(message); } - if (topic.endsWith('ws/service')) { + if (topic.endsWith('ws/service') || topics[3] == 'monitor') { console.log('接收到【物模型】主题1:', topic); console.log('接收到【物模型】内容:', message); // 更新列表中设备的属性