From b30568afb0dbe34944e45e549d8b0da98edfc98d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 29 十月 2024 14:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/folder/index.vue |    2 +-
 index.html                 |    2 +-
 src/views/meet/index.vue   |   44 ++++++++++++++++++++++----------------------
 src/views/exam/index.vue   |    2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/index.html b/index.html
index 25a4847..2de7bfc 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>璇煶瑙嗛鍩硅绯荤粺</title>
     <!-- 鐢熶骇鐗堟湰鎹㈡簮 -->
-    <script src='https://www.kgmeet.com:18443/external_api.js'></script>
+    <script src='https://ycl.easyblog.vip:82/external_api.js'></script>
   </head>
   <body>
     <div id="app"></div>
diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index 29ad708..b058404 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -200,7 +200,7 @@
 const timeDialog = ref(false);
 
 const { status, message, error, connect, disconnect, sendMessage } = useWebScoket({
-  url: 'wss://www.kgmeet.com:18443/websocket/' + userInfo.value.id,
+  url: 'wss://ycl.easyblog.vip:82/websocket/' + userInfo.value.id,
   heartBeatData: 'ping'
 });
 
diff --git a/src/views/folder/index.vue b/src/views/folder/index.vue
index 0de9890..d577318 100644
--- a/src/views/folder/index.vue
+++ b/src/views/folder/index.vue
@@ -201,7 +201,7 @@
 const { userInfo } = storeToRefs(userStore);
 const { status, message, error, connect, disconnect, sendMessage } =
   useWebScoket({
-    url: "wss://www.kgmeet.com:18443/websocket/" + userInfo.value.id,
+    url: "wss://ycl.easyblog.vip:82/websocket/" + userInfo.value.id,
     heartBeatData: "ping",
   });
 
diff --git a/src/views/meet/index.vue b/src/views/meet/index.vue
index 14a0d0a..dca381c 100644
--- a/src/views/meet/index.vue
+++ b/src/views/meet/index.vue
@@ -21,7 +21,7 @@
 onMounted(() => {
   const width = window.innerWidth;
   const height = window.innerHeight;
-  const domain = 'www.kgmeet.com:8443/' + id;
+  const domain = 'ycl.easyblog.vip:8443/' + id;
   const options = {
     roomName: meetName,
     width: width,
@@ -55,7 +55,7 @@
         ]
       },
       ModeratorIndicator: true,
-      startSilent: false,
+      // startSilent: true,
       //绂佺敤鏀瑰悕
       readOnlyName: true,
       //鍙備細鑰呭悕鍗�
@@ -130,7 +130,7 @@
   jitsiInit();
 
   // 杩炴帴webscoket
-  connect();
+  // connect();
 });
 
 const jitsiInit = () => {
@@ -139,26 +139,26 @@
   });
 }
 
-const {status, message, error, connect, disconnect, sendMessage} = useWebScoket({
-  url: 'wss://www.kgmeet.com:18443/websocket/' + userInfo._rawValue.id,
-  heartBeatData: 'ping'
-});
+// const {status, message, error, connect, disconnect, sendMessage} = useWebScoket({
+//   url: 'wss://ycl.easyblog.vip:82/websocket/' + userInfo._rawValue.id,
+//   heartBeatData: 'ping'
+// });
 
-watch(
-    () => message.value,
-    (msg) => {
-      console.log('msg', msg.commend);
-      if (msg.commend === 'kickOut') {
-        jitsiApi.executeCommand('hangup');
-      }
-      if (msg.commend === 'mute') {
-        jitsiApi.executeCommand('toggleAudio');
-      }
-      if (msg.commend === 'openCamera') {
-        jitsiApi.executeCommand('toggleVideo');
-      }
-    }
-);
+// watch(
+//     () => message.value,
+//     (msg) => {
+//       console.log('msg', msg.commend);
+//       if (msg.commend === 'kickOut') {
+//         jitsiApi.executeCommand('hangup');
+//       }
+//       if (msg.commend === 'mute') {
+//         jitsiApi.executeCommand('toggleAudio');
+//       }
+//       if (msg.commend === 'openCamera') {
+//         jitsiApi.executeCommand('toggleVideo');
+//       }
+//     }
+// );
 
 
 </script>

--
Gitblit v1.8.0