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

 package com.wecloud.im.ws.sender;
 package com.wecloud.im.ws.sender;
 
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.codec.Base64;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.turo.pushy.apns.DeliveryPriority;
 import com.turo.pushy.apns.DeliveryPriority;
 import com.turo.pushy.apns.PushType;
 import com.turo.pushy.apns.PushType;
@@ -106,7 +105,7 @@ public class PushTask {
      * @param imClientReceiver
      * @param imClientReceiver
      */
      */
     @Async
     @Async
-    public void push(HashMap<String, String> pushMap, ImClient imClientReceiver, ImApplication imApplication) {
+    public void push(HashMap<String, Object> pushMap, ImClient imClientReceiver, ImApplication imApplication) {
         log.info("push:" + imClientReceiver.getClientId());
         log.info("push:" + imClientReceiver.getClientId());
 
 
         PushModel pushModel = getPushModel(pushMap);
         PushModel pushModel = getPushModel(pushMap);
@@ -115,24 +114,24 @@ public class PushTask {
 
 
     }
     }
 
 
-    private PushModel getPushModel(HashMap<String, String> pushMap) {
+    private PushModel getPushModel(HashMap<String, Object> pushMap) {
         PushModel pushModel = new PushModel();
         PushModel pushModel = new PushModel();
         if (pushMap == null || pushMap.isEmpty()) {
         if (pushMap == null || pushMap.isEmpty()) {
             pushModel.setTitle(PUSH_TITLE);
             pushModel.setTitle(PUSH_TITLE);
             pushModel.setSubTitle(PUSH_BODY);
             pushModel.setSubTitle(PUSH_BODY);
             pushModel.setData(new HashMap<>(1));
             pushModel.setData(new HashMap<>(1));
         } else {
         } else {
-            pushModel.setTitle(pushMap.get(title));
-            pushModel.setSubTitle(pushMap.get(subTitle));
+            pushModel.setTitle((String) pushMap.get(title));
+            pushModel.setSubTitle((String) pushMap.get(subTitle));
 
 
             // 自定义推送内容
             // 自定义推送内容
-            try {
-                HashMap hashMap = JSON_MAPPER.readValue(pushMap.get(DATA), HashMap.class);
-                pushModel.setData(hashMap);
-            } catch (JsonProcessingException e) {
-                log.error("pushModel.setData(hashMap)", e);
-                pushModel.setData(new HashMap<>(1));
-            }
+//            try {
+            HashMap hashMap = (HashMap) pushMap.get(DATA);
+            pushModel.setData(hashMap);
+//            } catch (JsonProcessingException e) {
+//                log.error("pushModel.setData(hashMap)", e);
+//                pushModel.setData(new HashMap<>(1));
+//            }
         }
         }
 
 
         return pushModel;
         return pushModel;

common/src/main/java/com/wecloud/im/ws/strategy/concrete/ImChatConcrete.java

@@ -112,9 +112,9 @@ public class ImChatConcrete extends ImCmdAbstract {
         receiveModel.getData().remove(TO_CONVERSATION_KEY);
         receiveModel.getData().remove(TO_CONVERSATION_KEY);
 
 
         // 获取自定义推送字段
         // 获取自定义推送字段
-        HashMap<String, String> pushMap = null;
+        HashMap<String, Object> pushMap = null;
         if (receiveModel.getData().get(PUSH_KEY) != null) {
         if (receiveModel.getData().get(PUSH_KEY) != null) {
-            pushMap = (HashMap<String, String>) receiveModel.getData().get(PUSH_KEY);
+            pushMap = (HashMap<String, Object>) receiveModel.getData().get(PUSH_KEY);
             receiveModel.getData().remove(PUSH_KEY);
             receiveModel.getData().remove(PUSH_KEY);
         }
         }