-
-
-
-
- 
- 
- 
-
-
-
-
-
- 检查 Internet 连接
-
- 请检查你的网络电缆、调制解调器和路由器。
-
-
-
- 要允许 Microsoft Edge
- 访问网络，请在防火墙或防病毒软件中进行
- 设置。
-
- 如果它已被列为允许访问网络的程序，请尝试
- 将其从列表中删除，然后重新添加。
-
-
-
- 如果使用代理服务器:
-
- 请检查代理设置。你可能需要向组织询问代理服务器是否正在工作。如果你认为不应该使用代理服务器，请设置
- >
- 系统
- >
- 打开计算机的代理设置
- 
- 
- 
-
-
-
\ No newline at end of file
diff --git a/web/src/config/GlobalConfig.ts b/web/src/config/GlobalConfig.ts
index ebfb919..43ec09b 100644
--- a/web/src/config/GlobalConfig.ts
+++ b/web/src/config/GlobalConfig.ts
@@ -3,7 +3,6 @@ export {IceServer};
const IceServer: RTCIceServer = {
"credential": "123456",
- "credentialType": "password",
"urls": "turn:cloud.wzpmc.cn:3478",
"username": "wzp"
}
\ No newline at end of file
diff --git a/web/src/entities/MessageData.ts b/web/src/entities/MessageData.ts
index 2cd8760..0dc128a 100644
--- a/web/src/entities/MessageData.ts
+++ b/web/src/entities/MessageData.ts
@@ -20,10 +20,10 @@ export interface MessageData {
type: MessageTypes | undefined;
}
export const isSelf = (message: MessageData): boolean => {
- const store = useStore();
+ const {userinfo} = useStore();
let name = null;
- if (store.userinfo !== null){
- name = store.userinfo.username
+ if (userinfo !== null){
+ name = userinfo.username
}
return message.sender === name;
}
\ No newline at end of file
diff --git a/web/src/main.ts b/web/src/main.ts
index d49b40c..13cf121 100644
--- a/web/src/main.ts
+++ b/web/src/main.ts
@@ -3,9 +3,7 @@ import App from './App.vue'
import 'element-plus/dist/index.css'
import router from './router'
import { createPinia, PiniaPluginContext } from 'pinia'
-import ElementPlus from "element-plus";
-
-const app = createApp(App)
+const app = createApp(App);
const piniaPlugin = (context: PiniaPluginContext) => {
const { store } = context;
// $subscribe state值发生变化时会执行传入的回调
diff --git a/web/src/router/index.ts b/web/src/router/index.ts
index 1d892b1..e852f2a 100644
--- a/web/src/router/index.ts
+++ b/web/src/router/index.ts
@@ -19,26 +19,18 @@ const router = createRouter({
meta: {
title: '注册',
},
- },
- {
- path: '/404',
- name: '404',
- component: () => import(`../components/NotFound.vue`),
- meta: {
- title: '哎呦，页面找不到了',
- }
}
]
})
// 全局路由守卫
-router.beforeEach((to, from)=>{
+router.beforeEach((to)=>{
// 设置网页标题
document.title = "电子职高校内交流平台-" + `${to.meta.title}`;
// 获取状态管理器
let store = useStore();
let routers = router.getRoutes();
// 判断用户是否已登陆，并且刷新页面
- if (store.userinfo !== null && routers.length === 3){
+ if (store.userinfo !== null && routers.length === 2){
router.addRoute({path: '/home', name: 'home', component: () => import("../views/home/index.vue"), meta: {title: '首页'}});
router.addRoute("home",{path: 'chat', name:'chat', component: () => import("../views/chat/index.vue"), meta: {title: '聊天频道'}})
router.addRoute("home",{path: 'file', name:'file', component: () => import("../views/file/index.vue"), meta: {title: '文件分享'}})
@@ -55,17 +47,13 @@ router.beforeEach((to, from)=>{
}
// 验证用户是否输入了正确的地址
// 如果当前路由没有该地址，则跳转至404
- let num = 0;
- for (let i = 0; i < routers.length; i++) {
- if (routers[i].name === to.name){
- continue;
- }else{
- num++;
- }
- if (num === routers.length && to.name !== "404"){
- return {name:'404'}
+ for (let route of routers) {
+ if (route.name === to.name){
+ return true;
}
}
+ ElMessage.warning("页面找不到，返回主页");
+ return {name: store.userinfo === null ? 'login' : 'home'};
})
export default router
\ No newline at end of file
diff --git a/web/src/views/chat/index.vue b/web/src/views/chat/index.vue
index 4bc6f53..e3933a8 100644
--- a/web/src/views/chat/index.vue
+++ b/web/src/views/chat/index.vue
@@ -1,5 +1,9 @@
+ 