diff --git a/.gitignore b/.gitignore index 1aa5cb5..04a6707 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /im-platform/src/main/resources/logback-prod.xml /im-server/src/main/resources/application-prod.yml /im-server/src/main/resources/logback-prod.xml +/im-commom/im-commom.iml diff --git a/im-client/pom.xml b/im-client/pom.xml index 73f33b8..9ef288f 100644 --- a/im-client/pom.xml +++ b/im-client/pom.xml @@ -5,7 +5,7 @@ box-im com.bx - 1.0.0 + 1.1.0 4.0.0 @@ -14,8 +14,8 @@ com.bx - commom - 1.0.0 + im-commom + 1.1.0 diff --git a/im-client/src/main/java/com/bx/imclient/IMClient.java b/im-client/src/main/java/com/bx/imclient/IMClient.java index dbe03a3..71c29c2 100644 --- a/im-client/src/main/java/com/bx/imclient/IMClient.java +++ b/im-client/src/main/java/com/bx/imclient/IMClient.java @@ -1,7 +1,7 @@ package com.bx.imclient; -import com.bx.common.model.im.GroupMessageInfo; -import com.bx.common.model.im.PrivateMessageInfo; +import com.bx.imcommon.model.im.GroupMessageInfo; +import com.bx.imcommon.model.im.PrivateMessageInfo; import com.bx.imclient.listener.MessageListenerMulticaster; import com.bx.imclient.sender.IMSender; import org.springframework.beans.factory.annotation.Autowired; diff --git a/im-client/src/main/java/com/bx/imclient/annotation/IMListener.java b/im-client/src/main/java/com/bx/imclient/annotation/IMListener.java index 8e86edf..6ea12ce 100644 --- a/im-client/src/main/java/com/bx/imclient/annotation/IMListener.java +++ b/im-client/src/main/java/com/bx/imclient/annotation/IMListener.java @@ -1,6 +1,6 @@ package com.bx.imclient.annotation; -import com.bx.common.enums.ListenerType; +import com.bx.imcommon.enums.ListenerType; import org.springframework.stereotype.Component; import java.lang.annotation.ElementType; diff --git a/im-client/src/main/java/com/bx/imclient/listener/MessageListener.java b/im-client/src/main/java/com/bx/imclient/listener/MessageListener.java index a223f34..222ab6e 100644 --- a/im-client/src/main/java/com/bx/imclient/listener/MessageListener.java +++ b/im-client/src/main/java/com/bx/imclient/listener/MessageListener.java @@ -1,7 +1,7 @@ package com.bx.imclient.listener; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.model.im.SendResult; public interface MessageListener { diff --git a/im-client/src/main/java/com/bx/imclient/listener/MessageListenerMulticaster.java b/im-client/src/main/java/com/bx/imclient/listener/MessageListenerMulticaster.java index 0cf4516..70cdbce 100644 --- a/im-client/src/main/java/com/bx/imclient/listener/MessageListenerMulticaster.java +++ b/im-client/src/main/java/com/bx/imclient/listener/MessageListenerMulticaster.java @@ -1,8 +1,8 @@ package com.bx.imclient.listener; -import com.bx.common.enums.ListenerType; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.enums.ListenerType; +import com.bx.imcommon.model.im.SendResult; import com.bx.imclient.annotation.IMListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/im-client/src/main/java/com/bx/imclient/sender/IMSender.java b/im-client/src/main/java/com/bx/imclient/sender/IMSender.java index 5c5c665..e90cd2e 100644 --- a/im-client/src/main/java/com/bx/imclient/sender/IMSender.java +++ b/im-client/src/main/java/com/bx/imclient/sender/IMSender.java @@ -1,13 +1,13 @@ package com.bx.imclient.sender; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.IMCmdType; -import com.bx.common.enums.ListenerType; -import com.bx.common.enums.SendResultType; -import com.bx.common.model.im.GroupMessageInfo; -import com.bx.common.model.im.IMRecvInfo; -import com.bx.common.model.im.PrivateMessageInfo; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.enums.ListenerType; +import com.bx.imcommon.enums.SendResultType; +import com.bx.imcommon.model.im.GroupMessageInfo; +import com.bx.imcommon.model.im.IMRecvInfo; +import com.bx.imcommon.model.im.PrivateMessageInfo; +import com.bx.imcommon.model.im.SendResult; import com.bx.imclient.listener.MessageListenerMulticaster; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/im-client/src/main/java/com/bx/imclient/task/PullSendResultGroupMessageTask.java b/im-client/src/main/java/com/bx/imclient/task/PullSendResultGroupMessageTask.java index 0b5466a..eba2978 100644 --- a/im-client/src/main/java/com/bx/imclient/task/PullSendResultGroupMessageTask.java +++ b/im-client/src/main/java/com/bx/imclient/task/PullSendResultGroupMessageTask.java @@ -1,8 +1,8 @@ package com.bx.imclient.task; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.ListenerType; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.ListenerType; +import com.bx.imcommon.model.im.SendResult; import com.bx.imclient.listener.MessageListenerMulticaster; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/im-client/src/main/java/com/bx/imclient/task/PullSendResultPrivateMessageTask.java b/im-client/src/main/java/com/bx/imclient/task/PullSendResultPrivateMessageTask.java index 6f3042d..a248765 100644 --- a/im-client/src/main/java/com/bx/imclient/task/PullSendResultPrivateMessageTask.java +++ b/im-client/src/main/java/com/bx/imclient/task/PullSendResultPrivateMessageTask.java @@ -1,8 +1,8 @@ package com.bx.imclient.task; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.ListenerType; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.ListenerType; +import com.bx.imcommon.model.im.SendResult; import com.bx.imclient.listener.MessageListenerMulticaster; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/commom/pom.xml b/im-commom/pom.xml similarity index 95% rename from commom/pom.xml rename to im-commom/pom.xml index 6641d62..f998bcf 100644 --- a/commom/pom.xml +++ b/im-commom/pom.xml @@ -5,10 +5,10 @@ box-im com.bx - 1.0.0 + 1.1.0 4.0.0 - commom + im-commom 8 diff --git a/commom/src/main/java/com/bx/common/contant/Constant.java b/im-commom/src/main/java/com/bx/imcommon/contant/Constant.java similarity index 86% rename from commom/src/main/java/com/bx/common/contant/Constant.java rename to im-commom/src/main/java/com/bx/imcommon/contant/Constant.java index 296e054..11c1e5d 100644 --- a/commom/src/main/java/com/bx/common/contant/Constant.java +++ b/im-commom/src/main/java/com/bx/imcommon/contant/Constant.java @@ -1,4 +1,4 @@ -package com.bx.common.contant; +package com.bx.imcommon.contant; public class Constant { diff --git a/commom/src/main/java/com/bx/common/contant/RedisKey.java b/im-commom/src/main/java/com/bx/imcommon/contant/RedisKey.java similarity index 95% rename from commom/src/main/java/com/bx/common/contant/RedisKey.java rename to im-commom/src/main/java/com/bx/imcommon/contant/RedisKey.java index 2a68dd7..e8c2d7e 100644 --- a/commom/src/main/java/com/bx/common/contant/RedisKey.java +++ b/im-commom/src/main/java/com/bx/imcommon/contant/RedisKey.java @@ -1,4 +1,4 @@ -package com.bx.common.contant; +package com.bx.imcommon.contant; public class RedisKey { diff --git a/commom/src/main/java/com/bx/common/enums/FileType.java b/im-commom/src/main/java/com/bx/imcommon/enums/FileType.java similarity index 95% rename from commom/src/main/java/com/bx/common/enums/FileType.java rename to im-commom/src/main/java/com/bx/imcommon/enums/FileType.java index afe3e5b..c0eaa3f 100644 --- a/commom/src/main/java/com/bx/common/enums/FileType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/FileType.java @@ -1,4 +1,4 @@ -package com.bx.common.enums; +package com.bx.imcommon.enums; public enum FileType { diff --git a/commom/src/main/java/com/bx/common/enums/IMCmdType.java b/im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java similarity index 95% rename from commom/src/main/java/com/bx/common/enums/IMCmdType.java rename to im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java index f0233db..b8c2bc9 100644 --- a/commom/src/main/java/com/bx/common/enums/IMCmdType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java @@ -1,4 +1,4 @@ -package com.bx.common.enums; +package com.bx.imcommon.enums; public enum IMCmdType { diff --git a/commom/src/main/java/com/bx/common/enums/ListenerType.java b/im-commom/src/main/java/com/bx/imcommon/enums/ListenerType.java similarity index 92% rename from commom/src/main/java/com/bx/common/enums/ListenerType.java rename to im-commom/src/main/java/com/bx/imcommon/enums/ListenerType.java index d0cbb64..26b14d7 100644 --- a/commom/src/main/java/com/bx/common/enums/ListenerType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/ListenerType.java @@ -1,4 +1,4 @@ -package com.bx.common.enums; +package com.bx.imcommon.enums; public enum ListenerType { diff --git a/commom/src/main/java/com/bx/common/enums/MessageStatus.java b/im-commom/src/main/java/com/bx/imcommon/enums/MessageStatus.java similarity index 95% rename from commom/src/main/java/com/bx/common/enums/MessageStatus.java rename to im-commom/src/main/java/com/bx/imcommon/enums/MessageStatus.java index f36c303..07663ed 100644 --- a/commom/src/main/java/com/bx/common/enums/MessageStatus.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/MessageStatus.java @@ -1,4 +1,4 @@ -package com.bx.common.enums; +package com.bx.imcommon.enums; public enum MessageStatus { diff --git a/commom/src/main/java/com/bx/common/enums/MessageType.java b/im-commom/src/main/java/com/bx/imcommon/enums/MessageType.java similarity index 93% rename from commom/src/main/java/com/bx/common/enums/MessageType.java rename to im-commom/src/main/java/com/bx/imcommon/enums/MessageType.java index 9060809..2d130cb 100644 --- a/commom/src/main/java/com/bx/common/enums/MessageType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/MessageType.java @@ -1,4 +1,4 @@ -package com.bx.common.enums; +package com.bx.imcommon.enums; public enum MessageType { diff --git a/commom/src/main/java/com/bx/common/enums/SendResultType.java b/im-commom/src/main/java/com/bx/imcommon/enums/SendResultType.java similarity index 92% rename from commom/src/main/java/com/bx/common/enums/SendResultType.java rename to im-commom/src/main/java/com/bx/imcommon/enums/SendResultType.java index cfbf124..c1905cf 100644 --- a/commom/src/main/java/com/bx/common/enums/SendResultType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/SendResultType.java @@ -1,4 +1,4 @@ -package com.bx.common.enums; +package com.bx.imcommon.enums; public enum SendResultType { diff --git a/commom/src/main/java/com/bx/common/model/im/GroupMessageInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/im/GroupMessageInfo.java similarity index 80% rename from commom/src/main/java/com/bx/common/model/im/GroupMessageInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/im/GroupMessageInfo.java index b471fe7..d4c45af 100644 --- a/commom/src/main/java/com/bx/common/model/im/GroupMessageInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/im/GroupMessageInfo.java @@ -1,6 +1,6 @@ -package com.bx.common.model.im; +package com.bx.imcommon.model.im; -import com.bx.common.serializer.DateToLongSerializer; +import com.bx.imcommon.serializer.DateToLongSerializer; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; diff --git a/commom/src/main/java/com/bx/common/model/im/HeartbeatInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/im/HeartbeatInfo.java similarity index 71% rename from commom/src/main/java/com/bx/common/model/im/HeartbeatInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/im/HeartbeatInfo.java index 55b6c09..93a75f5 100644 --- a/commom/src/main/java/com/bx/common/model/im/HeartbeatInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/im/HeartbeatInfo.java @@ -1,4 +1,4 @@ -package com.bx.common.model.im; +package com.bx.imcommon.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/bx/common/model/im/IMRecvInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/im/IMRecvInfo.java similarity index 82% rename from commom/src/main/java/com/bx/common/model/im/IMRecvInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/im/IMRecvInfo.java index e0d8e89..95154f3 100644 --- a/commom/src/main/java/com/bx/common/model/im/IMRecvInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/im/IMRecvInfo.java @@ -1,4 +1,4 @@ -package com.bx.common.model.im; +package com.bx.imcommon.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/bx/common/model/im/LoginInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/im/LoginInfo.java similarity index 70% rename from commom/src/main/java/com/bx/common/model/im/LoginInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/im/LoginInfo.java index 3636697..5d90581 100644 --- a/commom/src/main/java/com/bx/common/model/im/LoginInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/im/LoginInfo.java @@ -1,4 +1,4 @@ -package com.bx.common.model.im; +package com.bx.imcommon.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/bx/common/model/im/PrivateMessageInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/im/PrivateMessageInfo.java similarity index 80% rename from commom/src/main/java/com/bx/common/model/im/PrivateMessageInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/im/PrivateMessageInfo.java index 1a20b3f..0544ffc 100644 --- a/commom/src/main/java/com/bx/common/model/im/PrivateMessageInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/im/PrivateMessageInfo.java @@ -1,6 +1,6 @@ -package com.bx.common.model.im; +package com.bx.imcommon.model.im; -import com.bx.common.serializer.DateToLongSerializer; +import com.bx.imcommon.serializer.DateToLongSerializer; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; diff --git a/commom/src/main/java/com/bx/common/model/im/SendInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/im/SendInfo.java similarity index 76% rename from commom/src/main/java/com/bx/common/model/im/SendInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/im/SendInfo.java index 794c154..15f1420 100644 --- a/commom/src/main/java/com/bx/common/model/im/SendInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/im/SendInfo.java @@ -1,4 +1,4 @@ -package com.bx.common.model.im; +package com.bx.imcommon.model.im; import lombok.Data; diff --git a/commom/src/main/java/com/bx/common/model/im/SendResult.java b/im-commom/src/main/java/com/bx/imcommon/model/im/SendResult.java similarity index 70% rename from commom/src/main/java/com/bx/common/model/im/SendResult.java rename to im-commom/src/main/java/com/bx/imcommon/model/im/SendResult.java index c655b2f..9e6722a 100644 --- a/commom/src/main/java/com/bx/common/model/im/SendResult.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/im/SendResult.java @@ -1,6 +1,6 @@ -package com.bx.common.model.im; +package com.bx.imcommon.model.im; -import com.bx.common.enums.SendResultType; +import com.bx.imcommon.enums.SendResultType; import lombok.Data; @Data diff --git a/commom/src/main/java/com/bx/common/serializer/DateToLongSerializer.java b/im-commom/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java similarity index 96% rename from commom/src/main/java/com/bx/common/serializer/DateToLongSerializer.java rename to im-commom/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java index ad97b82..6aa3421 100644 --- a/commom/src/main/java/com/bx/common/serializer/DateToLongSerializer.java +++ b/im-commom/src/main/java/com/bx/imcommon/serializer/DateToLongSerializer.java @@ -1,4 +1,4 @@ -package com.bx.common.serializer; +package com.bx.imcommon.serializer; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonToken; diff --git a/commom/src/main/java/com/bx/common/util/SpringContextHolder.java b/im-commom/src/main/java/com/bx/imcommon/util/SpringContextHolder.java similarity index 97% rename from commom/src/main/java/com/bx/common/util/SpringContextHolder.java rename to im-commom/src/main/java/com/bx/imcommon/util/SpringContextHolder.java index 0a980f4..1511c2b 100644 --- a/commom/src/main/java/com/bx/common/util/SpringContextHolder.java +++ b/im-commom/src/main/java/com/bx/imcommon/util/SpringContextHolder.java @@ -1,4 +1,4 @@ -package com.bx.common.util; +package com.bx.imcommon.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/im-platform/pom.xml b/im-platform/pom.xml index a963aee..de6c24e 100644 --- a/im-platform/pom.xml +++ b/im-platform/pom.xml @@ -5,7 +5,7 @@ box-im com.bx - 1.0.0 + 1.1.0 4.0.0 @@ -16,7 +16,7 @@ com.bx im-client - 1.0.0 + 1.1.0 org.springframework.boot diff --git a/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java b/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java index 540b2ac..094b04a 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java @@ -1,7 +1,7 @@ package com.bx.implatform.controller; -import com.bx.common.model.im.GroupMessageInfo; +import com.bx.imcommon.model.im.GroupMessageInfo; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; import com.bx.implatform.service.IGroupMessageService; diff --git a/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java b/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java index e07da66..2801edf 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java @@ -1,7 +1,7 @@ package com.bx.implatform.controller; -import com.bx.common.model.im.PrivateMessageInfo; +import com.bx.imcommon.model.im.PrivateMessageInfo; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; import com.bx.implatform.service.IPrivateMessageService; diff --git a/im-platform/src/main/java/com/bx/implatform/listener/GroupMessageListener.java b/im-platform/src/main/java/com/bx/implatform/listener/GroupMessageListener.java index 44b7ae6..9377110 100644 --- a/im-platform/src/main/java/com/bx/implatform/listener/GroupMessageListener.java +++ b/im-platform/src/main/java/com/bx/implatform/listener/GroupMessageListener.java @@ -1,9 +1,10 @@ package com.bx.implatform.listener; -import com.bx.common.enums.ListenerType; -import com.bx.common.enums.MessageType; -import com.bx.common.model.im.GroupMessageInfo; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.enums.ListenerType; +import com.bx.imcommon.enums.MessageType; +import com.bx.imcommon.enums.SendResultType; +import com.bx.imcommon.model.im.GroupMessageInfo; +import com.bx.imcommon.model.im.SendResult; import com.bx.imclient.annotation.IMListener; import com.bx.imclient.listener.MessageListener; import com.bx.implatform.contant.RedisKey; @@ -26,9 +27,12 @@ public class GroupMessageListener implements MessageListener { // 提示类数据不记录 return; } + // 保存该用户已拉取的最大消息id - String key = RedisKey.IM_GROUP_READED_POSITION + messageInfo.getGroupId()+":"+result.getRecvId(); - redisTemplate.opsForValue().set(key,messageInfo.getId()); + if(result.getResult().equals(SendResultType.SUCCESS)) { + String key = RedisKey.IM_GROUP_READED_POSITION + messageInfo.getGroupId() + ":" + result.getRecvId(); + redisTemplate.opsForValue().set(key, messageInfo.getId()); + } } } diff --git a/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java b/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java index 49ad576..5e5b5a4 100644 --- a/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java +++ b/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java @@ -1,11 +1,12 @@ package com.bx.implatform.listener; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.bx.common.enums.ListenerType; -import com.bx.common.enums.MessageStatus; -import com.bx.common.enums.MessageType; -import com.bx.common.model.im.PrivateMessageInfo; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.enums.ListenerType; +import com.bx.imcommon.enums.MessageStatus; +import com.bx.imcommon.enums.MessageType; +import com.bx.imcommon.enums.SendResultType; +import com.bx.imcommon.model.im.PrivateMessageInfo; +import com.bx.imcommon.model.im.SendResult; import com.bx.imclient.annotation.IMListener; import com.bx.imclient.listener.MessageListener; import com.bx.implatform.entity.PrivateMessage; @@ -29,12 +30,14 @@ public class PrivateMessageListener implements MessageListener { return; } // 更新消息状态 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.lambda().eq(PrivateMessage::getId,messageInfo.getId()) - .eq(PrivateMessage::getStatus, MessageStatus.UNREAD.getCode()) - .set(PrivateMessage::getStatus, MessageStatus.ALREADY_READ.getCode()); - privateMessageService.update(updateWrapper); - log.info("消息已读，消息id:{}，发送者:{},接收者:{}",messageInfo.getId(),messageInfo.getSendId(),messageInfo.getRecvId()); + if(result.getResult().equals(SendResultType.SUCCESS)){ + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.lambda().eq(PrivateMessage::getId,messageInfo.getId()) + .eq(PrivateMessage::getStatus, MessageStatus.UNREAD.getCode()) + .set(PrivateMessage::getStatus, MessageStatus.ALREADY_READ.getCode()); + privateMessageService.update(updateWrapper); + log.info("消息已读，消息id:{}，发送者:{},接收者:{}",messageInfo.getId(),messageInfo.getSendId(),messageInfo.getRecvId()); + } } } diff --git a/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java b/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java index 7bb582e..dd891c9 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java @@ -1,7 +1,7 @@ package com.bx.implatform.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.bx.common.model.im.GroupMessageInfo; +import com.bx.imcommon.model.im.GroupMessageInfo; import com.bx.implatform.entity.GroupMessage; import com.bx.implatform.vo.GroupMessageVO; diff --git a/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java b/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java index 0b1cc37..ac53af8 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java @@ -1,7 +1,7 @@ package com.bx.implatform.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.bx.common.model.im.PrivateMessageInfo; +import com.bx.imcommon.model.im.PrivateMessageInfo; import com.bx.implatform.entity.PrivateMessage; import com.bx.implatform.vo.PrivateMessageVO; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java index dea178a..3a02fe9 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java @@ -2,10 +2,10 @@ package com.bx.implatform.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bx.common.contant.Constant; -import com.bx.common.enums.MessageStatus; -import com.bx.common.enums.MessageType; -import com.bx.common.model.im.GroupMessageInfo; +import com.bx.imcommon.contant.Constant; +import com.bx.imcommon.enums.MessageStatus; +import com.bx.imcommon.enums.MessageType; +import com.bx.imcommon.model.im.GroupMessageInfo; import com.bx.imclient.IMClient; import com.bx.implatform.contant.RedisKey; import com.bx.implatform.entity.Group; @@ -76,7 +76,7 @@ public class GroupMessageServiceImpl extends ServiceImpl userIds, GroupMessageInfo msgInfo){ - imClient.sendGroupMessage(userIds,msgInfo); - } } diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java index 5a4fd3b..f98e7bd 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java @@ -2,11 +2,11 @@ package com.bx.implatform.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bx.common.contant.Constant; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.MessageStatus; -import com.bx.common.enums.MessageType; -import com.bx.common.model.im.PrivateMessageInfo; +import com.bx.imcommon.contant.Constant; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.MessageStatus; +import com.bx.imcommon.enums.MessageType; +import com.bx.imcommon.model.im.PrivateMessageInfo; import com.bx.imclient.IMClient; import com.bx.implatform.entity.PrivateMessage; import com.bx.implatform.enums.ResultCode; @@ -88,7 +88,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl messages = this.list(queryWrapper); // 上传至redis，等待推送 if (!messages.isEmpty()) { - List infos = messages.stream().map(m -> { + List messageInfos = messages.stream().map(m -> { PrivateMessageInfo msgInfo = BeanUtils.copyProperties(m, PrivateMessageInfo.class); return msgInfo; }).collect(Collectors.toList()); // 推送消息 - imClient.sendPrivateMessage(userId,(PrivateMessageInfo[]) infos.toArray()); - log.info("拉取未读私聊消息，用户id:{},数量:{}", userId, infos.size()); + PrivateMessageInfo[] infoArr = messageInfos.toArray(new PrivateMessageInfo[messageInfos.size()]); + imClient.sendPrivateMessage(userId,infoArr); + log.info("拉取未读私聊消息，用户id:{},数量:{}", userId, infoArr.length); } } } diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index c8d460e..1fafcd2 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -2,7 +2,7 @@ package com.bx.implatform.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bx.common.contant.RedisKey; +import com.bx.imcommon.contant.RedisKey; import com.bx.implatform.entity.Friend; import com.bx.implatform.entity.GroupMember; import com.bx.implatform.entity.User; diff --git a/im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java b/im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java index 05148f7..f38b965 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/thirdparty/FileService.java @@ -1,6 +1,6 @@ package com.bx.implatform.service.thirdparty; -import com.bx.common.enums.FileType; +import com.bx.imcommon.enums.FileType; import com.bx.implatform.contant.Constant; import com.bx.implatform.enums.ResultCode; import com.bx.implatform.exception.GlobalException; diff --git a/im-server/pom.xml b/im-server/pom.xml index 3c9b13c..397264a 100644 --- a/im-server/pom.xml +++ b/im-server/pom.xml @@ -5,7 +5,7 @@ box-im com.bx - 1.0.0 + 1.1.0 4.0.0 @@ -15,8 +15,8 @@ com.bx - commom - 1.0.0 + im-commom + 1.1.0 org.springframework.boot diff --git a/im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java b/im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java index 7e4b227..d94af93 100644 --- a/im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java +++ b/im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java @@ -1,9 +1,9 @@ package com.bx.imserver.task; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.IMCmdType; -import com.bx.common.model.im.GroupMessageInfo; -import com.bx.common.model.im.IMRecvInfo; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.model.im.GroupMessageInfo; +import com.bx.imcommon.model.im.IMRecvInfo; import com.bx.imserver.websocket.WebsocketServer; import com.bx.imserver.websocket.processor.MessageProcessor; import com.bx.imserver.websocket.processor.ProcessorFactory; diff --git a/im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java b/im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java index a68038b..b95d47c 100644 --- a/im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java +++ b/im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java @@ -1,10 +1,10 @@ package com.bx.imserver.task; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.IMCmdType; -import com.bx.common.model.im.IMRecvInfo; -import com.bx.common.model.im.PrivateMessageInfo; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.model.im.IMRecvInfo; +import com.bx.imcommon.model.im.PrivateMessageInfo; import com.bx.imserver.websocket.WebsocketServer; import com.bx.imserver.websocket.processor.MessageProcessor; import com.bx.imserver.websocket.processor.ProcessorFactory; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java b/im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java index 7012426..41fea89 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/WebSocketHandler.java @@ -1,9 +1,9 @@ package com.bx.imserver.websocket; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.IMCmdType; -import com.bx.common.model.im.SendInfo; -import com.bx.common.util.SpringContextHolder; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.model.im.SendInfo; +import com.bx.imcommon.util.SpringContextHolder; import com.bx.imserver.websocket.processor.MessageProcessor; import com.bx.imserver.websocket.processor.ProcessorFactory; import io.netty.channel.ChannelHandlerContext; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java b/im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java index 831d1eb..4e22237 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/WebsocketServer.java @@ -1,6 +1,6 @@ package com.bx.imserver.websocket; -import com.bx.common.contant.RedisKey; +import com.bx.imcommon.contant.RedisKey; import com.bx.imserver.websocket.endecode.MessageProtocolDecoder; import com.bx.imserver.websocket.endecode.MessageProtocolEncoder; import io.netty.bootstrap.ServerBootstrap; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java b/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java index 657c3f9..f8e03fe 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolDecoder.java @@ -1,6 +1,6 @@ package com.bx.imserver.websocket.endecode; -import com.bx.common.model.im.SendInfo; +import com.bx.imcommon.model.im.SendInfo; import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java b/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java index 4ecf528..b37b882 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/endecode/MessageProtocolEncoder.java @@ -1,6 +1,6 @@ package com.bx.imserver.websocket.endecode; -import com.bx.common.model.im.SendInfo; +import com.bx.imcommon.model.im.SendInfo; import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageEncoder; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java index 0c9f531..66e848f 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/GroupMessageProcessor.java @@ -1,12 +1,12 @@ package com.bx.imserver.websocket.processor; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.IMCmdType; -import com.bx.common.enums.SendResultType; -import com.bx.common.model.im.GroupMessageInfo; -import com.bx.common.model.im.IMRecvInfo; -import com.bx.common.model.im.SendInfo; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.enums.SendResultType; +import com.bx.imcommon.model.im.GroupMessageInfo; +import com.bx.imcommon.model.im.IMRecvInfo; +import com.bx.imcommon.model.im.SendInfo; +import com.bx.imcommon.model.im.SendResult; import com.bx.imserver.websocket.WebsocketChannelCtxHolder; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java index 0bbc743..c8cedc4 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/HeartbeatProcessor.java @@ -1,11 +1,11 @@ package com.bx.imserver.websocket.processor; import cn.hutool.core.bean.BeanUtil; -import com.bx.common.contant.Constant; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.IMCmdType; -import com.bx.common.model.im.HeartbeatInfo; -import com.bx.common.model.im.SendInfo; +import com.bx.imcommon.contant.Constant; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.model.im.HeartbeatInfo; +import com.bx.imcommon.model.im.SendInfo; import com.bx.imserver.websocket.WebsocketServer; import io.netty.channel.ChannelHandlerContext; import io.netty.util.AttributeKey; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java index a241afd..690d42b 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/LoginProcessor.java @@ -1,11 +1,11 @@ package com.bx.imserver.websocket.processor; import cn.hutool.core.bean.BeanUtil; -import com.bx.common.contant.Constant; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.IMCmdType; -import com.bx.common.model.im.LoginInfo; -import com.bx.common.model.im.SendInfo; +import com.bx.imcommon.contant.Constant; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.model.im.LoginInfo; +import com.bx.imcommon.model.im.SendInfo; import com.bx.imserver.websocket.WebsocketChannelCtxHolder; import com.bx.imserver.websocket.WebsocketServer; import io.netty.channel.ChannelHandlerContext; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java index bd2b83c..a7fa075 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/PrivateMessageProcessor.java @@ -1,12 +1,12 @@ package com.bx.imserver.websocket.processor; -import com.bx.common.contant.RedisKey; -import com.bx.common.enums.IMCmdType; -import com.bx.common.enums.SendResultType; -import com.bx.common.model.im.IMRecvInfo; -import com.bx.common.model.im.PrivateMessageInfo; -import com.bx.common.model.im.SendInfo; -import com.bx.common.model.im.SendResult; +import com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.enums.SendResultType; +import com.bx.imcommon.model.im.IMRecvInfo; +import com.bx.imcommon.model.im.PrivateMessageInfo; +import com.bx.imcommon.model.im.SendInfo; +import com.bx.imcommon.model.im.SendResult; import com.bx.imserver.websocket.WebsocketChannelCtxHolder; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; diff --git a/im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java b/im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java index c15ed32..dccb06e 100644 --- a/im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java +++ b/im-server/src/main/java/com/bx/imserver/websocket/processor/ProcessorFactory.java @@ -1,7 +1,7 @@ package com.bx.imserver.websocket.processor; -import com.bx.common.enums.IMCmdType; -import com.bx.common.util.SpringContextHolder; +import com.bx.imcommon.enums.IMCmdType; +import com.bx.imcommon.util.SpringContextHolder; public class ProcessorFactory { diff --git a/pom.xml b/pom.xml index 47b9492..945d351 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,12 @@ box-im com.bx pom - 1.0.0 + 1.1.0 im-platform im-server - commom + im-commom im-client