Merge branch 'feature-1.4-pushParam' of…

Merge branch 'feature-1.4-pushParam' of https://gitlab.aillo.cc/hewei/wecloud_im_server into feiwa_test

common/src/main/java/com/wecloud/im/ws/sender/PushTask.java

@@ -219,11 +219,16 @@ public class PushTask {
             JSONObject info = new JSONObject();
             info.put("title", pushModel.getTitle());
             info.put("body", pushModel.getSubTitle());
+
+            // 自定义推送字段
+            Map<String, String> dataMap = new HashMap<>();
+            dataMap.put("data", pushModel.getData());
+            info.put("data", dataMap);
+
             //数据消息data  通知消息 notification
             json.put("notification", info);
 
             // 自定义推送内容
-            json.put("data", pushModel.getData());
 
             OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
             jsonStr = json.toString();

开发记录.md

-
+
@@ -44,6 +44,7 @@ aaaaa3
   "push":{
     "title":"收到一条新消息",
     "subTitle":"发给12312123213这是一123个纯文本消息,发给12312123213这是一123个纯文本消息发给12312123213这是一123个纯文本消息"
+    "data":""
    },
   "diyAbcd":"aaaa自已定义字段的值",
   "toConversation":1427910060675305472,