add

src/axios/index.ts

 // axios.js
+import { useUserStore } from '../store/modules/user'
 import axios from "axios";
 const instance = axios.create({
-  // baseURL: "http://192.168.31.228:8080", // 设置基础 URL
-  baseURL:'',
+  baseURL: "http://192.168.31.228:8080", // 设置基础 URL
+  // baseURL:'',
   timeout: 1000, // 设置请求超时时间
 });
-
 instance.interceptors.request.use(
   (config: any) => {
     // 在发送请求之前做些什么，例如添加 token
-    const token = localStorage.getItem("token");
+    const token = useUserStore().userInfo.token;
     if (token) {
-      config.headers['X-Access-Token'] = `Bearer ${token}`;
+      config.headers['token'] = `${useUserStore().userInfo.token}`;
     }
     return config;
   },

src/axios/model/user.ts

@@ -6,7 +6,6 @@ const Login = (query: any) => {
     method: "post",
     data: query,
   });
-  
 };
 //新增询价单
 const InquiryAdd = (query: any) => {
@@ -27,17 +26,17 @@ const Kjiehuifu = (query: any) => {
 //获取用户列表
 const getUserList = (query: any) => {
   return http({
-    url: "/getUserList",
+    url: "/kf/chat/getChatList",
     method: "get",
-    data: query,
+    params: query,
   });
 };
 //查看未读消息
 const checkMesssages = (query: any) => {
   return http({
-    url: "/checkMesssages",
+    url: "/kf/chat/getChatHisList",
     method: "get",
-    data: query,
+    params: query,
   });
 };
 //上传接口
@@ -58,11 +57,11 @@ const upload = (query: any) => {
   });
 };
 //删除
-const deleteUserList =  (query: any) => {
+const deleteUserList = (query: any) => {
   return http({
     url: `/deleteUserList`,
     method: "delete",
-    params:query
+    params: query,
   });
 };
 export {
@@ -73,5 +72,5 @@ export {
   checkMesssages,
   upload,
   getUploadConfigInfo,
-  deleteUserList
+  deleteUserList,
 };

src/minxins/minxin.js

-// import io from 'socket.io-client';
-// import { ref, onMounted, onUnmounted } from 'vue'
-// import { ElMessage } from 'element-plus'
-// export default function () {
-//     const message = {};
-//     const showMessage = {};
-//     const socket = ref(new WebSocket("ws://192.168.31.228:8888?username=admin&password=123"));
-//     socket.value.onopen = function (e) {
-//         console.log(e)
-//     }
-//     socket.value.onerror = function(e){
-//         console.log(e)
-//     };
-//     socket.value.onmessage = function (e) {
-//         console.log(e)
-
-//     };
-//     return {
-//         message,
-//         showMessage
-//     }
-// }
\ No newline at end of file

src/store/modules/user.ts

 import moment from "moment";
 import { defineStore } from "pinia";
+import { getUserList } from "@/axios/model/user";
 export const useUserStore = defineStore("user", {
   state: () => {
     return {
@@ -9,8 +10,8 @@ export const useUserStore = defineStore("user", {
       count: 0,
       userInfo: {
         username: "admin",
-        password:"",
-        token:""
+        password: "",
+        token: "",
       },
       userList: [],
     };
@@ -25,57 +26,29 @@ export const useUserStore = defineStore("user", {
     setUserInfo(res: any) {
       this.userInfo = res;
     },
-    setUserList(res: any) {
-      this.userList = res;
-    },
+    // setUserList(res: any) {
+    //   this.userList = res;
+    // },
     setUserListMessages(res: any) {
-      console.log(res)
-      const userList: any = this.userList || [];
-      // res.from = res.from.replace('游客','')
-      const obj = {
-        ...res,
-        isSent: false,
-        userImg:
-          "https://cdn.lirimall.com//lirigo/filetempImage/新鲜水果_1661668973048.png",
-        time: moment(res.createTime).format("YYYY-DD-MM HH:mm:ss"),
-      };
-      
-      const info = {
-        userId: res.id,
-        username: res.from,
-        messages: [obj],
-        userImg: obj.userImg,
-      };
-      if (
-        userList.length > 0 &&
-        userList.some((item: any) => item.username == res.from)
-      ) {
-        userList.forEach((item: any) => {
-          if (item.username == res.from) item.messages.push(obj);
-        });
-      } else {
-        userList.push(info);
-      }
-      this.userList = userList;
-    },
-    setusernameMessage(res: any) {
-      const friends = res.friends;
-      for (const key in friends) {
-        const chatDatas = friends[key];
-        chatDatas.forEach((item: any) => {
-          item.userImg =
-            "https://cdn.lirimall.com//lirigo/filetempImage/新鲜水果_1661668973048.png";
-          item.time = moment(res.createTime).format("YYYY-DD-MM HH:mm:ss");
+      console.log("调取setUserListMessages");
+      return new Promise((resolve, reject) => {
+        const query = {
+          code: this.userInfo.username,
+        };
+        getUserList(query).then(({ success, result, message }: any) => {
+          if (success) {
+            this.userList = result.map((item: any) => {
+              return {
+                ...item,
+                username: item.id,
+                messages: [],
+              };
+            });
+            console.log(this.userList);
+            resolve(result);
+          }
         });
-        for (const index in chatDatas) {
-          const userId = chatDatas[index].from;
-          this.userList.forEach((item: any) => {
-            if (item && item?.username == userId) {
-              item.messages = chatDatas;
-            }
-          });
-        }
-      }
+      });
     },
     connect() {
       // 连接成功后，将 isConnected 状态设置为 true

src/utils/websocket.ts

@@ -26,7 +26,7 @@ function creatWebSocket(wsUrl: string) {
 // 初始化websocket
 function initWebSocket(wsUrl: string) {
   if (!websocket) websocket = new WebSocket(wsUrl);
-  websocket.onopen = function () {
+  websocket.onopen = function (eee) {
     websocketOpen();
   };
   //   // 接收
@@ -64,14 +64,14 @@ function websocketOpen() {
 }
 // 数据接收
 function websocketonmessage(e: MessageEvent<any>) {
-  console.log('接受数据',e.data)
   const res = JSON.parse(e.data); // 解析JSON格式的数据
-  // 下面的判断则是后台返回的接收到的数据  如何处理自己决定
+  console.log(res,'res')
   if (res.command == 11) {
     //将数据放在store中
-    useUserStore().setUserListMessages(res.data);
-  } else if (res.command == 20) {
-    useUserStore().setusernameMessage(res.data);
+    // 下面的判断则是后台返回的接收到的数据  如何处理自己决定
+    useUserStore()
+      .setUserListMessages(res.data)
+      .then();
   }
 }
 
@@ -82,7 +82,6 @@ function websocketclose(e: any) {
 
 // 数据发送
 function websocketsend(res: any) {
-  console.log(websocket, "websocket");
   if (websocket && useUserStore().isConnected) {
     // 检查连接状态
     console.log("发送的数据", websocket);