Skip to content

C
CivWeb
Commit 06e671d2 authored by 杨思琦's avatar 杨思琦
Browse files
Options

fix: 修复iotip

parent 85335da8
Pipeline #68223 passed with stages
          Hide whitespace changes
          Inline Side-by-side
          Showing with 3 additions and 3 deletions
          src/layouts/AppLayout/notifier/notice.js
          View file @ 06e671d2
          ...@@ -261,7 +261,7 @@ class Notifier { ...@@ -261,7 +261,7 @@ class Notifier {
          } }
          mqttConfig.mqtt_iotIP = self._siteConfig.mqtt_iotIP = mqttConfig.mqtt_iotIP = self._siteConfig.mqtt_iotIP =
          mqttConfig.mqtt_mess.TcpIP + (mqttConfig.mqtt_mess.TcpPort ? ':' + mqttConfig.mqtt_mess.TcpPort : ''); mqttConfig.mqtt_mess.TcpIP + ':' + (mqttConfig.mqtt_mess.TcpPort ? mqttConfig.mqtt_mess.TcpPort : '443');
          // self.props.updateConfig && self.props.updateConfig(Object.assign({}, self.props.global, { // self.props.updateConfig && self.props.updateConfig(Object.assign({}, self.props.global, {
          // ...mqttConfig // ...mqttConfig
          ......
          src/pages/user/login/login.js
          View file @ 06e671d2
          ...@@ -342,8 +342,8 @@ class Login { ...@@ -342,8 +342,8 @@ class Login {
          mqttConfig.mqtt_mess.TcpPort = DEFAULT_TCP_PORT; mqttConfig.mqtt_mess.TcpPort = DEFAULT_TCP_PORT;
          mqttConfig.mqtt_IsSSL = `${mqttConfig.mqtt_mess.TcpIP}:${mqttConfig.mqtt_mess.TcpPort}`; mqttConfig.mqtt_IsSSL = `${mqttConfig.mqtt_mess.TcpIP}:${mqttConfig.mqtt_mess.TcpPort}`;
          } }
          mqttConfig.mqtt_iotIP = `${mqttConfig.mqtt_mess.TcpIP}${ mqttConfig.mqtt_iotIP = `${mqttConfig.mqtt_mess.TcpIP}:${
          mqttConfig.mqtt_mess.TcpPort ? `:${mqttConfig.mqtt_mess.TcpPort}` : '' mqttConfig.mqtt_mess.TcpPort ? mqttConfig.mqtt_mess.TcpPort : '443'
          }`; }`;
          self.globalConfig = Object.assign(self.globalConfig, { self.globalConfig = Object.assign(self.globalConfig, {
          ......
          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