Merge branch 'master' of https://gitlab.aillo.cc/hewei/wecloud_im_server into feature-cluster

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

@@ -23,7 +23,8 @@ import com.wecloud.im.service.ImConversationService;
 import com.wecloud.im.service.ImMessageService;
 import com.wecloud.im.service.ImMessageService;
 import com.wecloud.im.vo.ImMessageOfflineListVo;
 import com.wecloud.im.vo.ImMessageOfflineListVo;
 import com.wecloud.im.vo.OfflineMsgDto;
 import com.wecloud.im.vo.OfflineMsgDto;
-import com.wecloud.im.ws.model.ResponseModel;
+import com.wecloud.im.ws.enums.WsResponseCmdEnum;
+import com.wecloud.im.ws.model.WsResponseModel;
 import com.wecloud.im.ws.model.request.PushModel;
 import com.wecloud.im.ws.model.request.PushModel;
 import com.wecloud.im.ws.sender.PushTask;
 import com.wecloud.im.ws.sender.PushTask;
 import com.wecloud.im.ws.service.WriteDataService;
 import com.wecloud.im.ws.service.WriteDataService;
@@ -151,8 +152,8 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
                 imMessageOnlineSend.setEvent(Boolean.TRUE);
                 imMessageOnlineSend.setEvent(Boolean.TRUE);
 
 
                 //  向接收方推送
                 //  向接收方推送
-                ResponseModel<ImMessageOnlineSend> responseModel = new ResponseModel<>();
-                responseModel.setCmd(ResponseModel.ONLINE_EVENT_MSG);
+                WsResponseModel<ImMessageOnlineSend> responseModel = new WsResponseModel<>();
+                responseModel.setCmd(WsResponseCmdEnum.ONLINE_EVENT_MSG.getCmdCode());
                 ApiResult<Boolean> result = ApiResult.result(ApiCode.SUCCESS);
                 ApiResult<Boolean> result = ApiResult.result(ApiCode.SUCCESS);
                 responseModel.setCode(result.getCode());
                 responseModel.setCode(result.getCode());
                 responseModel.setMsg(result.getMessage());
                 responseModel.setMsg(result.getMessage());

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

@@ -3,7 +3,6 @@ package com.wecloud.im.ws.strategy.concrete;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 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.PushType;
 import com.wecloud.im.entity.ImApplication;
 import com.wecloud.im.entity.ImApplication;
 import com.wecloud.im.entity.ImClient;
 import com.wecloud.im.entity.ImClient;
 import com.wecloud.im.entity.ImConversationMembers;
 import com.wecloud.im.entity.ImConversationMembers;
@@ -21,7 +20,7 @@ import com.wecloud.im.ws.enums.WsRequestCmdEnum;
 import com.wecloud.im.ws.enums.WsResponseCmdEnum;
 import com.wecloud.im.ws.enums.WsResponseCmdEnum;
 import com.wecloud.im.ws.model.WsResponseModel;
 import com.wecloud.im.ws.model.WsResponseModel;
 import com.wecloud.im.ws.model.request.ReceiveModel;
 import com.wecloud.im.ws.model.request.ReceiveModel;
-import com.wecloud.im.ws.sender.SystemPush;
+import com.wecloud.im.ws.sender.PushTask;
 import com.wecloud.im.ws.service.WriteDataService;
 import com.wecloud.im.ws.service.WriteDataService;
 import com.wecloud.im.ws.strategy.ImCmdAbstract;
 import com.wecloud.im.ws.strategy.ImCmdAbstract;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
@@ -73,7 +72,7 @@ public class ImChatConcrete extends ImCmdAbstract {
     private ImClientService imClientService;
     private ImClientService imClientService;
 
 
     @Autowired
     @Autowired
-    private SystemPush systemPush;
+    private PushTask systemPush;
 
 
     @Override
     @Override
     public void process(ReceiveModel receiveModel, ChannelHandlerContext ctx, String data, String appKey, String clientId) throws JsonProcessingException {
     public void process(ReceiveModel receiveModel, ChannelHandlerContext ctx, String data, String appKey, String clientId) throws JsonProcessingException {
@@ -181,8 +180,9 @@ public class ImChatConcrete extends ImCmdAbstract {
             responseModel.setReqId(null);
             responseModel.setReqId(null);
             writeDataService.write(responseModel, appKey, imClientReceiver.getClientId());
             writeDataService.write(responseModel, appKey, imClientReceiver.getClientId());
 
 
+//            , PushType.ALERT
             // 异步推送系统通知消息
             // 异步推送系统通知消息
-            systemPush.push(pushMap, imClientReceiver, imApplication, PushType.ALERT);
+            systemPush.push(pushMap, imClientReceiver, imApplication);
         }
         }
 
 
         // 响应发送方消息id等信息
         // 响应发送方消息id等信息

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

@@ -11,7 +11,7 @@ import com.wecloud.im.service.ImMessageService;
 import com.wecloud.im.ws.annotation.CmdTypeAnnotation;
 import com.wecloud.im.ws.annotation.CmdTypeAnnotation;
 import com.wecloud.im.ws.enums.WsRequestCmdEnum;
 import com.wecloud.im.ws.enums.WsRequestCmdEnum;
 import com.wecloud.im.ws.model.request.ReceiveModel;
 import com.wecloud.im.ws.model.request.ReceiveModel;
-import com.wecloud.im.ws.sender.SystemPush;
+import com.wecloud.im.ws.sender.PushTask;
 import com.wecloud.im.ws.service.WriteDataService;
 import com.wecloud.im.ws.service.WriteDataService;
 import com.wecloud.im.ws.strategy.ImCmdAbstract;
 import com.wecloud.im.ws.strategy.ImCmdAbstract;
 import com.wecloud.rtc.entity.RtcSubCmd;
 import com.wecloud.rtc.entity.RtcSubCmd;
@@ -53,7 +53,7 @@ public class SingleRtcConcrete extends ImCmdAbstract {
     private ImClientService imClientService;
     private ImClientService imClientService;
 
 
     @Autowired
     @Autowired
-    private SystemPush systemPush;
+    private PushTask systemPush;
 
 
     @Override
     @Override
     public void process(ReceiveModel receiveModel, ChannelHandlerContext ctx, String data, String appKey, String clientId) throws JsonProcessingException {
     public void process(ReceiveModel receiveModel, ChannelHandlerContext ctx, String data, String appKey, String clientId) throws JsonProcessingException {