|
@@ -411,8 +411,8 @@ import {
|
|
|
taskList: 0, //任务列表
|
|
|
weosocket: false,
|
|
|
websock: '',
|
|
|
- wsuri:'ws://192.168.3.60:10012/messagePush/',
|
|
|
- wsuri2:'ws://192.168.3.60:10005/taskPush/',
|
|
|
+ wsurl:'',
|
|
|
+ postName:'',
|
|
|
setIntervalWesocketPush: null,
|
|
|
websockSid: {
|
|
|
userId: ''
|
|
@@ -703,24 +703,30 @@ import {
|
|
|
}, 1000)
|
|
|
})
|
|
|
},
|
|
|
- initWebSocket(wsurl,userId) { //初始化weosocket
|
|
|
- //const wsuri = 'ws://127.0.0.1:10003/eventPush/' + userId + '/' + eventTypeDl + '/' + eventType
|
|
|
- const wsuri = wsurl+userId
|
|
|
- // const wsuri = 'ws://172.28.20.82:10012/taskPush/'+userId
|
|
|
- this.websock = new WebSocket(wsuri)
|
|
|
- console.log('建立websocket连接'+wsuri)
|
|
|
- this.websock.onopen = this.websocketonopen
|
|
|
- this.websock.onmessage = this.websocketonmessage
|
|
|
- this.websock.onerror = this.websocketonerror
|
|
|
+ initWebSocket(wsurl,postName,userId) {
|
|
|
+ this.postName=postName
|
|
|
+ this.wsurl=wsurl
|
|
|
+ selectConfigKey(wsurl).then(res => {
|
|
|
+ //初始化weosocket
|
|
|
+ //const wsuri = 'ws://127.0.0.1:10003/eventPush/' + userId + '/' + eventTypeDl + '/' + eventType
|
|
|
+ const wsuri = res.data + userId +postName+ userId
|
|
|
+ // const wsuri = 'ws://172.28.20.82:10012/taskPush/'+userId
|
|
|
+ this.websock = new WebSocket(wsuri)
|
|
|
+ //console.log('建立websocket连接' + wsuri)
|
|
|
+ this.websock.onopen = this.websocketonopen
|
|
|
+ this.websock.onmessage = this.websocketonmessage
|
|
|
+ this.websock.onerror = this.websocketonerror
|
|
|
+ })
|
|
|
},
|
|
|
- websocketonopen() { //连接建立之后执行send方法发送数据
|
|
|
+
|
|
|
+ websocketonopen() { //连接建立之后执行send方法发送数据
|
|
|
console.log('websocket连接成功')
|
|
|
this.weosocket = true
|
|
|
this.sendPing()
|
|
|
},
|
|
|
- websocketonerror() { //连接建立失败重连
|
|
|
- this.initWebSocket(this.wsuri,this.websockSid.userId)
|
|
|
- },
|
|
|
+ websocketonerror() { //连接建立失败重连
|
|
|
+ this.initWebSocket(this.wsurl,this.postName,this.websockSid.userId)
|
|
|
+ },
|
|
|
websocketonmessage(e) { //数据接收
|
|
|
console.log('接收数据', e.data)
|
|
|
// let data = "{\"fromId\":\"farming\"}";
|
|
@@ -799,7 +805,8 @@ import {
|
|
|
this.taskList = res.data
|
|
|
this.taskCount = res.data.length
|
|
|
})
|
|
|
- this.initWebSocket(this.wsuri2,this.websockSid.userId)
|
|
|
+
|
|
|
+ this.initWebSocket('TASK_SOCKET','/taskPush/',this.websockSid.userId)
|
|
|
},
|
|
|
selectMessageById(id) {
|
|
|
selectMessageById(id).then(response => {
|
|
@@ -819,7 +826,7 @@ import {
|
|
|
this.messageList = response.data
|
|
|
this.messageCount = response.data.length
|
|
|
});
|
|
|
- this.initWebSocket(this.wsuri,this.websockSid.userId)
|
|
|
+ this.initWebSocket('MESSAGE_SOCKET','/messagePush/',this.websockSid.userId)
|
|
|
},
|
|
|
handleCheckedCitiesChangeBan(value) {
|
|
|
this.choseLayerSwitchingList(this.banCheckList)
|