From 1b92d4371d92813f805c54b5ad68cd0a3f800191 Mon Sep 17 00:00:00 2001
From: wangxulei <727869402@qq.com>
Date: Fri, 10 Jan 2025 16:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90websocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/chat/mapper/xml/ChatMapper.xml   |  3 ++-
 .../webSocket/handler/P2PMessageHandler.java  |  2 +-
 web/src/api/websocket.js                      |  1 +
 web/src/utils/request.js                      |  1 +
 web/src/views/common/Im.vue                   | 23 ++-----------------
 web/src/views/login/login.vue                 | 15 ++++++------
 6 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/dd/admin/business/chat/mapper/xml/ChatMapper.xml b/src/main/java/com/dd/admin/business/chat/mapper/xml/ChatMapper.xml
index 33465ec..9da0f69 100644
--- a/src/main/java/com/dd/admin/business/chat/mapper/xml/ChatMapper.xml
+++ b/src/main/java/com/dd/admin/business/chat/mapper/xml/ChatMapper.xml
@@ -114,7 +114,7 @@
 
     <select id="selectAuthorChatList" resultType="com.dd.admin.business.chat.domain.AuthorChat">
               SELECT
-               wa.AUTHOR_ID id,
+                    wa.AUTHOR_ID id,
                     wa.AUTHOR_NAME displayName,
                     wa.AVATAR_URL avatar,
                     wa.AUTHOR_NAME AS 'index',
@@ -161,6 +161,7 @@
                         ORDER BY
                                     create_time DESC
                         ) wb ON wa.author_id = wb.authorId
+                        where wa.AUTHOR_ID != #{authorId}
                         GROUP BY
                             wa.author_id
                         ORDER BY
diff --git a/src/main/java/com/dd/admin/business/webSocket/handler/P2PMessageHandler.java b/src/main/java/com/dd/admin/business/webSocket/handler/P2PMessageHandler.java
index 94f8d9d..9c587c0 100644
--- a/src/main/java/com/dd/admin/business/webSocket/handler/P2PMessageHandler.java
+++ b/src/main/java/com/dd/admin/business/webSocket/handler/P2PMessageHandler.java
@@ -1 +1 @@
-package com.dd.admin.business.webSocket.handler;

import cn.hutool.core.bean.BeanUtil;
import com.dd.admin.business.chat.domain.ChatVo;
import com.dd.admin.business.chat.domain.MessageBean;
import com.dd.admin.business.chat.entity.Chat;
import com.dd.admin.business.chat.service.ChatService;
import com.dd.admin.business.webSocket.MsgHandlerInterface;
import com.dd.admin.business.webSocket.util.TioUtil;
import com.dd.admin.common.utils.AddressUtils;
import com.dd.admin.common.utils.HttpContext;
import com.dd.admin.common.utils.IPUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.tio.core.ChannelContext;
import org.tio.core.Tio;
import org.tio.http.common.HttpRequest;
import org.tio.utils.lock.SetWithLock;

import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;


@Component
@Slf4j
@Service("5")
public class P2PMessageHandler implements MsgHandlerInterface {

    public static P2PMessageHandler handler;

    @Autowired
    ChatService chatService;


    public static long convertToShanghaiTimeZoneTimestamp(Date createTime) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(createTime);
        calendar.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
        return calendar.getTimeInMillis();
    }

    @Override
    public Object handler(Map map, ChannelContext context ){
        Chat chat = BeanUtil.toBean(map, Chat.class);

        chat.setIpAddress(context.getClientNode().getIp());
        chat.setIpRealAddress(AddressUtils.getRealAddress(chat.getIpAddress())); //ip真实地址
        chatService.save(chat);

        ChatVo chatVo = chatService.selectChat(chat.getChatId());
        if(chat.getToId().equals("8")){
            MessageBean messageBean = new MessageBean();
            messageBean.setId(chatVo.getChatId());
            messageBean.setContent(chatVo.getContent());
            messageBean.setSendTime(convertToShanghaiTimeZoneTimestamp(chatVo.getCreateTime()));
            messageBean.setStatus("succeed");
            messageBean.setType("text");
            messageBean.setToContactId(chatVo.getToId());
            MessageBean.FromUser fromUser = new MessageBean.FromUser();
            fromUser.setAvatar(chatVo.getFromAvatar());
            fromUser.setDisplayName(chatVo.getFromName());
            fromUser.setId(chatVo.getFromId());
            messageBean.setFromUser(fromUser);
            System.out.println(messageBean);
            TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getToId(),"6",messageBean);
        }else{
            TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getToId(),"5",chatVo);
        }

        TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getFromId(),"5",chatVo);

        return null;
    }}
\ No newline at end of file
+package com.dd.admin.business.webSocket.handler;

import cn.hutool.core.bean.BeanUtil;
import com.dd.admin.business.chat.domain.ChatVo;
import com.dd.admin.business.chat.domain.MessageBean;
import com.dd.admin.business.chat.entity.Chat;
import com.dd.admin.business.chat.service.ChatService;
import com.dd.admin.business.webSocket.MsgHandlerInterface;
import com.dd.admin.business.webSocket.util.TioUtil;
import com.dd.admin.common.utils.AddressUtils;
import com.dd.admin.common.utils.HttpContext;
import com.dd.admin.common.utils.IPUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.tio.core.ChannelContext;
import org.tio.core.Tio;
import org.tio.http.common.HttpRequest;
import org.tio.utils.lock.SetWithLock;

import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;


@Component
@Slf4j
@Service("5")
public class P2PMessageHandler implements MsgHandlerInterface {

    public static P2PMessageHandler handler;

    @Autowired
    ChatService chatService;


    public static long convertToShanghaiTimeZoneTimestamp(Date createTime) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(createTime);
        calendar.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
        return calendar.getTimeInMillis();
    }

    @Override
    public Object handler(Map map, ChannelContext context ){
        Chat chat = BeanUtil.toBean(map, Chat.class);

        chat.setIpAddress(context.getClientNode().getIp());
        chat.setIpRealAddress(AddressUtils.getRealAddress(chat.getIpAddress())); //ip真实地址
        chatService.save(chat);

        ChatVo chatVo = chatService.selectChat(chat.getChatId());
        if(chat.getToId().equals("8")){
            MessageBean messageBean = new MessageBean();
            messageBean.setId(chatVo.getChatId());
            messageBean.setContent(chatVo.getContent());
            messageBean.setSendTime(convertToShanghaiTimeZoneTimestamp(chatVo.getCreateTime()));
            messageBean.setStatus("succeed");
            messageBean.setType("text");
            messageBean.setToContactId(chatVo.getFromId());
            MessageBean.FromUser fromUser = new MessageBean.FromUser();
            fromUser.setAvatar(chatVo.getFromAvatar());
            fromUser.setDisplayName(chatVo.getFromName());
            fromUser.setId(chatVo.getFromId());
            messageBean.setFromUser(fromUser);
            System.out.println(messageBean);
            TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getToId(),"6",messageBean);
        }else{
            TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getToId(),"5",chatVo);
        }

        TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getFromId(),"5",chatVo);

        return null;
    }}
\ No newline at end of file
diff --git a/web/src/api/websocket.js b/web/src/api/websocket.js
index 30b77b4..e3489ef 100644
--- a/web/src/api/websocket.js
+++ b/web/src/api/websocket.js
@@ -47,6 +47,7 @@ class WebSocketManager {
         console.log('WebSocket连接关闭');
         this.isConnected = false;
         this.onCloseCallback && this.onCloseCallback(event);
+        this.reconnect(url);
       };
       this.webSocketInstance.onopen = () => {
         console.log("WebSocket连接成功");
diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index d8fe2be..f9c774a 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -32,6 +32,7 @@ service.interceptors.request.use(
   error => {
     // do something with request error
     console.log(error) // for debug
+
     return Promise.reject(error)
   }
 )
diff --git a/web/src/views/common/Im.vue b/web/src/views/common/Im.vue
index a649eef..d74880b 100644
--- a/web/src/views/common/Im.vue
+++ b/web/src/views/common/Im.vue
@@ -42,39 +42,20 @@
       }
     },
     mounted(){
-      webSocketManager.connect('ws://192.168.10.98:9326/?authorId=8')
+      webSocketManager.connect('ws://192.168.1.136:9326/?authorId=8')
 
       // 设置收到消息回调函数
       webSocketManager.onMessage((data) => {
         if(data.handlerType == '6'){
           console.log('mounted')
-
-
           console.log(JSON.stringify(data.body))
           const {IMUI} = this.$refs;
-          IMUI.appendMessage({
-            "content": "1",
-            "fromUser": {
-              "avatar": "http://8.146.211.120:8080/upload/avatar/avatar (3).jpg",
-              "displayName": "复古喵星人15",
-              "id": "8"
-            },
-            "handlerType": 0,
-            "id": "c4d344c83fe0e86e23b7508b73e0b5ef",
-            "sendTime": 1736439914000,
-            "status": "succeed",
-            "toContactId": "8",
-            "type": "text"
-          });
+          IMUI.appendMessage(data.body);
         }
       });
 
     },
     methods: {
-      handleMessage(e) {
-        console.log('在Vue组件中接收到消息并处理，消息内容:');
-        // 这里可以根据组件的业务逻辑，比如将消息展示在页面上，更新组件状态等操作
-      },
       open() {
         this.dialogVisible = true
         this.getAuthorList()
diff --git a/web/src/views/login/login.vue b/web/src/views/login/login.vue
index 2243edd..aa4aa68 100644
--- a/web/src/views/login/login.vue
+++ b/web/src/views/login/login.vue
@@ -38,8 +38,8 @@
                             z-0
                         "></div>
         <div class="w-full max-w-md z-10">
-          <div class="sm:text-4xl xl:text-4xl font-bold leading-tight mb-6">门店会员收银系统(开源版)</div>
-          <div class="sm:text-sm xl:text-md text-gray-200 font-normal">你的门店小助手</div>
+          <div class="sm:text-4xl xl:text-4xl font-bold leading-tight mb-6"></div>
+          <div class="sm:text-sm xl:text-md text-gray-200 font-normal"></div>
         </div>
         <ul class="circles">
           <li></li>
@@ -207,11 +207,12 @@
             </div>
 
             <div style="font-weight: 500;font-size: 13px;letter-spacing: 1px;">
-              <span>门店账号：用户名:demo   密码：111111</span><br/><br/>
-              <span>管理端账号：用户名:admin  密码：111111</span><br/><br/>
-              <span>商业合作：qq: 7827869402   vx: MAMBA_4EVER24</span><br/><br/>
-              <span> <a target="_blank" style="text-decoration: underline;" href="http://8.146.211.120:8086/"> 完整版演示 http://8.146.211.120:8086/</a></span><br/><br/>
-              <span> <a target="_blank" style="text-decoration: underline;" href="http://8.146.211.120:8087/"> 移动端登陆 http://8.146.211.120:8087/</a></span>
+<!--              <span>门店账号：用户名:demo   密码：111111</span><br/><br/>-->
+<!--              <span>管理端账号：用户名:admin  密码：111111</span><br/><br/>-->
+<!--              <span>商业合作：qq: 7827869402   vx: MAMBA_4EVER24</span><br/><br/>-->
+<!--              <span> <a target="_blank" style="text-decoration: underline;" href="http://8.146.211.120:8086/"> 完整版演示 http://8.146.211.120:8086/</a></span><br/><br/>-->
+<!--              <span> <a target="_blank" style="text-decoration: underline;" href="http://8.146.211.120:8087/"> 移动端登陆 http://8.146.211.120:8087/</a></span>-->
+
             </div>
             <!--                            <p class="-->
             <!--                                    items-center-->