From 3594ab3e5060e70357c7cc91d2a871d2aeaeaa90 Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Sat, 19 Nov 2022 18:02:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bx/imclient/IMClient.java | 4 +- .../bx/imclient/annotation/IMListener.java | 4 +- .../bx/imclient/listener/MessageListener.java | 2 +- .../listener/MessageListenerMulticaster.java | 6 +-- .../java/com/bx/imclient/sender/IMSender.java | 22 +++++------ .../task/PullSendResultGroupMessageTask.java | 8 ++-- .../PullSendResultPrivateMessageTask.java | 8 ++-- im-commom/im-commom.iml | 37 +++++++++++++++++++ ...{ListenerType.java => IMListenerType.java} | 4 +- ...{SendResultType.java => IMSendStatus.java} | 4 +- .../model/{im => }/GroupMessageInfo.java | 2 +- .../model/{im => }/HeartbeatInfo.java | 2 +- .../imcommon/model/{im => }/IMRecvInfo.java | 2 +- .../{im/SendInfo.java => IMSendInfo.java} | 4 +- .../bx/imcommon/model/{im => }/LoginInfo.java | 2 +- .../model/{im => }/PrivateMessageInfo.java | 2 +- .../imcommon/model/{im => }/SendResult.java | 6 +-- .../controller/GroupMessageController.java | 2 +- .../controller/PrivateMessageController.java | 2 +- .../com/bx/implatform}/enums/FileType.java | 2 +- .../bx/implatform}/enums/MessageStatus.java | 2 +- .../com/bx/implatform}/enums/MessageType.java | 2 +- .../listener/GroupMessageListener.java | 14 +++---- .../listener/PrivateMessageListener.java | 16 ++++---- .../service/IGroupMessageService.java | 2 +- .../service/IPrivateMessageService.java | 2 +- .../service/impl/GroupMessageServiceImpl.java | 8 ++-- .../impl/PrivateMessageServiceImpl.java | 8 ++-- .../service/thirdparty/FileService.java | 2 +- .../task/PullUnreadGroupMessageTask.java | 4 +- .../task/PullUnreadPrivateMessageTask.java | 4 +- .../imserver}/util/SpringContextHolder.java | 2 +- .../imserver/websocket/WebSocketHandler.java | 8 ++-- .../endecode/MessageProtocolDecoder.java | 4 +- .../endecode/MessageProtocolEncoder.java | 6 +-- .../processor/GroupMessageProcessor.java | 18 ++++----- .../processor/HeartbeatProcessor.java | 6 +-- .../websocket/processor/LoginProcessor.java | 8 ++-- .../processor/PrivateMessageProcessor.java | 18 ++++----- .../websocket/processor/ProcessorFactory.java | 2 +- 40 files changed, 149 insertions(+), 112 deletions(-) create mode 100644 im-commom/im-commom.iml rename im-commom/src/main/java/com/bx/imcommon/enums/{ListenerType.java => IMListenerType.java} (81%) rename im-commom/src/main/java/com/bx/imcommon/enums/{SendResultType.java => IMSendStatus.java} (82%) rename im-commom/src/main/java/com/bx/imcommon/model/{im => }/GroupMessageInfo.java (92%) rename im-commom/src/main/java/com/bx/imcommon/model/{im => }/HeartbeatInfo.java (71%) rename im-commom/src/main/java/com/bx/imcommon/model/{im => }/IMRecvInfo.java (82%) rename im-commom/src/main/java/com/bx/imcommon/model/{im/SendInfo.java => IMSendInfo.java} (58%) rename im-commom/src/main/java/com/bx/imcommon/model/{im => }/LoginInfo.java (70%) rename im-commom/src/main/java/com/bx/imcommon/model/{im => }/PrivateMessageInfo.java (92%) rename im-commom/src/main/java/com/bx/imcommon/model/{im => }/SendResult.java (56%) rename {im-commom/src/main/java/com/bx/imcommon => im-platform/src/main/java/com/bx/implatform}/enums/FileType.java (94%) rename {im-commom/src/main/java/com/bx/imcommon => im-platform/src/main/java/com/bx/implatform}/enums/MessageStatus.java (95%) rename {im-commom/src/main/java/com/bx/imcommon => im-platform/src/main/java/com/bx/implatform}/enums/MessageType.java (92%) rename {im-commom/src/main/java/com/bx/imcommon => im-server/src/main/java/com/bx/imserver}/util/SpringContextHolder.java (97%) 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 71c29c2..4891023 100644 --- a/im-client/src/main/java/com/bx/imclient/IMClient.java +++ b/im-client/src/main/java/com/bx/imclient/IMClient.java @@ -1,9 +1,9 @@ package com.bx.imclient; -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 com.bx.imcommon.model.GroupMessageInfo; +import com.bx.imcommon.model.PrivateMessageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; 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 6ea12ce..4f54bf9 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.imcommon.enums.ListenerType; +import com.bx.imcommon.enums.IMListenerType; import org.springframework.stereotype.Component; import java.lang.annotation.ElementType; @@ -13,6 +13,6 @@ import java.lang.annotation.Target; @Component public @interface IMListener { - ListenerType type(); + IMListenerType type(); } 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 222ab6e..95ae871 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.imcommon.model.im.SendResult; +import com.bx.imcommon.model.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 70cdbce..9779574 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,9 +1,9 @@ package com.bx.imclient.listener; -import com.bx.imcommon.enums.ListenerType; -import com.bx.imcommon.model.im.SendResult; import com.bx.imclient.annotation.IMListener; +import com.bx.imcommon.enums.IMListenerType; +import com.bx.imcommon.model.SendResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ public class MessageListenerMulticaster { @Autowired(required = false) private List messageListeners = Collections.emptyList(); - public void multicast(ListenerType type, SendResult result){ + public void multicast(IMListenerType type, SendResult result){ for(MessageListener listener:messageListeners){ IMListener annotation = listener.getClass().getAnnotation(IMListener.class); if(annotation.type().equals(type)){ 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 e90cd2e..ab6dd11 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,14 +1,14 @@ package com.bx.imclient.sender; +import com.bx.imclient.listener.MessageListenerMulticaster; 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 com.bx.imcommon.enums.IMListenerType; +import com.bx.imcommon.enums.IMSendStatus; +import com.bx.imcommon.model.GroupMessageInfo; +import com.bx.imcommon.model.IMRecvInfo; +import com.bx.imcommon.model.PrivateMessageInfo; +import com.bx.imcommon.model.SendResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.RedisTemplate; @@ -54,9 +54,9 @@ public class IMSender { SendResult result = new SendResult(); result.setMessageInfo(messageInfo); result.setRecvId(recvId); - result.setResult(SendResultType.FAIL); + result.setStatus(IMSendStatus.FAIL); result.setFailReason("用户不在线"); - listenerMulticaster.multicast(ListenerType.PRIVATE_MESSAGE, result); + listenerMulticaster.multicast(IMListenerType.PRIVATE_MESSAGE, result); } } } @@ -103,9 +103,9 @@ public class IMSender { SendResult result = new SendResult(); result.setMessageInfo(messageInfo); result.setRecvId(id); - result.setResult(SendResultType.FAIL); + result.setStatus(IMSendStatus.FAIL); result.setFailReason("用户不在线"); - listenerMulticaster.multicast(ListenerType.GROUP_MESSAGE,result); + listenerMulticaster.multicast(IMListenerType.GROUP_MESSAGE,result); } } } 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 eba2978..3de0494 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,9 +1,9 @@ package com.bx.imclient.task; -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 com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMListenerType; +import com.bx.imcommon.model.SendResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.redis.core.RedisTemplate; @@ -26,7 +26,7 @@ public class PullSendResultGroupMessageTask extends AbstractPullMessageTask{ String key = RedisKey.IM_RESULT_GROUP_QUEUE; SendResult result = (SendResult)redisTemplate.opsForList().leftPop(key,10, TimeUnit.SECONDS); if(result != null) { - listenerMulticaster.multicast(ListenerType.GROUP_MESSAGE,result); + listenerMulticaster.multicast(IMListenerType.GROUP_MESSAGE,result); } } 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 a248765..e634493 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,9 +1,9 @@ package com.bx.imclient.task; -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 com.bx.imcommon.contant.RedisKey; +import com.bx.imcommon.enums.IMListenerType; +import com.bx.imcommon.model.SendResult; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -31,7 +31,7 @@ public class PullSendResultPrivateMessageTask extends AbstractPullMessageTask{ String key = RedisKey.IM_RESULT_PRIVATE_QUEUE; SendResult result = (SendResult)redisTemplate.opsForList().leftPop(key,10, TimeUnit.SECONDS); if(result != null) { - listenerMulticaster.multicast(ListenerType.PRIVATE_MESSAGE, result); + listenerMulticaster.multicast(IMListenerType.PRIVATE_MESSAGE, result); } } diff --git a/im-commom/im-commom.iml b/im-commom/im-commom.iml new file mode 100644 index 0000000..1706946 --- /dev/null +++ b/im-commom/im-commom.iml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/ListenerType.java b/im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java similarity index 81% rename from im-commom/src/main/java/com/bx/imcommon/enums/ListenerType.java rename to im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java index 26b14d7..2a5f118 100644 --- a/im-commom/src/main/java/com/bx/imcommon/enums/ListenerType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java @@ -1,6 +1,6 @@ package com.bx.imcommon.enums; -public enum ListenerType { +public enum IMListenerType { PRIVATE_MESSAGE(0,"私聊消息"), GROUP_MESSAGE(1,"群聊消息"); @@ -9,7 +9,7 @@ public enum ListenerType { private String desc; - ListenerType(Integer index, String desc) { + IMListenerType(Integer index, String desc) { this.code =index; this.desc=desc; } diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/SendResultType.java b/im-commom/src/main/java/com/bx/imcommon/enums/IMSendStatus.java similarity index 82% rename from im-commom/src/main/java/com/bx/imcommon/enums/SendResultType.java rename to im-commom/src/main/java/com/bx/imcommon/enums/IMSendStatus.java index c1905cf..d64e3f7 100644 --- a/im-commom/src/main/java/com/bx/imcommon/enums/SendResultType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/IMSendStatus.java @@ -1,7 +1,7 @@ package com.bx.imcommon.enums; -public enum SendResultType { +public enum IMSendStatus { SUCCESS(0,"发送成功"), FAIL(1,"发送失败"); @@ -10,7 +10,7 @@ public enum SendResultType { private String msg; // 构造方法 - SendResultType(int code, String msg) { + IMSendStatus(int code, String msg) { this.code = code; this.msg = msg; } diff --git a/im-commom/src/main/java/com/bx/imcommon/model/im/GroupMessageInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/GroupMessageInfo.java similarity index 92% rename from im-commom/src/main/java/com/bx/imcommon/model/im/GroupMessageInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/GroupMessageInfo.java index d4c45af..f128b4a 100644 --- a/im-commom/src/main/java/com/bx/imcommon/model/im/GroupMessageInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/GroupMessageInfo.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.model.im; +package com.bx.imcommon.model; import com.bx.imcommon.serializer.DateToLongSerializer; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/im-commom/src/main/java/com/bx/imcommon/model/im/HeartbeatInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/HeartbeatInfo.java similarity index 71% rename from im-commom/src/main/java/com/bx/imcommon/model/im/HeartbeatInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/HeartbeatInfo.java index 93a75f5..e47bfc5 100644 --- a/im-commom/src/main/java/com/bx/imcommon/model/im/HeartbeatInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/HeartbeatInfo.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.model.im; +package com.bx.imcommon.model; import lombok.Data; diff --git a/im-commom/src/main/java/com/bx/imcommon/model/im/IMRecvInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/IMRecvInfo.java similarity index 82% rename from im-commom/src/main/java/com/bx/imcommon/model/im/IMRecvInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/IMRecvInfo.java index 95154f3..2e67da3 100644 --- a/im-commom/src/main/java/com/bx/imcommon/model/im/IMRecvInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/IMRecvInfo.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.model.im; +package com.bx.imcommon.model; import lombok.Data; diff --git a/im-commom/src/main/java/com/bx/imcommon/model/im/SendInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/IMSendInfo.java similarity index 58% rename from im-commom/src/main/java/com/bx/imcommon/model/im/SendInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/IMSendInfo.java index 15f1420..cc77e95 100644 --- a/im-commom/src/main/java/com/bx/imcommon/model/im/SendInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/IMSendInfo.java @@ -1,9 +1,9 @@ -package com.bx.imcommon.model.im; +package com.bx.imcommon.model; import lombok.Data; @Data -public class SendInfo { +public class IMSendInfo { private Integer cmd; private T data; diff --git a/im-commom/src/main/java/com/bx/imcommon/model/im/LoginInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/LoginInfo.java similarity index 70% rename from im-commom/src/main/java/com/bx/imcommon/model/im/LoginInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/LoginInfo.java index 5d90581..b4eb451 100644 --- a/im-commom/src/main/java/com/bx/imcommon/model/im/LoginInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/LoginInfo.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.model.im; +package com.bx.imcommon.model; import lombok.Data; diff --git a/im-commom/src/main/java/com/bx/imcommon/model/im/PrivateMessageInfo.java b/im-commom/src/main/java/com/bx/imcommon/model/PrivateMessageInfo.java similarity index 92% rename from im-commom/src/main/java/com/bx/imcommon/model/im/PrivateMessageInfo.java rename to im-commom/src/main/java/com/bx/imcommon/model/PrivateMessageInfo.java index 0544ffc..2c82f34 100644 --- a/im-commom/src/main/java/com/bx/imcommon/model/im/PrivateMessageInfo.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/PrivateMessageInfo.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.model.im; +package com.bx.imcommon.model; import com.bx.imcommon.serializer.DateToLongSerializer; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/im-commom/src/main/java/com/bx/imcommon/model/im/SendResult.java b/im-commom/src/main/java/com/bx/imcommon/model/SendResult.java similarity index 56% rename from im-commom/src/main/java/com/bx/imcommon/model/im/SendResult.java rename to im-commom/src/main/java/com/bx/imcommon/model/SendResult.java index 9e6722a..16d3ec8 100644 --- a/im-commom/src/main/java/com/bx/imcommon/model/im/SendResult.java +++ b/im-commom/src/main/java/com/bx/imcommon/model/SendResult.java @@ -1,6 +1,6 @@ -package com.bx.imcommon.model.im; +package com.bx.imcommon.model; -import com.bx.imcommon.enums.SendResultType; +import com.bx.imcommon.enums.IMSendStatus; import lombok.Data; @Data @@ -8,7 +8,7 @@ public class SendResult { private Long recvId; - private SendResultType result; + private IMSendStatus status; private String failReason=""; 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 094b04a..48d0665 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.imcommon.model.im.GroupMessageInfo; +import com.bx.imcommon.model.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 2801edf..1b9a338 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.imcommon.model.im.PrivateMessageInfo; +import com.bx.imcommon.model.PrivateMessageInfo; import com.bx.implatform.result.Result; import com.bx.implatform.result.ResultUtils; import com.bx.implatform.service.IPrivateMessageService; diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/FileType.java b/im-platform/src/main/java/com/bx/implatform/enums/FileType.java similarity index 94% rename from im-commom/src/main/java/com/bx/imcommon/enums/FileType.java rename to im-platform/src/main/java/com/bx/implatform/enums/FileType.java index c0eaa3f..669035d 100644 --- a/im-commom/src/main/java/com/bx/imcommon/enums/FileType.java +++ b/im-platform/src/main/java/com/bx/implatform/enums/FileType.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.enums; +package com.bx.implatform.enums; public enum FileType { diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/MessageStatus.java b/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java similarity index 95% rename from im-commom/src/main/java/com/bx/imcommon/enums/MessageStatus.java rename to im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java index 07663ed..1f0618d 100644 --- a/im-commom/src/main/java/com/bx/imcommon/enums/MessageStatus.java +++ b/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.enums; +package com.bx.implatform.enums; public enum MessageStatus { diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/MessageType.java b/im-platform/src/main/java/com/bx/implatform/enums/MessageType.java similarity index 92% rename from im-commom/src/main/java/com/bx/imcommon/enums/MessageType.java rename to im-platform/src/main/java/com/bx/implatform/enums/MessageType.java index 2d130cb..1dfeb99 100644 --- a/im-commom/src/main/java/com/bx/imcommon/enums/MessageType.java +++ b/im-platform/src/main/java/com/bx/implatform/enums/MessageType.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.enums; +package com.bx.implatform.enums; public enum MessageType { 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 9377110..3a8a745 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,20 +1,20 @@ package com.bx.implatform.listener; -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.imcommon.enums.IMListenerType; +import com.bx.imcommon.enums.IMSendStatus; +import com.bx.imcommon.model.GroupMessageInfo; +import com.bx.imcommon.model.SendResult; import com.bx.implatform.contant.RedisKey; +import com.bx.implatform.enums.MessageType; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @Slf4j -@IMListener(type = ListenerType.GROUP_MESSAGE) +@IMListener(type = IMListenerType.GROUP_MESSAGE) public class GroupMessageListener implements MessageListener { @Autowired @@ -29,7 +29,7 @@ public class GroupMessageListener implements MessageListener { } // 保存该用户已拉取的最大消息id - if(result.getResult().equals(SendResultType.SUCCESS)) { + if(result.getStatus().equals(IMSendStatus.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 5e5b5a4..f23e2ab 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,22 +1,22 @@ package com.bx.implatform.listener; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -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.imcommon.enums.IMListenerType; +import com.bx.imcommon.enums.IMSendStatus; +import com.bx.imcommon.model.PrivateMessageInfo; +import com.bx.imcommon.model.SendResult; import com.bx.implatform.entity.PrivateMessage; +import com.bx.implatform.enums.MessageStatus; +import com.bx.implatform.enums.MessageType; import com.bx.implatform.service.IPrivateMessageService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @Slf4j -@IMListener(type = ListenerType.PRIVATE_MESSAGE) +@IMListener(type = IMListenerType.PRIVATE_MESSAGE) public class PrivateMessageListener implements MessageListener { @Autowired @@ -30,7 +30,7 @@ public class PrivateMessageListener implements MessageListener { return; } // 更新消息状态 - if(result.getResult().equals(SendResultType.SUCCESS)){ + if(result.getStatus().equals(IMSendStatus.SUCCESS)){ UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.lambda().eq(PrivateMessage::getId,messageInfo.getId()) .eq(PrivateMessage::getStatus, MessageStatus.UNREAD.getCode()) 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 dd891c9..78a07ac 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.imcommon.model.im.GroupMessageInfo; +import com.bx.imcommon.model.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 ac53af8..be629d2 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.imcommon.model.im.PrivateMessageInfo; +import com.bx.imcommon.model.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 3a02fe9..e5dab1d 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,15 +2,15 @@ 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.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.imcommon.contant.Constant; +import com.bx.imcommon.model.GroupMessageInfo; import com.bx.implatform.contant.RedisKey; import com.bx.implatform.entity.Group; import com.bx.implatform.entity.GroupMember; import com.bx.implatform.entity.GroupMessage; +import com.bx.implatform.enums.MessageStatus; +import com.bx.implatform.enums.MessageType; import com.bx.implatform.enums.ResultCode; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.mapper.GroupMessageMapper; 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 f98e7bd..27d9a3a 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,13 +2,13 @@ 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.imclient.IMClient; 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.imcommon.model.PrivateMessageInfo; import com.bx.implatform.entity.PrivateMessage; +import com.bx.implatform.enums.MessageStatus; +import com.bx.implatform.enums.MessageType; import com.bx.implatform.enums.ResultCode; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.mapper.PrivateMessageMapper; 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 f38b965..0a54257 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,7 +1,7 @@ package com.bx.implatform.service.thirdparty; -import com.bx.imcommon.enums.FileType; import com.bx.implatform.contant.Constant; +import com.bx.implatform.enums.FileType; import com.bx.implatform.enums.ResultCode; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.session.SessionContext; 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 d94af93..64107fe 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 @@ -2,8 +2,8 @@ package com.bx.imserver.task; 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.imcommon.model.GroupMessageInfo; +import com.bx.imcommon.model.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 b95d47c..39ea6e9 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 @@ -3,8 +3,8 @@ package com.bx.imserver.task; 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.imcommon.model.IMRecvInfo; +import com.bx.imcommon.model.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-commom/src/main/java/com/bx/imcommon/util/SpringContextHolder.java b/im-server/src/main/java/com/bx/imserver/util/SpringContextHolder.java similarity index 97% rename from im-commom/src/main/java/com/bx/imcommon/util/SpringContextHolder.java rename to im-server/src/main/java/com/bx/imserver/util/SpringContextHolder.java index 1511c2b..25caf30 100644 --- a/im-commom/src/main/java/com/bx/imcommon/util/SpringContextHolder.java +++ b/im-server/src/main/java/com/bx/imserver/util/SpringContextHolder.java @@ -1,4 +1,4 @@ -package com.bx.imcommon.util; +package com.bx.imserver.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; 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 41fea89..3622deb 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 @@ -2,8 +2,8 @@ package com.bx.imserver.websocket; 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.imcommon.model.IMSendInfo; +import com.bx.imserver.util.SpringContextHolder; import com.bx.imserver.websocket.processor.MessageProcessor; import com.bx.imserver.websocket.processor.ProcessorFactory; import io.netty.channel.ChannelHandlerContext; @@ -21,7 +21,7 @@ import org.springframework.data.redis.core.RedisTemplate; * 浏览器连接状态监控 */ @Slf4j -public class WebSocketHandler extends SimpleChannelInboundHandler { +public class WebSocketHandler extends SimpleChannelInboundHandler { /** * 读取到消息后进行处理 @@ -31,7 +31,7 @@ public class WebSocketHandler extends SimpleChannelInboundHandler { * @throws Exception */ @Override - protected void channelRead0(ChannelHandlerContext ctx, SendInfo sendInfo) throws Exception { + protected void channelRead0(ChannelHandlerContext ctx, IMSendInfo sendInfo) throws Exception { // 创建处理器进行处理 MessageProcessor processor = ProcessorFactory.createProcessor(IMCmdType.fromCode(sendInfo.getCmd())); processor.process(ctx,processor.transForm(sendInfo.getData())); 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 f8e03fe..7cb69a3 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.imcommon.model.im.SendInfo; +import com.bx.imcommon.model.IMSendInfo; import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; @@ -13,7 +13,7 @@ public class MessageProtocolDecoder extends MessageToMessageDecoder list) throws Exception { ObjectMapper objectMapper = new ObjectMapper(); - SendInfo sendInfo = objectMapper.readValue(textWebSocketFrame.text(), SendInfo.class); + IMSendInfo sendInfo = objectMapper.readValue(textWebSocketFrame.text(), IMSendInfo.class); list.add(sendInfo); } } 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 b37b882..6a30bac 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.imcommon.model.im.SendInfo; +import com.bx.imcommon.model.IMSendInfo; import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageEncoder; @@ -8,10 +8,10 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import java.util.List; -public class MessageProtocolEncoder extends MessageToMessageEncoder { +public class MessageProtocolEncoder extends MessageToMessageEncoder { @Override - protected void encode(ChannelHandlerContext channelHandlerContext, SendInfo sendInfo, List list) throws Exception { + protected void encode(ChannelHandlerContext channelHandlerContext, IMSendInfo sendInfo, List list) throws Exception { ObjectMapper objectMapper = new ObjectMapper(); String text = objectMapper.writeValueAsString(sendInfo); 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 66e848f..473b506 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 @@ -2,11 +2,11 @@ package com.bx.imserver.websocket.processor; 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.imcommon.enums.IMSendStatus; +import com.bx.imcommon.model.GroupMessageInfo; +import com.bx.imcommon.model.IMRecvInfo; +import com.bx.imcommon.model.IMSendInfo; +import com.bx.imcommon.model.SendResult; import com.bx.imserver.websocket.WebsocketChannelCtxHolder; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; @@ -37,7 +37,7 @@ public class GroupMessageProcessor extends MessageProcessor { @Override public void process(ChannelHandlerContext ctx, HeartbeatInfo beatInfo) { // 响应ws - SendInfo sendInfo = new SendInfo(); + IMSendInfo sendInfo = new IMSendInfo(); sendInfo.setCmd(IMCmdType.HEART_BEAT.getCode()); ctx.channel().writeAndFlush(sendInfo); 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 690d42b..ba7656a 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 @@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil; 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.imcommon.model.IMSendInfo; +import com.bx.imcommon.model.LoginInfo; import com.bx.imserver.websocket.WebsocketChannelCtxHolder; import com.bx.imserver.websocket.WebsocketServer; import io.netty.channel.ChannelHandlerContext; @@ -35,7 +35,7 @@ public class LoginProcessor extends MessageProcessor { ChannelHandlerContext context = WebsocketChannelCtxHolder.getChannelCtx(loginInfo.getUserId()); if(context != null){ // 不允许多地登录,强制下线 - SendInfo sendInfo = new SendInfo(); + IMSendInfo sendInfo = new IMSendInfo(); sendInfo.setCmd(IMCmdType.FORCE_LOGUT.getCode()); context.channel().writeAndFlush(sendInfo); } @@ -51,7 +51,7 @@ public class LoginProcessor extends MessageProcessor { String key = RedisKey.IM_USER_SERVER_ID+loginInfo.getUserId(); redisTemplate.opsForValue().set(key, WSServer.getServerId(), Constant.ONLINE_TIMEOUT_SECOND, TimeUnit.SECONDS); // 响应ws - SendInfo sendInfo = new SendInfo(); + IMSendInfo sendInfo = new IMSendInfo(); sendInfo.setCmd(IMCmdType.LOGIN.getCode()); ctx.channel().writeAndFlush(sendInfo); } 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 a7fa075..8c9fd61 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 @@ -2,11 +2,11 @@ package com.bx.imserver.websocket.processor; 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.imcommon.enums.IMSendStatus; +import com.bx.imcommon.model.IMRecvInfo; +import com.bx.imcommon.model.IMSendInfo; +import com.bx.imcommon.model.PrivateMessageInfo; +import com.bx.imcommon.model.SendResult; import com.bx.imserver.websocket.WebsocketChannelCtxHolder; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; @@ -30,7 +30,7 @@ public class PrivateMessageProcessor extends MessageProcessor