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

config/src/main/resources/config/application-dev.yml

@@ -20,7 +20,8 @@ spring:
 #    password: 123456
 #    password: 123456
 
 
 # 测试外网
 # 测试外网
-    url: jdbc:mysql://124.71.83.11:3306/wecloud_im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+#    url: jdbc:mysql://124.71.83.11:3306/wecloud_im?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://121.37.22.224:3306/wecloud_im_feature_cluster?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     username: root
     password: temple123456
     password: temple123456
 
 

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

@@ -821,12 +821,12 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
             }
             }
 
 
             // 根据top进行排序
             // 根据top进行排序
-            List<ConversationVo> topList = myImConversationListAndMsgCount.stream().filter(ConversationVo::getTop).collect(Collectors.toList());
-            List<ConversationVo> normalList =
-                    myImConversationListAndMsgCount.stream().filter(vo -> !vo.getTop()).collect(Collectors.toList());
+//            List<ConversationVo> topList = myImConversationListAndMsgCount.stream().filter(ConversationVo::getTop).collect(Collectors.toList());
+//            List<ConversationVo> normalList =
+//                    myImConversationListAndMsgCount.stream().filter(vo -> !vo.getTop()).collect(Collectors.toList());
 
 
-            myImConversationListAndMsgCount = new ArrayList<>(topList);
-            myImConversationListAndMsgCount.addAll(normalList);
+//            myImConversationListAndMsgCount = new ArrayList<>(topList);
+//            myImConversationListAndMsgCount.addAll(normalList);
 
 
             // 返回的
             // 返回的
             List<ConversationVo> myImConversationListAndMsgCountNew = new ArrayList<>();
             List<ConversationVo> myImConversationListAndMsgCountNew = new ArrayList<>();

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

@@ -39,8 +39,8 @@
         imConversation.head_portrait,
         imConversation.head_portrait,
         imConversation.is_encrypt isEncrypt,
         imConversation.is_encrypt isEncrypt,
         im_client.client_id AS creator,
         im_client.client_id AS creator,
-        imConversationMembers.is_top as top,
-        imConversationMembers.is_do_not_disturb as do_not_disturb,
+--         imConversationMembers.is_top as top,
+--         imConversationMembers.is_do_not_disturb as do_not_disturb,
         (SELECT COUNT(im_inbox.id)
         (SELECT COUNT(im_inbox.id)
         FROM im_inbox
         FROM im_inbox
         WHERE im_inbox.fk_conversation_id = imConversation.id
         WHERE im_inbox.fk_conversation_id = imConversation.id