From 4ffbcc75927f1a6335f57cc52214f6e0b0fedf9e Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 10:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/resources/application-ard.yml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-ard.yml b/ruoyi-admin/src/main/resources/application-ard.yml
index 4a66ee1..8ded130 100644
--- a/ruoyi-admin/src/main/resources/application-ard.yml
+++ b/ruoyi-admin/src/main/resources/application-ard.yml
@@ -17,10 +17,12 @@
 #mqtt
 mqtt:
   host: tcp://192.168.1.15:1883
-  clientId: m3c
+  clientId: m241
   username: admin
   password: xzx12345
-  topic: tube,stealelec
+  topic: tube,stealelec,radar
   timeout: 100
   keepalive: 60
   enabled: true
+mediamtx:
+  host: 127.0.0.1
\ No newline at end of file

--
Gitblit v1.9.3