diff --git a/.gitignore b/.gitignore index d08d8f6..8680825 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ lerna-debug.log* node_modules .DS_Store +dist dist-ssr coverage *.local diff --git a/src/layout/components/InviteJoin/index.vue b/src/layout/components/InviteJoin/index.vue index da3a220..7d0aa59 100644 --- a/src/layout/components/InviteJoin/index.vue +++ b/src/layout/components/InviteJoin/index.vue @@ -131,7 +131,7 @@ defineExpose({ // onMounted(async () => { // await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`); // const res = await userStore.getInfo() -// const topic = `xSynergy/ROOM/+/rooms/${res.uid}`; +// const topic = `xsynergy/room/+/rooms/${res.uid}`; // mqttClient.subscribe(topic, async (shapeData) => { // // console.log(shapeData.toString(),'shapeData发送邀请') // processingSocket(shapeData.toString()) diff --git a/src/layout/index.vue b/src/layout/index.vue index 8671c63..8c80b19 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -144,7 +144,7 @@ function handleClickOutside() { onMounted(async () => { await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`); const res = await userStore.getInfo() - const topic = `xSynergy/ROOM/+/rooms/${res.uid}`; + const topic = `xsynergy/room/+/rooms/${res.uid}`; mqttClient.subscribe(topic, async (shapeData) => { if(inviteJoinRef.value){ inviteJoinRef.value.processingSocket(shapeData.toString()) diff --git a/src/utils/whiteboardSync.js b/src/utils/whiteboardSync.js index 713fbb4..15f4d64 100644 --- a/src/utils/whiteboardSync.js +++ b/src/utils/whiteboardSync.js @@ -41,7 +41,7 @@ export const WhiteboardSync = { } // 订阅当前房间 - const topic = `xSynergy/ROOM/${roomUid}/whiteboard/#`; + const topic = `xsynergy/room/${roomUid}/whiteboard/#`; mqttClient.subscribe(topic, async (shapeData) => { const shapeDataNew = JSON.parse(shapeData.toString()) // const shapeDataNew = decode(message); diff --git a/src/utils/whiteboardSync_old.js b/src/utils/whiteboardSync_old.js index 4023814..e970c69 100644 --- a/src/utils/whiteboardSync_old.js +++ b/src/utils/whiteboardSync_old.js @@ -42,7 +42,7 @@ export const WhiteboardSync = { } // 订阅当前房间 - const topic = `xSynergy/ROOM/${roomUid}/whiteboard/#`; + const topic = `xsynergy/room/${roomUid}/whiteboard/#`; mqttClient.subscribe(topic, async (shapeData) => { const shapeDataNew = JSON.parse(shapeData.toString()) // const shapeDataNew = decode(message); diff --git a/src/views/coordinate/personnelList/index.vue b/src/views/coordinate/personnelList/index.vue index 274f63d..bdc3cbc 100644 --- a/src/views/coordinate/personnelList/index.vue +++ b/src/views/coordinate/personnelList/index.vue @@ -500,7 +500,7 @@ const { detail, weekName, tabValue, isShow, load, loadText, isLinkKnow, socketIn // onMounted(async () => { // await mqttClient.connect(`room${Math.random().toString(16).substr(2, 8)}`); // const res = await userStore.getInfo() -// const topic = `xSynergy/ROOM/+/rooms/${res.uid}`; +// const topic = `xsynergy/room/+/rooms/${res.uid}`; // mqttClient.subscribe(topic, async (shapeData) => { // // console.log(shapeData.toString(),'shapeData发送邀请') // processingSocket(shapeData.toString()) diff --git a/src/views/login.vue b/src/views/login.vue index 6feda74..571ff76 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -16,7 +16,7 @@ - 登 录++ + 登 录 登录中...