From 0ba86161cb01abcf1e58b2c3ed98a1324efcd877 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Mon, 8 Jul 2024 11:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=A8=E5=86=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E4=BC=A0=E8=BE=93=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E7=9C=8B=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=81=8A=E5=A4=A9=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js      |  2 ++
 src/views/CIDLog.vue | 34 +++-------------------------------
 src/views/Im.vue     |  7 ++++++-
 src/views/Login.vue  |  2 +-
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index f173585..970b7e9 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -22,9 +22,11 @@ export const loginService = (loginData) => {
 
 export const registerService = (registerData) => {
     const params = new URLSearchParams();
+    registerData = registerData._value;
     for (let key in registerData) {
         params.append(key, registerData[key])
     }
+    console.log("registerdata:",registerData)
     return request.post('/user/register', params)
 }
 
diff --git a/src/views/CIDLog.vue b/src/views/CIDLog.vue
index ebcd7ca..e4c28ef 100644
--- a/src/views/CIDLog.vue
+++ b/src/views/CIDLog.vue
@@ -96,42 +96,14 @@ export default {
         console.log(e);
       }
     },
-    async updateButtonCID(index) {
+    async updateButtonLogCID(index) {
+      this.updateDialogVisible = true;
       var id = this.tableData[index].ID;
       this.updateForm.create_time = this.tableData[index].CreatedAt;
       this.updateForm.script = this.tableData[index].Script;
       this.updateForm.end = this.tableData[index].Log;
       this.updateForm.error = this.tableData[index].Error;
     },
-    async addCID() {
-      this.addDialogVisible = false;
-      let result = {};
-      try {
-        result = await addCIDService(this.addForm);
-        if (result.code == 0) {
-          alert("添加成功");
-        } else {
-          alert("添加失败");
-        }
-      } catch (e) {
-        console.log(e);
-      }
-    },
-    async updateCID() {
-      this.updateDialogVisible = false;
-      let result = {};
-      try {
-        result = await updateCIDService(this.updateForm);
-        if (result.code == 0) {
-          alert("修改成功");
-          this.getDeviceList()
-        } else {
-          alert("修改失败");
-        }
-      } catch (e) {
-        console.log(e);
-      }
-    },
     async getIpClient() {
       try {
         const response = await axios.get("https://ipinfo.io/json");
@@ -289,7 +261,7 @@ export default {
                 <el-button
                   type="primary"
                   size="mini"
-                  @click.prevent="updateButtonCID(scope.$index)"
+                  @click.prevent="updateButtonLogCID(scope.$index)"
                   >详情</el-button
                 >
                 <!-- <el-button type="danger" size="mini">删除</el-button> -->
diff --git a/src/views/Im.vue b/src/views/Im.vue
index 5f59357..8ac6216 100644
--- a/src/views/Im.vue
+++ b/src/views/Im.vue
@@ -272,7 +272,7 @@ export default {
       } else {
         console.log("浏览器支持WebSocket");
         let socketUrl =
-          "wss://gep.ljsea.top/im/ws?to_user_id=" +
+          "wss://gep.ljsea.xyz/im/ws?to_user_id=" +
           this.to_user_id +
           "&token=" +
           this.tokenData.token;
@@ -301,6 +301,7 @@ export default {
         this.socket.onmessage = async function (msg) {
           //console.log("收到数据====" + msg.data);
           let data = JSON.parse(msg.data); // 对收到的json数据进行解析， 类似这样的：
+          console.log("收到数据====" + data);
           // 如果服务器端发送过来的json数据
           if (data.type == "msg") {  // 如果是消息类型，解密消息内容
             data.data = await _this.decryptAES(
@@ -312,6 +313,10 @@ export default {
             //console.log("收到数据====" + msg.data);
             // 构建消息内容
             _this.createContent(_this.to_user_name, null, data.data);
+          }else if (data.type == "offline"){
+            alert("对方已下线");
+            this.socket.close();
+            router.push("/user");
           }
         };
       }
diff --git a/src/views/Login.vue b/src/views/Login.vue
index d94ec77..9a765a9 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -223,7 +223,7 @@ const onRegister = async () => {
     return;
   }
 
-  let result = await registerService(register);
+  let result = await registerService(registerData);
   if (result !== null) {
     globalData.token = result.data;
     localStorage.setItem("token", result.data.token);