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

@@ -223,7 +223,7 @@ public class PushTask {
             // 自定义推送字段
             // 自定义推送字段
             Map<String, String> dataMap = new HashMap<>();
             Map<String, String> dataMap = new HashMap<>();
             dataMap.put("data", pushModel.getData());
             dataMap.put("data", pushModel.getData());
-            info.put("data", dataMap);
+            json.put("data", dataMap);
 
 
             //数据消息data  通知消息 notification
             //数据消息data  通知消息 notification
             json.put("notification", info);
             json.put("notification", info);
@@ -232,6 +232,9 @@ public class PushTask {
 
 
             OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
             OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
             jsonStr = json.toString();
             jsonStr = json.toString();
+
+            log.info("FCM push data {}", jsonStr);
+
             wr.write(jsonStr);
             wr.write(jsonStr);
             wr.flush();
             wr.flush();
             InputStream inputStream = conn.getInputStream();
             InputStream inputStream = conn.getInputStream();