From 32e0ec0a2ccfb493a6277c5424e8107b187e87fc Mon Sep 17 00:00:00 2001 From: leilei Date: Fri, 21 Nov 2025 16:15:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yaml | 43 ------------------------------------ .gitignore | 1 + 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 .gitea/workflows/deploy.yaml diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml deleted file mode 100644 index d6f10a7..0000000 --- a/.gitea/workflows/deploy.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: Deploy To Dev - -on: - push: - branches: - - 'dev' - -jobs: - deploy: - runs-on: gx-dev01 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Copy specific directory to runner's host machine - run: | - TARGET_DIR="./dist" - - # 检查 dist 目录是否存在 - if [ ! -d "$TARGET_DIR" ]; then - echo "Error: The source directory '$TARGET_DIR' does not exist in the repository." - # 如果目录不存在，报错并退出当前步骤 - exit 1 - fi - cp -r ./dist/* /data/xsy-www/ - - - name: Find and restart the app container - run: | - # 1. 使用 docker ps 过滤包含 'xsy-lighttpd' 服务的容器 - # 2. 提取容器 ID 或名称 - CONTAINER_ID=$(docker ps -a --filter "name=xsy-lighttpd" --format "{{.ID}}") - - if [ -z "$CONTAINER_ID" ]; then - echo "Error: Could not find any container matching name 'app1'." - exit 1 - else - echo "Found container ID: $CONTAINER_ID. Restarting..." - # 使用标准的 docker restart 命令 - docker restart "$CONTAINER_ID" - echo "Container restarted successfully." - fi - 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 From c9e5ae8da425cd6f99bab913ec0347eee72f78af Mon Sep 17 00:00:00 2001 From: leilei Date: Fri, 21 Nov 2025 16:18:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ From 6600c7c2821f6f4ef32c3d89b43da9cd85022ca0 Mon Sep 17 00:00:00 2001 From: leilei Date: Mon, 24 Nov 2025 10:10:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E7=BB=9F=E4=B8=80=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/InviteJoin/index.vue | 2 +- src/layout/index.vue | 2 +- src/utils/whiteboardSync.js | 2 +- src/utils/whiteboardSync_old.js | 2 +- src/views/coordinate/personnelList/index.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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())