Merge remote-tracking branch 'origin/feature-cluster' into feature-cluster

core/src/main/java/com/wecloud/im/friend/service/ImFriendService.java

@@ -106,6 +106,7 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
         } else {
             my.setId(SnowflakeUtil.getId());
             my.setCreateTime(new Date());
+            my.setUpdateTime(new Date());
             this.save(my);
         }
 
@@ -123,6 +124,7 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
         } else {
             friend.setId(SnowflakeUtil.getId());
             friend.setCreateTime(new Date());
+            friend.setUpdateTime(new Date());
             this.save(friend);
         }
 

core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java

@@ -1114,6 +1114,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
                 myImConversationListAndMsgCountNew.add(myconversationlistvo);
 
             }
+            log.info("{} 查询加入的会话列表结果 {}", currentClient.getClientId(), JSON.toJSONString(myImConversationListAndMsgCountNew));
             return myImConversationListAndMsgCountNew;
         } catch (Exception e) {
             log.info("查询所有会话异常 ", e);

core/src/main/java/com/wecloud/im/vo/ConversationVo.java

@@ -22,7 +22,8 @@ import java.util.HashMap;
 @Accessors(chain = true)
 @ApiModel(value = "MyConversationListVo")
 public class ConversationVo implements Serializable {
-    private static final long serialVersionUID = 1L;
+
+    private static final long serialVersionUID = -4330507756623541941L;
 
     @ApiModelProperty("会话id")
     private Long id;

core/src/main/java/com/wecloud/im/ws/manager/ChannelManager.java

 package com.wecloud.im.ws.manager;
 
-import com.wecloud.im.entity.ImApplication;
-import com.wecloud.im.entity.ImClient;
 import com.wecloud.im.ws.cache.UserStateListener;
 import com.wecloud.im.ws.model.ClientInfo;
 import com.wecloud.im.ws.utils.RedisUtils;

core/src/main/resources/mapper/ImConversationMapper.xml

@@ -22,7 +22,7 @@
     </select>
 
     <select id="getMyImConversationListAndMsgCount" resultType="com.wecloud.im.vo.ConversationVo">
-        SELECT imConversation.id,
+        SELECT imConversation.id as id,
                imConversation.create_time,
                imConversation.`name`,
                imConversation.chat_type,