代码规范

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<messageInfos.length;i++){
                 IMRecvInfo<PrivateMessageInfo> 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<messageInfos.length;i++){
                 IMRecvInfo<GroupMessageInfo> 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;

im-commom/im-commom.iml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../im-commom/target/classes" />
-    <output-test url="file://$MODULE_DIR$/../im-commom/target/test-classes" />
-    <content url="file://$MODULE_DIR$/../im-commom">
-      <sourceFolder url="file://$MODULE_DIR$/../im-commom/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-      <excludeFolder url="file://$MODULE_DIR$/../im-commom/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.40" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.7.RELEASE" level="project" />
-  </component>
-</module>

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;
     }
 

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;
     }
+
 }

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;
     }
 
 }

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;
     }
 

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;
     }
 }

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;
     }
 }

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<PrivateMessage> updateWrapper = new UpdateWrapper<>();
             updateWrapper.lambda().eq(PrivateMessage::getId,messageInfo.getId())
-                    .eq(PrivateMessage::getStatus, MessageStatus.UNREAD.getCode())
+                    .eq(PrivateMessage::getStatus, MessageStatus.UNREAD.code())
-                    .set(PrivateMessage::getStatus, MessageStatus.ALREADY_READ.getCode());
+                    .set(PrivateMessage::getStatus, MessageStatus.ALREADY_READ.code());
             privateMessageService.update(updateWrapper);
             log.info("消息已读，消息id:{}，发送者:{},接收者:{}",messageInfo.getId(),messageInfo.getSendId(),messageInfo.getRecvId());
         }

im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java

@@ -108,12 +108,12 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
             throw  new GlobalException(ResultCode.PROGRAM_ERROR,"您已不在群聊里面，无法撤回消息");
         }
         // 修改数据库
-        msg.setStatus(MessageStatus.RECALL.getCode());
+        msg.setStatus(MessageStatus.RECALL.code());
         this.updateById(msg);
         // 群发
         List<Long> 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<GroupMessageMapper, Gro
             QueryWrapper<GroupMessage> 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<GroupMessageMapper, Gro
         QueryWrapper<GroupMessage> 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);
 

im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java

@@ -52,7 +52,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
         // 保存消息
         PrivateMessage msg = BeanUtils.copyProperties(vo, PrivateMessage.class);
         msg.setSendId(userId);
-        msg.setStatus(MessageStatus.UNREAD.getCode());
+        msg.setStatus(MessageStatus.UNREAD.code());
         msg.setSendTime(new Date());
         this.save(msg);
         // 推送消息
@@ -81,11 +81,11 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
             throw new GlobalException(ResultCode.PROGRAM_ERROR, "消息已发送超过5分钟，无法撤回");
         }
         // 修改消息状态
-        msg.setStatus(MessageStatus.RECALL.getCode());
+        msg.setStatus(MessageStatus.RECALL.code());
         this.updateById(msg);
         // 推送消息
         PrivateMessageInfo msgInfo = BeanUtils.copyProperties(msg, PrivateMessageInfo.class);
-        msgInfo.setType(MessageType.TIP.getCode());
+        msgInfo.setType(MessageType.TIP.code());
         msgInfo.setSendTime(new Date());
         msgInfo.setContent("对方撤回了一条消息");
         imClient.sendPrivateMessage(msgInfo.getRecvId(),msgInfo);
@@ -113,7 +113,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
                         .eq(PrivateMessage::getRecvId, friendId))
                 .or(wp -> 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);
 

im-server/src/main/java/com/bx/imserver/processor/GroupMessageProcessor.java

@@ -38,7 +38,7 @@ public class GroupMessageProcessor extends  MessageProcessor<IMRecvInfo<GroupMes
                     if(recvId != messageInfo.getSendId()){
                         // 推送消息到用户
                         IMSendInfo sendInfo = new IMSendInfo();
-                        sendInfo.setCmd(IMCmdType.GROUP_MESSAGE.getCode());
+                        sendInfo.setCmd(IMCmdType.GROUP_MESSAGE.code());
                         sendInfo.setData(messageInfo);
                         channelCtx.channel().writeAndFlush(sendInfo);
                         // 消息发送成功确认

im-server/src/main/java/com/bx/imserver/processor/HeartbeatProcessor.java

@@ -32,7 +32,7 @@ public class HeartbeatProcessor extends   MessageProcessor<HeartbeatInfo> {
     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);
 
         // 设置属性

im-server/src/main/java/com/bx/imserver/processor/LoginProcessor.java

@@ -36,7 +36,7 @@ public class LoginProcessor extends   MessageProcessor<LoginInfo> {
         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<LoginInfo> {
         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);
     }
 

im-server/src/main/java/com/bx/imserver/processor/PrivateMessageProcessor.java

@@ -31,7 +31,7 @@ public class PrivateMessageProcessor extends  MessageProcessor<IMRecvInfo<Privat
             if(channelCtx != null ){
                 // 推送消息到用户
                 IMSendInfo sendInfo = new IMSendInfo();
-                sendInfo.setCmd(IMCmdType.PRIVATE_MESSAGE.getCode());
+                sendInfo.setCmd(IMCmdType.PRIVATE_MESSAGE.code());
                 sendInfo.setData(messageInfo);
                 channelCtx.channel().writeAndFlush(sendInfo);
                 // 消息发送成功确认

im-server/src/main/java/com/bx/imserver/task/PullUnreadGroupMessageTask.java

@@ -4,9 +4,9 @@ import com.bx.imcommon.contant.RedisKey;
 import com.bx.imcommon.enums.IMCmdType;
 import com.bx.imcommon.model.GroupMessageInfo;
 import com.bx.imcommon.model.IMRecvInfo;
-import com.bx.imserver.ws.WebsocketServer;
 import com.bx.imserver.processor.MessageProcessor;
 import com.bx.imserver.processor.ProcessorFactory;
+import com.bx.imserver.ws.WebsocketServer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

im-server/src/main/java/com/bx/imserver/task/PullUnreadPrivateMessageTask.java

@@ -5,9 +5,9 @@ import com.bx.imcommon.contant.RedisKey;
 import com.bx.imcommon.enums.IMCmdType;
 import com.bx.imcommon.model.IMRecvInfo;
 import com.bx.imcommon.model.PrivateMessageInfo;
-import com.bx.imserver.ws.WebsocketServer;
 import com.bx.imserver.processor.MessageProcessor;
 import com.bx.imserver.processor.ProcessorFactory;
+import com.bx.imserver.ws.WebsocketServer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;