zc

src/views/login.vue

@@ -135,14 +135,6 @@ export default {
         localStorage.setItem('videoCover',response.data.videoCover)
       });
       getUrlConfig().then(response => {
-        //判定ws或者wss
-        if(window.location.href.indexOf('https') != -1){
-          //MQTT地址
-          localStorage.setItem('mqttUrl','wss://'+Decrypt(response.data.mqttExtranetUrl))
-        }else{
-          //MQTT地址
-          localStorage.setItem('mqttUrl','ws://'+Decrypt(response.data.mqttIntranetUrl))
-        }
         //判定http或者https
         let urlText = window.location.href.split('://')[0]+'://';
         let outerNet=window.location.href.indexOf(Decrypt(response.data.ipIdentify)) == -1//true外网 false 内网
@@ -155,6 +147,14 @@ export default {
           localStorage.setItem('ipIdentify',Decrypt(response.data.ipIdentify))
           //摄像头访问地址
           localStorage.setItem('cameraUrl','wss://'+Decrypt(response.data.cameraExtranetUrl))
+          //判定ws或者wss
+          if(window.location.href.indexOf('https') != -1){
+            //MQTT地址
+            localStorage.setItem('mqttUrl','wss://'+Decrypt(response.data.mqttExtranetUrl))
+          }else{
+            //MQTT地址
+            localStorage.setItem('mqttUrl','ws://'+Decrypt(response.data.mqttIntranetUrl))
+          }
           //MQTT账号
           localStorage.setItem('mqttUser',Decrypt(response.data.mqttExtranetUser))
           //MQTT密码
@@ -170,6 +170,8 @@ export default {
           localStorage.setItem('ipIdentify',Decrypt(response.data.ipIdentify))
           //摄像头访问地址
           localStorage.setItem('cameraUrl','wss://'+Decrypt(response.data.cameraIntranetUrl))
+          //MQTT地址
+          localStorage.setItem('mqttUrl','ws://'+Decrypt(response.data.mqttIntranetUrl))
           //MQTT账号
           localStorage.setItem('mqttUser',Decrypt(response.data.mqttIntranetUser))
           //MQTT密码