Bladeren bron

websocket调整

wangtao 1 jaar geleden
bovenliggende
commit
d400f5091f
6 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. 2 2
      .env.development
  2. 2 2
      .env.production
  3. 2 2
      .env.staging
  4. BIN
      deviceManager.zip
  5. 1 1
      src/views/components/index/index4.vue
  6. 1 1
      src/views/index.vue

+ 2 - 2
.env.development

@@ -11,9 +11,9 @@ VUE_APP_BASE_API = 'https://smartpark.caih.com/dmapi/'
 VUE_APP_IOT_API = 'https://smartpark.caih.com/YtIoT'
 
 # 实时告警信息获取
-VUE_APP_WEBSOCKET_API = '10.21.39.1:8084'
+VUE_APP_WEBSOCKET_API = 'wss://10.95.2.31:3084'
 # 实时告警信息获取2
-VUE_APP_WEBSOCKET_API2 = 'iot.usky.cn'
+VUE_APP_WEBSOCKET_API2 = 'wss://iot.usky.cn'
 
 # thingJs地址
 VUE_APP_THINGJS_API = 'https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9'

+ 2 - 2
.env.production

@@ -11,9 +11,9 @@ VUE_APP_BASE_API = 'https://smartpark.caih.com/dmapi/'
 VUE_APP_IOT_API = 'https://smartpark.caih.com/YtIoT'
 
 # 实时告警信息获取
-VUE_APP_WEBSOCKET_API = '10.21.39.1:8084'
+VUE_APP_WEBSOCKET_API = 'wss://10.95.2.31:3084'
 # 实时告警信息获取2
-VUE_APP_WEBSOCKET_API2 = 'iot.usky.cn'
+VUE_APP_WEBSOCKET_API2 = 'wss://iot.usky.cn'
 
 # thingJs地址
 VUE_APP_THINGJS_API = 'https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9'

+ 2 - 2
.env.staging

@@ -13,9 +13,9 @@ VUE_APP_BASE_API = 'http://10.95.2.31:3084/dmapi/'
 VUE_APP_IOT_API = 'https://smartpark.caih.com/YtIoT'
 
 # 实时告警信息获取
-VUE_APP_WEBSOCKET_API = '10.95.2.31:3084'
+VUE_APP_WEBSOCKET_API = 'wss://10.95.2.31:3084'
 # 实时告警信息获取2
-VUE_APP_WEBSOCKET_API2 = 'iot.usky.cn'
+VUE_APP_WEBSOCKET_API2 = 'wss://iot.usky.cn'
 
 # thingJs地址
 VUE_APP_THINGJS_API = 'https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9'

BIN
deviceManager.zip


+ 1 - 1
src/views/components/index/index4.vue

@@ -36,7 +36,7 @@ export default {
   methods: {
     initWebSocket() {
       let arrData = [];
-      let wsUri = "wss://'+process.env.VUE_APP_WEBSOCKET_API2+':55120";
+      let wsUri = process.env.VUE_APP_WEBSOCKET_API2 + ":55120";
       try {
           // if (typeof MozWebSocket == 'function')
               // WebSocket = MozWebSocket;

+ 1 - 1
src/views/index.vue

@@ -949,7 +949,7 @@ export default {
             let num = 0;
             if ("WebSocket" in window) {
                 // this.ws = new WebSocket("wss://10.21.39.1:8084/dm/alarmPush");
-                this.ws = new WebSocket("wss://"+this.websocketApi+"/dm/alarmPush");
+                this.ws = new WebSocket(this.websocketApi+"/dm/alarmPush");
 
                 // console.log(this.ws)
                 this.ws.onopen = () => {