优化在线推送;

bootstrap/src/test/java/io/geekidea/springbootplus/test/SignTest.java

@@ -32,7 +32,7 @@ public class SignTest {
     }
     }
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {
-        String clientId = "client_111";
+        String clientId = "client_333";
         String appKey = "elLwpel1gWCHDqZy";
         String appKey = "elLwpel1gWCHDqZy";
         String appSecret = "68809bb5a9077a83631aeb0b17b5965d6b2302faf2ab3737";
         String appSecret = "68809bb5a9077a83631aeb0b17b5965d6b2302faf2ab3737";
         String timestemp = String.valueOf(new Date().getTime());
         String timestemp = String.valueOf(new Date().getTime());

common/src/main/java/com/wecloud/im/entity/ImConversation.java

@@ -51,7 +51,7 @@ public class ImConversation extends BaseEntity {
     private String name;
     private String name;
 
 
     @ApiModelProperty("可选	自定义属性，供开发者扩展使用。")
     @ApiModelProperty("可选	自定义属性，供开发者扩展使用。")
-    private String attributes;
+    private Object attributes;
 
 
     @ApiModelProperty("可选	对话类型标志，是否是系统对话，后面会说明。")
     @ApiModelProperty("可选	对话类型标志，是否是系统对话，后面会说明。")
     private Boolean system;
     private Boolean system;

common/src/main/java/com/wecloud/im/entity/ImInbox.java

@@ -22,7 +22,7 @@ import java.util.Date;
 @Data
 @Data
 @Accessors(chain = true)
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@TableName("im_Inbox")
+@TableName("im_inbox")
 @ApiModel(value = "ImInbox对象")
 @ApiModel(value = "ImInbox对象")
 public class ImInbox extends BaseEntity {
 public class ImInbox extends BaseEntity {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

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

@@ -86,7 +86,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
         imConversation.setFkAppid(fkAppid);
         imConversation.setFkAppid(fkAppid);
         imConversation.setCreator(creator);
         imConversation.setCreator(creator);
         imConversation.setName(imConversationCreate.getName());
         imConversation.setName(imConversationCreate.getName());
-        imConversation.setAttributes(imConversationCreate.getAttributes().toString());
+        imConversation.setAttributes(imConversationCreate.getAttributes());
         imConversation.setSystem(false);
         imConversation.setSystem(false);
         imConversationService.save(imConversation);
         imConversationService.save(imConversation);
 
 

common/src/main/java/com/wecloud/im/tillo/app_ws/strategy/concrete/ImConcreteReceiveStrategy.java

@@ -141,7 +141,7 @@ public class ImConcreteReceiveStrategy extends AbstractReceiveStrategy {
             imInbox.setId(imInboxId);
             imInbox.setId(imInboxId);
             imInbox.setCreateTime(new Date());
             imInbox.setCreateTime(new Date());
             imInbox.setFkAppid(imApplication.getId());
             imInbox.setFkAppid(imApplication.getId());
-            imInbox.setReceiver(conversationMembers.getId());
+            imInbox.setReceiver(conversationMembers.getFkClientId());
             imInbox.setFkMsgId(messageId);
             imInbox.setFkMsgId(messageId);
             imInbox.setReadMsg(0);
             imInbox.setReadMsg(0);
             imInbox.setFkConversationId(toConversationId);
             imInbox.setFkConversationId(toConversationId);

common/src/main/java/com/wecloud/im/vo/MyConversationListVo.java

+package com.wecloud.im.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <pre>
+ * 会话表 查询结果对象
+ * </pre>
+ *
+ * @author wei
+ * @date 2021-05-07
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "MyConversationListVo")
+public class MyConversationListVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("会话id")
+    private Long id;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("对话中最后一条消息的发送或接收时间")
+    private Date lastMessage;
+
+    @ApiModelProperty("应用appid")
+    private Long fkAppid;
+
+    @ApiModelProperty("创建者客户端id")
+    private Long creator;
+
+    @ApiModelProperty("可选	 对话的名字，可为群组命名。")
+    private String name;
+
+    @ApiModelProperty("可选	自定义属性，供开发者扩展使用。")
+    private String attributes;
+
+    @ApiModelProperty("可选	对话类型标志，是否是系统对话，后面会说明。")
+    private Boolean system;
+}
\ No newline at end of file

common/src/main/resources/mapper/ImInboxMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用查询结果列 -->
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         id
         id
-        , create_time, update_time, receiver_date, fk_appid, receiver, fk_msg_id, read, fk_conversation_id
+        , create_time, update_time, receiver_date, fk_appid, receiver, fk_msg_id, read_msg, fk_conversation_id
     </sql>
     </sql>
 
 
     <select id="getImInboxById" resultType="com.wecloud.im.param.ImInboxQueryVo">
     <select id="getImInboxById" resultType="com.wecloud.im.param.ImInboxQueryVo">