更新jpush聊天消息处理逻辑

framework-jpush/src/main/java/com/chelvc/framework/jpush/ChatMessage.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -48,51 +49,61 @@ public class ChatMessage implements Serializable {
         /**
          * 目标类型
          */
+        @JsonAlias("target_type")
         private String targetType;
 
         /**
          * 消息类型
          */
+        @JsonAlias("msg_type")
         private String msgType;
 
         /**
          * 目标名称
          */
+        @JsonAlias("target_name")
         private String targetName;
 
         /**
          * 目标id
          */
+        @JsonAlias("target_id")
         private String targetId;
 
         /**
          * 发送消息人id
          */
+        @JsonAlias("from_id")
         private String fromId;
 
         /**
          * 发送消息人名称
          */
+        @JsonAlias("from_name")
         private String fromName;
 
         /**
          * 发送消息人类型
          */
+        @JsonAlias("from_type")
         private String fromType;
 
         /**
          * 发送消息人平台
          */
+        @JsonAlias("from_platform")
         private String fromPlatform;
 
         /**
          * 消息体
          */
+        @JsonAlias("msg_body")
         private Body msgBody;
 
         /**
          * 消息创建时间
          */
+        @JsonAlias("create_time")
         private Long createTime;
 
         /**
@@ -103,16 +114,19 @@ public class ChatMessage implements Serializable {
         /**
          * 消息id
          */
-        private String msgid;
+        @JsonAlias("msgid")
+        private Long msgId;
 
         /**
          * 消息登记
          */
+        @JsonAlias("msg_level")
         private Integer msgLevel;
 
         /**
          * 消息发送时间
          */
+        @JsonAlias("msg_ctime")
         private Long msgCtime;
 
         /**
@@ -148,9 +162,13 @@ public class ChatMessage implements Serializable {
 
         private Map<String, String> extras;
 
-        private String media_id;
+        @JsonAlias("media_id")
+        private String mediaId;
 
-        private Long media_crc32;
+        @JsonAlias("media_crc32")
+        private Long mediaCrc32;
+
+        private Double duration;
 
         private Integer width;
 
@@ -159,5 +177,15 @@ public class ChatMessage implements Serializable {
         private String format;
 
         private Integer fsize;
+
+        private String resume;
+
+        private String isFirst;
+
+        private String promptInfo;
+
+        private String position;
+
+        private String hash;
     }
 }

framework-jpush/src/main/java/com/chelvc/framework/jpush/DefaultJPushHandler.java

@@ -311,7 +311,8 @@ public class DefaultJPushHandler implements JPushHandler {
     @Override
     public ChatMessage getUserMessages(@NonNull String username, @NonNull Period period, int count) {
         return this.getChatMessages(String.format(
-                GET_MESSAGE_URL, username, count, DateUtils.format(period.getBegin()), DateUtils.format(period.getEnd())
+                GET_MESSAGE_URL, username, count, DateUtils.format(period.getBegin(), true),
+                DateUtils.format(period.getEnd(), true)
         ));
     }