Skip to content

C
CivWeb
Commit 571ab0bb authored by 李纪文's avatar 李纪文
Browse files
Options

fix: mqtt_site_code增加

parent bc8ce09a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/layouts/AppLayout/notifier/notice.js
View file @ 571ab0bb
......@@ -237,7 +237,7 @@ class Notifier {
if (res.data[0]) {
const data = res.data[0];
mqttConfig.mqtt_IsSSL = self._siteConfig.IsSSL = data.IsSSL ? data.IsSSL : false;
mqttConfig.mqtt_mess.site_code = self._siteConfig.site_code = data.SiteCode || self._siteConfig.site_code;
mqttConfig.mqtt_mess.site_code = mqttConfig.mqtt_site_code = self._siteConfig.site_code = data.SiteCode || self._siteConfig.site_code;
mqttConfig.mqtt_mess.TcpIP = self._siteConfig.TcpIP = data.TcpIP;
mqttConfig.mqtt_mess.TcpPort = self._siteConfig.TcpPort = data.TcpPort ? parseInt(data.TcpPort) : 8083;
mqttConfig.mqtt_mess.MessageLevel = self._siteConfig.MessageLevel = data.MessageLevel
......
src/pages/user/login/login.js
View file @ 571ab0bb
......@@ -322,7 +322,7 @@ class Login {
const data = res.data[0];
mqttConfig.ipConfig = data;
mqttConfig.mqtt_IsSSL = data.IsSSL ? data.IsSSL : false;
mqttConfig.mqtt_mess.site_code = data.SiteCode || self.globalConfig.userInfo.site;
mqttConfig.mqtt_mess.site_code = mqttConfig.mqtt_site_code = data.SiteCode || self.globalConfig.userInfo.site;
mqttConfig.mqtt_mess.TcpIP = data.TcpIP;
// eslint-disable-next-line radix
mqttConfig.mqtt_mess.TcpPort = data.TcpPort ? parseInt(data.TcpPort) : 8083;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment