From 3943c7e56e5ea8d6895985192611f3780b595249 Mon Sep 17 00:00:00 2001 From: wxl <727869402@qq.com> Date: Fri, 10 Jan 2025 22:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=98=E6=96=B9=E5=AE=A2=E6=9C=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQLREADME.md | 4 ++++ .../starNotes/service/impl/StarNotesServiceImpl.java | 1 - .../business/upNotes/service/impl/UpNotesServiceImpl.java | 1 - .../business/webSocket/handler/ServiceMessageHandler.java | 2 +- .../dd/admin/common/security/interceptor/ApiInterceptor.java | 2 +- web/src/views/common/Im.vue | 5 ++--- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/SQLREADME.md b/SQLREADME.md index f581007..a4e0e3f 100644 --- a/SQLREADME.md +++ b/SQLREADME.md @@ -4,4 +4,8 @@ DROP COLUMN `AUTHOR_AVATAR`, DROP COLUMN `UP_COUNT`, DROP COLUMN `STAR_COUNT`; +#### 官方客服 +INSERT INTO `ddxhs`.`business_author` (`AUTHOR_ID`, `AUTHOR_NO`, `AUTHOR_NAME`, `AVATAR_ID`, `AVATAR_URL`, `DESCRIPTION`, `SEX`, `BIRTH`, `JOB`, `AREA`, `SCHOOL`, `BACK_GROUND_ID`, `BACK_GROUND_URL`, `FOLLOW`, `FANS`, `UP_COUNT`, `STAR_COUNT`, `AUTHOR_STATUS`, `VERSION`, `DELETED`, `CREATE_TIME`, `UPDATE_TIME`, `IP_ADDRESS`, `IP_REAL_ADDRESS`, `REAL_NAME`, `ID_CARD`, `PHONE_NUMBER`) VALUES ('8', '8', '官方客服', NULL, 'http://8.146.211.120:8080/upload/avatar/kefu.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '0', '0', '0', '0', '0', '0', '2025-01-09 18:20:57', '2025-01-10 22:49:50', '222.137.130.228', '郑州', NULL, NULL, '8'); + + diff --git a/src/main/java/com/dd/admin/business/starNotes/service/impl/StarNotesServiceImpl.java b/src/main/java/com/dd/admin/business/starNotes/service/impl/StarNotesServiceImpl.java index 869c762..b0a7735 100644 --- a/src/main/java/com/dd/admin/business/starNotes/service/impl/StarNotesServiceImpl.java +++ b/src/main/java/com/dd/admin/business/starNotes/service/impl/StarNotesServiceImpl.java @@ -57,7 +57,6 @@ public class StarNotesServiceImpl extends ServiceImpl queryWrapper = new LambdaUpdateWrapper(); queryWrapper.eq(StarNotes::getAuthorId,authorId); - queryWrapper.ne(StarNotes::getFollowId,authorId); queryWrapper.set(StarNotes::getMessageStatus,1); this.update(queryWrapper); } diff --git a/src/main/java/com/dd/admin/business/upNotes/service/impl/UpNotesServiceImpl.java b/src/main/java/com/dd/admin/business/upNotes/service/impl/UpNotesServiceImpl.java index 882b6fb..2dddfd6 100644 --- a/src/main/java/com/dd/admin/business/upNotes/service/impl/UpNotesServiceImpl.java +++ b/src/main/java/com/dd/admin/business/upNotes/service/impl/UpNotesServiceImpl.java @@ -62,7 +62,6 @@ public class UpNotesServiceImpl extends ServiceImpl impl public void readMessage(String authorId) { LambdaUpdateWrapper queryWrapper = new LambdaUpdateWrapper(); queryWrapper.eq(UpNotes::getAuthorId,authorId); - queryWrapper.ne(UpNotes::getFollowId,authorId); queryWrapper.set(UpNotes::getMessageStatus,1); this.update(queryWrapper); } diff --git a/src/main/java/com/dd/admin/business/webSocket/handler/ServiceMessageHandler.java b/src/main/java/com/dd/admin/business/webSocket/handler/ServiceMessageHandler.java index f923a86..454c955 100644 --- a/src/main/java/com/dd/admin/business/webSocket/handler/ServiceMessageHandler.java +++ b/src/main/java/com/dd/admin/business/webSocket/handler/ServiceMessageHandler.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 lombok.extern.slf4j.Slf4j; import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.tio.core.ChannelContext; import java.util.Map; @Component @Slf4j @Service("6") public class ServiceMessageHandler implements MsgHandlerInterface { public static ServiceMessageHandler handler; @Autowired ChatService chatService; @Override public Object handler(Map map, ChannelContext context ){ System.out.println(map); MessageBean messageBean = BeanUtil.toBean(map, MessageBean.class); //xx发送人 MessageBean.FromUser fromUser = messageBean.getFromUser(); Chat chat = new Chat(); chat.setFromId(fromUser.getId()); chat.setFromName(fromUser.getDisplayName()); chat.setToId(messageBean.getToContactId()); chat.setContent(messageBean.getContent()); chat.setIpAddress(context.getClientNode().getIp()); chat.setIpRealAddress(AddressUtils.getRealAddress(chat.getIpAddress())); //ip真实地址 chatService.save(chat); ChatVo chatVo = chatService.selectChat(chat.getChatId()); //如果对方是移动端则按照移动端消息格式推送 TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getToId(),"5",chatVo); //还需要推送给客服自己 TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getFromId(),"6",messageBean); 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 lombok.extern.slf4j.Slf4j; import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.tio.core.ChannelContext; import java.util.Map; @Component @Slf4j @Service("6") public class ServiceMessageHandler implements MsgHandlerInterface { public static ServiceMessageHandler handler; @Autowired ChatService chatService; @Override public Object handler(Map map, ChannelContext context ){ System.out.println(map); MessageBean messageBean = BeanUtil.toBean(map, MessageBean.class); //xx发送人 MessageBean.FromUser fromUser = messageBean.getFromUser(); Chat chat = new Chat(); chat.setFromId(fromUser.getId()); chat.setFromName(fromUser.getDisplayName()); chat.setToId(messageBean.getToContactId()); chat.setContent(messageBean.getContent()); chat.setIpAddress(context.getClientNode().getIp()); chat.setIpRealAddress(AddressUtils.getRealAddress(chat.getIpAddress())); //ip真实地址 chatService.save(chat); ChatVo chatVo = chatService.selectChat(chat.getChatId()); //如果对方是移动端则按照移动端消息格式推送 TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getToId(),"5",chatVo); //还需要推送给客服自己 // TioUtil.sendChatMessageToUser(context.getGroupContext(),chat.getFromId(),"6",messageBean); return null; }} \ No newline at end of file diff --git a/src/main/java/com/dd/admin/common/security/interceptor/ApiInterceptor.java b/src/main/java/com/dd/admin/common/security/interceptor/ApiInterceptor.java index 8c9af94..3cf5991 100644 --- a/src/main/java/com/dd/admin/common/security/interceptor/ApiInterceptor.java +++ b/src/main/java/com/dd/admin/common/security/interceptor/ApiInterceptor.java @@ -56,7 +56,7 @@ public class ApiInterceptor implements HandlerInterceptor { Author author = authorService.getById(authorId); if(author==null){ - throw new ApiException(700,"token已失效"); + throw new ApiException(700,"该用户已删除~"); } request.setAttribute("author",author); if(author.getAuthorStatus()!=null&&author.getAuthorStatus().equals(1)){ diff --git a/web/src/views/common/Im.vue b/web/src/views/common/Im.vue index d74880b..db8309e 100644 --- a/web/src/views/common/Im.vue +++ b/web/src/views/common/Im.vue @@ -42,7 +42,7 @@ } }, mounted(){ - webSocketManager.connect('ws://192.168.1.136:9326/?authorId=8') + webSocketManager.connect('ws://192.168.10.98:9326/?authorId=8') // 设置收到消息回调函数 webSocketManager.onMessage((data) => { @@ -51,6 +51,7 @@ console.log(JSON.stringify(data.body)) const {IMUI} = this.$refs; IMUI.appendMessage(data.body); + IMUI.messageViewToBottom() } }); @@ -97,8 +98,6 @@ console.log('发送了信息') message.handlerType = '6' webSocketManager.sendMessage(JSON.stringify(message)) - - //执行到next消息会停止转圈，如果接口调用失败，可以修改消息的状态 next({status:'failed'}); next(); },