From a9f05237fb640945e2dbcd5c569591fda7d84680 Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Sat, 19 Nov 2022 21:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bx/imclient/sender/IMSender.java | 4 +- im-commom/im-commom.iml | 37 ------------------- .../java/com/bx/imcommon/enums/IMCmdType.java | 6 ++- .../com/bx/imcommon/enums/IMListenerType.java | 9 +++-- .../com/bx/imcommon/enums/IMSendStatus.java | 18 +++++---- .../com/bx/implatform/enums/FileType.java | 4 +- .../bx/implatform/enums/MessageStatus.java | 4 +- .../com/bx/implatform/enums/MessageType.java | 4 +- .../listener/PrivateMessageListener.java | 4 +- .../service/impl/GroupMessageServiceImpl.java | 8 ++-- .../impl/PrivateMessageServiceImpl.java | 8 ++-- .../processor/GroupMessageProcessor.java | 2 +- .../processor/HeartbeatProcessor.java | 2 +- .../bx/imserver/processor/LoginProcessor.java | 4 +- .../processor/PrivateMessageProcessor.java | 2 +- .../task/PullUnreadGroupMessageTask.java | 2 +- .../task/PullUnreadPrivateMessageTask.java | 2 +- 17 files changed, 45 insertions(+), 75 deletions(-) delete mode 100644 im-commom/im-commom.iml 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 ab6dd11..b6b0de5 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 @@ -40,7 +40,7 @@ public class IMSender { IMRecvInfo[] recvInfos = new IMRecvInfo[messageInfos.length]; for (int i=0;i recvInfo = new IMRecvInfo<>(); - recvInfo.setCmd(IMCmdType.PRIVATE_MESSAGE.getCode()); + recvInfo.setCmd(IMCmdType.PRIVATE_MESSAGE.code()); List recvIds = new LinkedList(); recvIds.add(recvId); recvInfo.setRecvIds(recvIds); @@ -88,7 +88,7 @@ public class IMSender { IMRecvInfo[] recvInfos = new IMRecvInfo[messageInfos.length]; for (int i=0;i recvInfo = new IMRecvInfo<>(); - recvInfo.setCmd(IMCmdType.GROUP_MESSAGE.getCode()); + recvInfo.setCmd(IMCmdType.GROUP_MESSAGE.code()); recvInfo.setRecvIds(new LinkedList<>(entry.getValue())); recvInfo.setData(messageInfos[i]); recvInfos[i] = recvInfo; diff --git a/im-commom/im-commom.iml b/im-commom/im-commom.iml deleted file mode 100644 index 1706946..0000000 --- a/im-commom/im-commom.iml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java b/im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java index b8c2bc9..aedfde0 100644 --- a/im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/IMCmdType.java @@ -1,5 +1,7 @@ package com.bx.imcommon.enums; + + public enum IMCmdType { LOGIN(0,"登陆"), @@ -28,11 +30,11 @@ public enum IMCmdType { } - public String getDesc() { + public String description() { return desc; } - public Integer getCode(){ + public Integer code(){ return this.code; } diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java b/im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java index d6da555..6ec1828 100644 --- a/im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/IMListenerType.java @@ -1,6 +1,6 @@ package com.bx.imcommon.enums; -public enum IMListenerType { +public enum IMListenerType{ ALL(0,"全部消息"), PRIVATE_MESSAGE(1,"私聊消息"), GROUP_MESSAGE(2,"群聊消息"); @@ -14,11 +14,14 @@ public enum IMListenerType { this.desc=desc; } - public String getDesc() { + + public String description() { return desc; } - public Integer getCode(){ + + public Integer code(){ return this.code; } + } diff --git a/im-commom/src/main/java/com/bx/imcommon/enums/IMSendStatus.java b/im-commom/src/main/java/com/bx/imcommon/enums/IMSendStatus.java index d64e3f7..cf82384 100644 --- a/im-commom/src/main/java/com/bx/imcommon/enums/IMSendStatus.java +++ b/im-commom/src/main/java/com/bx/imcommon/enums/IMSendStatus.java @@ -1,25 +1,27 @@ package com.bx.imcommon.enums; -public enum IMSendStatus { +public enum IMSendStatus { SUCCESS(0,"发送成功"), FAIL(1,"发送失败"); private int code; - private String msg; + private String desc; // 构造方法 - IMSendStatus(int code, String msg) { + IMSendStatus(int code, String desc) { this.code = code; - this.msg = msg; + this.desc = desc; } - public int getCode() { - return code; + + public String description() { + return desc; } - public void setCode(int code) { - this.code = code; + + public Integer code(){ + return this.code; } } diff --git a/im-platform/src/main/java/com/bx/implatform/enums/FileType.java b/im-platform/src/main/java/com/bx/implatform/enums/FileType.java index 669035d..2e628e5 100644 --- a/im-platform/src/main/java/com/bx/implatform/enums/FileType.java +++ b/im-platform/src/main/java/com/bx/implatform/enums/FileType.java @@ -28,11 +28,11 @@ public enum FileType { } - public String getDesc() { + public String description() { return desc; } - public Integer getCode(){ + public Integer code(){ return this.code; } diff --git a/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java b/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java index 1f0618d..212c3eb 100644 --- a/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java +++ b/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java @@ -26,11 +26,11 @@ public enum MessageStatus { } - public String getDesc() { + public String description() { return desc; } - public Integer getCode(){ + public Integer code(){ return this.code; } } diff --git a/im-platform/src/main/java/com/bx/implatform/enums/MessageType.java b/im-platform/src/main/java/com/bx/implatform/enums/MessageType.java index 1dfeb99..f6a0622 100644 --- a/im-platform/src/main/java/com/bx/implatform/enums/MessageType.java +++ b/im-platform/src/main/java/com/bx/implatform/enums/MessageType.java @@ -19,11 +19,11 @@ public enum MessageType { } - public String getDesc() { + public String description() { return desc; } - public Integer getCode(){ + public Integer code(){ return this.code; } } 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 f23e2ab..636ee4e 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 @@ -33,8 +33,8 @@ public class PrivateMessageListener implements MessageListener { if(result.getStatus().equals(IMSendStatus.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()); + .eq(PrivateMessage::getStatus, MessageStatus.UNREAD.code()) + .set(PrivateMessage::getStatus, MessageStatus.ALREADY_READ.code()); privateMessageService.update(updateWrapper); log.info("消息已读，消息id:{}，发送者:{},接收者:{}",messageInfo.getId(),messageInfo.getSendId(),messageInfo.getRecvId()); } 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 e5dab1d..2b5769c 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 @@ -108,12 +108,12 @@ public class GroupMessageServiceImpl extends ServiceImpl userIds = groupMemberService.findUserIdsByGroupId(msg.getGroupId()); GroupMessageInfo msgInfo = BeanUtils.copyProperties(msg, GroupMessageInfo.class); - msgInfo.setType(MessageType.TIP.getCode()); + msgInfo.setType(MessageType.TIP.code()); String content = String.format("'%s'撤回了一条消息",member.getAliasName()); msgInfo.setContent(content); msgInfo.setSendTime(new Date()); @@ -140,7 +140,7 @@ public class GroupMessageServiceImpl extends ServiceImpl wrapper = new QueryWrapper(); wrapper.lambda().eq(GroupMessage::getGroupId,member.getGroupId()) .gt(GroupMessage::getSendTime,member.getCreatedTime()) - .ne(GroupMessage::getStatus, MessageStatus.RECALL.getCode()); + .ne(GroupMessage::getStatus, MessageStatus.RECALL.code()); if(maxReadedId!=null){ wrapper.lambda().gt(GroupMessage::getId,maxReadedId); } @@ -185,7 +185,7 @@ public class GroupMessageServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.lambda().eq(GroupMessage::getGroupId,groupId) .gt(GroupMessage::getSendTime,member.getCreatedTime()) - .ne(GroupMessage::getStatus, MessageStatus.RECALL.getCode()) + .ne(GroupMessage::getStatus, MessageStatus.RECALL.code()) .orderByDesc(GroupMessage::getId) .last("limit "+stIdx + ","+size); 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 27d9a3a..3e5ba22 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 @@ -52,7 +52,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl wp.eq(PrivateMessage::getRecvId, userId) .eq(PrivateMessage::getSendId, friendId))) - .ne(PrivateMessage::getStatus, MessageStatus.RECALL.getCode()) + .ne(PrivateMessage::getStatus, MessageStatus.RECALL.code()) .orderByDesc(PrivateMessage::getId) .last("limit " + stIdx + "," + size); diff --git a/im-server/src/main/java/com/bx/imserver/processor/GroupMessageProcessor.java b/im-server/src/main/java/com/bx/imserver/processor/GroupMessageProcessor.java index ee1f517..5bf361f 100644 --- a/im-server/src/main/java/com/bx/imserver/processor/GroupMessageProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/processor/GroupMessageProcessor.java @@ -38,7 +38,7 @@ public class GroupMessageProcessor extends MessageProcessor { public void process(ChannelHandlerContext ctx, HeartbeatInfo beatInfo) { // 响应ws IMSendInfo sendInfo = new IMSendInfo(); - sendInfo.setCmd(IMCmdType.HEART_BEAT.getCode()); + sendInfo.setCmd(IMCmdType.HEART_BEAT.code()); ctx.channel().writeAndFlush(sendInfo); // 设置属性 diff --git a/im-server/src/main/java/com/bx/imserver/processor/LoginProcessor.java b/im-server/src/main/java/com/bx/imserver/processor/LoginProcessor.java index 94bac81..c89f1f0 100644 --- a/im-server/src/main/java/com/bx/imserver/processor/LoginProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/processor/LoginProcessor.java @@ -36,7 +36,7 @@ public class LoginProcessor extends MessageProcessor { if(context != null){ // 不允许多地登录,强制下线 IMSendInfo sendInfo = new IMSendInfo(); - sendInfo.setCmd(IMCmdType.FORCE_LOGUT.getCode()); + sendInfo.setCmd(IMCmdType.FORCE_LOGUT.code()); context.channel().writeAndFlush(sendInfo); } // 绑定用户和channel @@ -52,7 +52,7 @@ public class LoginProcessor extends MessageProcessor { redisTemplate.opsForValue().set(key, WSServer.getServerId(), Constant.ONLINE_TIMEOUT_SECOND, TimeUnit.SECONDS); // 响应ws IMSendInfo sendInfo = new IMSendInfo(); - sendInfo.setCmd(IMCmdType.LOGIN.getCode()); + sendInfo.setCmd(IMCmdType.LOGIN.code()); ctx.channel().writeAndFlush(sendInfo); } diff --git a/im-server/src/main/java/com/bx/imserver/processor/PrivateMessageProcessor.java b/im-server/src/main/java/com/bx/imserver/processor/PrivateMessageProcessor.java index a977f0d..ce5f910 100644 --- a/im-server/src/main/java/com/bx/imserver/processor/PrivateMessageProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/processor/PrivateMessageProcessor.java @@ -31,7 +31,7 @@ public class PrivateMessageProcessor extends MessageProcessor