浏览代码

修改两个mqtt

wangming 1 月之前
父节点
当前提交
0cf67b8193
共有 3 个文件被更改,包括 21 次插入9 次删除
  1. 9 5
      src/components/component/alarModel.vue
  2. 2 2
      src/components/js_sdk/index.js
  3. 10 2
      src/pagesA/deviceDetail/deviceDetail.vue

+ 9 - 5
src/components/component/alarModel.vue

@@ -449,18 +449,22 @@ export default {
             let selectedService = uni.getStorageSync("sercviceChoice");
             let selectedService = uni.getStorageSync("sercviceChoice");
             if (!selectedService || selectedService == "aloneServe") {
             if (!selectedService || selectedService == "aloneServe") {
                 if (__wxConfig.envVersion == "develop") {
                 if (__wxConfig.envVersion == "develop") {
+                    // client = mqtt.connect(
+                    //     "wxs://cmd.radar-power.com:8084/mqtt",
+                    //     params
+                    // );
                     client = mqtt.connect(
                     client = mqtt.connect(
-                        "wxs://cmd.radar-power.com:8084/mqtt",
+                        "wxs://radar-power.cn:8084/mqtt",
                         params
                         params
                     );
                     );
+                }
+                if (__wxConfig.envVersion == "trial") {
                     // client = mqtt.connect(
                     // client = mqtt.connect(
-                    //     "wxs://radar-power.cn:8084/mqtt",
+                    //     "wxs://cmd.radar-power.com:8084/mqtt",
                     //     params
                     //     params
                     // );
                     // );
-                }
-                if (__wxConfig.envVersion == "trial") {
                     client = mqtt.connect(
                     client = mqtt.connect(
-                        "wxs://cmd.radar-power.com:8084/mqtt",
+                        "wxs://radar-power.cn:8084/mqtt",
                         params
                         params
                     );
                     );
                 }
                 }

+ 2 - 2
src/components/js_sdk/index.js

@@ -5,9 +5,9 @@ http.setConfig(config => {
     if (__wxConfig.envVersion == 'develop') {
     if (__wxConfig.envVersion == 'develop') {
         let selectedService = uni.getStorageSync("sercviceChoice")
         let selectedService = uni.getStorageSync("sercviceChoice")
         if (!selectedService || selectedService == 'aloneServe') {
         if (!selectedService || selectedService == 'aloneServe') {
-            config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
+            // config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
         }
         }
-        // config.baseUrl = "https://radar-power.cn/portal-service-server/";
+        config.baseUrl = "https://radar-power.cn/portal-service-server/";
     }
     }
     if (__wxConfig.envVersion == 'trial') {
     if (__wxConfig.envVersion == 'trial') {
         let selectedService = uni.getStorageSync("sercviceChoice")
         let selectedService = uni.getStorageSync("sercviceChoice")

+ 10 - 2
src/pagesA/deviceDetail/deviceDetail.vue

@@ -912,14 +912,22 @@ export default {
             let selectedService = uni.getStorageSync("sercviceChoice");
             let selectedService = uni.getStorageSync("sercviceChoice");
             if (!selectedService || selectedService == "aloneServe") {
             if (!selectedService || selectedService == "aloneServe") {
                 if (__wxConfig.envVersion == "develop") {
                 if (__wxConfig.envVersion == "develop") {
+                    // clientTwo = mqtt.connect(
+                    //     "wxs://data.radar-power.com:8084/mqtt",
+                    //     params
+                    // );
                     clientTwo = mqtt.connect(
                     clientTwo = mqtt.connect(
-                        "wxs://data.radar-power.com:8084/mqtt",
+                        "wxs://radar-power.cn:8084/mqtt",
                         params
                         params
                     );
                     );
                 }
                 }
                 if (__wxConfig.envVersion == "trial") {
                 if (__wxConfig.envVersion == "trial") {
+                    // clientTwo = mqtt.connect(
+                    //     "wxs://data.radar-power.com:8084/mqtt",
+                    //     params
+                    // );
                     clientTwo = mqtt.connect(
                     clientTwo = mqtt.connect(
-                        "wxs://data.radar-power.com:8084/mqtt",
+                        "wxs://radar-power.cn:8084/mqtt",
                         params
                         params
                     );
                     );
                 }
                 }