diff --git a/.env.development b/.env.development index 4461011..0b8f3be 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ NODE_ENV='development' VITE_APP_TITLE='开发环境' -VITE_APP_BASE_API='http://127.0.0.1:8099' -VITE_APP_SCOKET='ws://1.92.99.15:8099/ws/asset/' \ No newline at end of file +VITE_APP_BASE_API='https://admin.cdtrucktralier.com' +VITE_APP_SCOKET='wss://admin.cdtrucktralier.com/ws/asset/' \ No newline at end of file diff --git a/src/stores/index.js b/src/stores/index.js index 29f9c72..066a25a 100644 --- a/src/stores/index.js +++ b/src/stores/index.js @@ -95,36 +95,44 @@ export const useScoketMsg = defineStore('scoketMsg', () => { const chatMain = ref({}) const scoketInit = () => { - scoket.value = uni.connectSocket({ - url: `${import.meta.env.VITE_APP_SCOKET}${onlyId.value}`, - success: () => { - console.log('创建链接成功') - }, - fail: (err) => { - console.log('创建失败',err) - } - }) - scoket.value.onMessage((e) => { - if (e.data === '连接成功') { - return - } - if (e.data.startsWith("C")) { - count.value = e.data; - } - else if (e.data.startsWith("系统通知")){ - notices.value.push(e.data); - }else if (e.data.startsWith("close")){ - console.log(e.data) - } else { - msgList.value.push(JSON.parse(e.data)) - msgCallback.value && msgCallback.value() - } - }) - scoket.value.onError((err) => { - console.log('链接错误',err) + return new Promise((reslove,reject) => { + scoket.value = uni.connectSocket({ + url: `${import.meta.env.VITE_APP_SCOKET}${onlyId.value}`, + success: () => { + console.log('创建链接成功') + }, + fail: (err) => { + reject(err) + console.log('创建失败',err) + } + }) + scoket.value.onOpen((e) => { + reslove() + console.log('链接打开') + }) + scoket.value.onMessage((e) => { + if (e.data === '连接成功') { + return + } + if (e.data.startsWith("C")) { + count.value = e.data; + } + else if (e.data.startsWith("系统通知")){ + notices.value.push(e.data); + }else if (e.data.startsWith("close")){ + console.log(e.data) + } else { + msgList.value.push(JSON.parse(e.data)) + msgCallback.value && msgCallback.value() + } + }) + scoket.value.onError((err) => { + console.log('链接错误',err) + }) }) } const send = (text) => { + console.log(text) return new Promise((reslove,reject) => { scoket.value.send({ data: text,