leil/xSynergy-manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:跟新密码加密 共享白板功能

Browse Source
This commit is contained in:
leilei
2025-10-11 17:28:20 +08:00
parent e429e4286a
commit db72ea9f33
18 changed files with 1434 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/utils/auth.js
View File

@@ -1,9 +1,7 @@
import Cookies from "js-cookie";
const TokenKey = "token";
const ExpiresInKey = "Meta-Enterprise-Expires-In";
const TokenKey = "token";
export function getToken() {
return Cookies.get(TokenKey);
@@ -17,14 +15,3 @@ export function removeToken() {
return Cookies.remove(TokenKey);
}
export function getExpiresIn() {
return Cookies.get(ExpiresInKey) || -1;
}
export function setExpiresIn(time) {
return Cookies.set(ExpiresInKey, time);
}
export function removeExpiresIn() {
return Cookies.remove(ExpiresInKey);
}

8
src/utils/request.js
View File

@@ -33,7 +33,7 @@ service.interceptors.request.use(
// 是否需要防止数据重复提交
const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
if (meterStore.getSudid()) {
if (meterStore.getSudid()) {
config.headers["X-User-Agent"] = `gxtech/web 1.0.0: c=GxTech, udid=${meterStore.getSudid()}, sv=15.4.1, app=stt`;
}
// get请求映射params参数
@@ -121,10 +121,8 @@ service.interceptors.response.use(
switch (businessCode) {
case 200:
case 201:
return Promise.resolve(responseData);
case 401:
console.log('未授权', responseData)
return Promise.resolve(responseData);
case 401:
return Promise.resolve(responseData);
// return handleUnauthorized().then(() => {
// return Promise.reject({ code: 401, message: '未授权' });

20
src/utils/whiteboardSync.js
View File

@@ -2,6 +2,7 @@ import { mqttClient } from "./mqtt";
import { getWhiteboardShapes, getWhiteboardHistory } from "@/views/custom/api";
import { useMeterStore } from '@/stores/modules/meter';
import { encode, decode } from '@msgpack/msgpack'
import { ElMessage } from 'element-plus';
const meterStore = useMeterStore();
meterStore.initUdid();
@@ -11,7 +12,7 @@ let canvasInstance = null;
// 获取本地缓存 userData
function getLocalUserData() {
const dataStr = localStorage.getItem('userData');
const dataStr = sessionStorage.getItem('userData');
if (!dataStr) return null;
try {
return JSON.parse(dataStr);
@@ -28,8 +29,7 @@ export const WhiteboardSync = {
canvasInstance = canvas;
const localUser = getLocalUserData();
const localUid = localUser?.user?.uid;
const localUid = localUser?.uid;
try {
// 先连接 MQTT
await mqttClient.connect(meterStore.getSudid());
@@ -43,18 +43,19 @@ export const WhiteboardSync = {
// 订阅当前房间
const topic = `xSynergy/ROOM/${roomUid}/whiteboard/#`;
mqttClient.subscribe(topic, async (shapeData) => {
// console.log(shapeData, 'shapeData++格式装换')
const shapeDataNew = decode(shapeData);
mqttClient.subscribe(topic, async (shapeData) => {
const shapeDataNew = JSON.parse(shapeData.toString())
// const shapeDataNew = decode(message);
// console.log(shapeDataNew, '格式解码')
try {
isRemote = true;
// 如果 shape 来自本地用户，则跳过
if (shapeDataNew.user_uid === localUid) return;
// 如果 shape 来自本地用户，则跳过
if (shapeDataNew.user_uid === localUid) return;
const res = await getWhiteboardHistory({ after_timestamp: shapeDataNew.created_at }, roomUid);
if (res.meta.code === 200) {
canvasInstance.addShape(res.data.shapes);
} else {
ElMessage.error("获取历史数据失败");
console.error("获取历史数据失败");
}
} catch (e) {
@@ -71,7 +72,7 @@ export const WhiteboardSync = {
}
// 监听画布事件：新增图形
canvas.on('drawingEnd', async (shape) => {
canvas.on('drawingEnd', async (shape) => {
// 如果来自远程，或不是需要同步的类型，跳过
if (isRemote || !['pencil', 'line', 'rectangle', 'circle', 'eraser'].includes(shape.type)) return;
@@ -82,6 +83,7 @@ export const WhiteboardSync = {
try {
await getWhiteboardShapes(shape, roomUid);
} catch (err) {
ElMessage.error("提交形状失败");
console.error("提交形状失败:", err);
}
});

103
src/utils/whiteboardSync_old.js Normal file
View File

@@ -0,0 +1,103 @@
import { mqttClient } from "./mqtt";
import { getWhiteboardShapes, getWhiteboardHistory } from "@/views/custom/api";
import { useMeterStore } from '@/stores/modules/meter';
import { encode, decode } from '@msgpack/msgpack'
import { ElMessage } from 'element-plus';
const meterStore = useMeterStore();
meterStore.initUdid();
let isRemote = false;
let canvasInstance = null;
// 获取本地缓存 userData
function getLocalUserData() {
const dataStr = sessionStorage.getItem('userData');
if (!dataStr) return null;
try {
return JSON.parse(dataStr);
} catch (e) {
console.error("解析 userData 失败:", e);
return null;
}
}
export const WhiteboardSync = {
async init(canvas, roomUid) {
if (!canvas || !roomUid) return;
console.log('初始化多人同步:', roomUid);
canvasInstance = canvas;
const localUser = getLocalUserData();
const localUid = localUser?.uid;
try {
// 先连接 MQTT
await mqttClient.connect(meterStore.getSudid());
console.log("✅ MQTT 已连接");
// 获取历史数据
const res = await getWhiteboardHistory({ after_timestamp: 0 }, roomUid);
if (res.meta.code === 200 && res.data.shapes.length > 0) {
canvasInstance.addShape(res.data.shapes);
}
// 订阅当前房间
const topic = `xSynergy/ROOM/${roomUid}/whiteboard/#`;
mqttClient.subscribe(topic, async (shapeData) => {
const shapeDataNew = JSON.parse(shapeData.toString())
// const shapeDataNew = decode(message);
// console.log(shapeDataNew, '格式解码')
try {
isRemote = true;
// 如果 shape 来自本地用户，则跳过
if (shapeDataNew.user_uid === localUid) return;
const res = await getWhiteboardHistory({ after_timestamp: shapeDataNew.created_at }, roomUid);
if (res.meta.code === 200) {
canvasInstance.addShape(res.data.shapes);
} else {
ElMessage.error("获取历史数据失败");
console.error("获取历史数据失败");
}
} catch (e) {
console.error("处理MQTT数据失败:", e);
} finally {
isRemote = false;
}
});
console.log("✅ 已订阅:", topic);
} catch (err) {
console.log("初始化多人同步失败:", err)
// console.error("❌ 连接或订阅失败:", err);
}
// 监听画布事件：新增图形
canvas.on('drawingEnd', async (shape) => {
// 如果来自远程，或不是需要同步的类型，跳过
if (isRemote || !['pencil', 'line', 'rectangle', 'circle', 'eraser'].includes(shape.type)) return;
// 如果是本地用户自己的 shape，则不调用接口
if (shape.user_uid && shape.user_uid === localUid) return;
shape.room_uid = roomUid;
try {
await getWhiteboardShapes(shape, roomUid);
} catch (err) {
ElMessage.error("提交形状失败");
console.error("提交形状失败:", err);
}
});
// 监听画布事件：清空
canvas.on('clear', async () => {
if (!isRemote) {
try {
// TODO: 调用接口，后端再发 MQTT
// await clearWhiteboard(roomUid);
} catch (err) {
console.error("提交清空失败:", err);
}
}
});
},
};