新增终端设备表

2fcc10da · Future · dd7d397b · 2fcc10da · 2fcc10da · 2fcc10da
Commit 2fcc10da authored Mar 02, 2022 by Future
25 changed files
--- a/bootstrap/src/test/java/io/geekidea/springbootplus/test/LoginTest.java
+++ b/bootstrap/src/test/java/io/geekidea/springbootplus/test/LoginTest.java
@@ -5,7 +5,7 @@ import cn.hutool.crypto.digest.MD5;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.wecloud.im.entity.ImApplication;
 import com.wecloud.im.entity.ImClient;
-import com.wecloud.im.enums.PlatformEnum;
+import com.wecloud.im.enums.DeviceTypeEnum;
 import com.wecloud.im.service.ImApplicationService;
 import com.wecloud.im.service.ImClientService;
 import com.wecloud.im.ws.utils.RedisUtils;
@@ -85,7 +85,7 @@ public class LoginTest {
        }
        // 生成token
-        String generateToken = JwtUtil.generateToken(clientId, appKey, imApplication.getAppSecret(), Duration.ofDays(99999), PlatformEnum.WEB.getCode());
+        String generateToken = JwtUtil.generateToken(clientId, appKey, imApplication.getAppSecret(), Duration.ofDays(99999), DeviceTypeEnum.WEB.getCode());
        //  保存redis
        redisTemplate.opsForValue().set("client:" + imApplication.getAppKey() + ":" + clientId, generateToken);

--- a/core/src/main/java/com/wecloud/im/action/NormalChatAction.java
+++ b/core/src/main/java/com/wecloud/im/action/NormalChatAction.java
@@ -152,7 +152,9 @@ public class NormalChatAction {
            // 异步推送系统通知消息
            PushDTO pushDTO = mqSender.buildPushDto(data.getPush(), imClientReceiver, imApplication);
-            mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+            if (pushDTO != null) {
+                mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+            }
        }
        // 响应发送方消息id等信息

--- a/core/src/main/java/com/wecloud/im/controller/ImClientController.java
+++ b/core/src/main/java/com/wecloud/im/controller/ImClientController.java
@@ -2,11 +2,11 @@ package com.wecloud.im.controller;
 import com.wecloud.im.entity.ImApplication;
 import com.wecloud.im.entity.ImClient;
-import com.wecloud.im.friend.param.ImFriendApplyDto;
 import com.wecloud.im.param.ClientInfoParam;
 import com.wecloud.im.param.GetClientInfoParam;
 import com.wecloud.im.param.GetOnlineStatusParam;
-import com.wecloud.im.param.add.ImClientDeviceInfoAdd;
+import com.wecloud.im.param.LogoutParam;
+import com.wecloud.im.param.add.ClientDeviceUpdateParam;
 import com.wecloud.im.param.add.ImClientHeadPortraitAdd;
 import com.wecloud.im.param.add.ImClientHeadPortraitAndNicknameUpdate;
 import com.wecloud.im.param.add.ImClientNicknameAdd;
@@ -93,7 +93,7 @@ public class ImClientController extends BaseController {
     */
    @PostMapping("/addDeviceInfo")
    @ApiOperation(value = "添加或修改推送设备信息(每次请求都会覆盖之前的数据)")
-    public ApiResult<Boolean> addDeviceInfo(@Validated(Add.class) @RequestBody ImClientDeviceInfoAdd imClientDevice) throws Exception {
+    public ApiResult<Boolean> addDeviceInfo(@Validated(Add.class) @RequestBody ClientDeviceUpdateParam imClientDevice) throws Exception {
        boolean flag = imClientService.updateDeviceInfo(imClientDevice);
        return ApiResult.result(flag);
    }
@@ -130,8 +130,8 @@ public class ImClientController extends BaseController {
     */
    @PostMapping("/logout")
    @ApiOperation(value = "退出登陆 清除推送token等")
-    public ApiResult<Boolean> logout() throws Exception {
+    public ApiResult<Boolean> logout(@RequestBody @Validated LogoutParam param) throws Exception {
-        boolean flag = imClientService.logout();
+        boolean flag = imClientService.logout(param);
        return ApiResult.result(flag);
    }
@@ -144,7 +144,7 @@ public class ImClientController extends BaseController {
    @ApiOperation(value = "获取用户在线状态(批量)")
    ApiResult<List<ImOnlineStatusVo>> getOnlineStatus(@RequestBody GetOnlineStatusParam getOnlineStatusParam) {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询appid
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());

--- a/core/src/main/java/com/wecloud/im/entity/ImClient.java
+++ b/core/src/main/java/com/wecloud/im/entity/ImClient.java
@@ -48,25 +48,10 @@ public class ImClient extends BaseEntity {
    @ApiModelProperty("客户方提供的唯一id")
    private String clientId;
-    @ApiModelProperty("设备不想收到推送提醒, 1想, 0不想")
-    private Integer valid;
-    @ApiModelProperty("设备类型1:ios; 2:android")
-    private Integer deviceType;
-    @ApiModelProperty("设备推送token")
-    private String deviceToken;
    @ApiModelProperty("头像")
    private String headPortrait;
    @ApiModelProperty("主昵称")
    private String nickname;
-    /**
-     * 客户端平台
-     * @see com.wecloud.im.enums.PlatformEnum
-     */
-    @NotNull(message = "平台不可为空")
-    @ApiModelProperty("客户端平台: 1 web, 2 安卓, 3 ios, 4 pc-win, 5 pc-macOs")
-    private Integer platform;
 }
--- a/core/src/main/java/com/wecloud/im/entity/ImClientDevice.java
+++ b/core/src/main/java/com/wecloud/im/entity/ImClientDevice.java
@@ -2,6 +2,7 @@ package com.wecloud.im.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.wecloud.im.enums.DeviceTypeEnum;
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,6 +31,9 @@ public class ImClientDevice extends BaseEntity {
    @TableId(value = "id", type = IdType.INPUT)
    private Long id;
+    @ApiModelProperty("应用appid")
+    private Long fkAppid;
    @ApiModelProperty("client主键id")
    private Long fkClientId;
@@ -47,7 +51,7 @@ public class ImClientDevice extends BaseEntity {
    /**
     * 客户端平台
-     * @see com.wecloud.im.enums.PlatformEnum
+     * @see DeviceTypeEnum
     */
    @NotNull(message = "平台不可为空")
    @ApiModelProperty("客户端平台: 1 web, 2 安卓, 3 ios, 4 pc-win, 5 pc-macOs")

--- a/core/src/main/java/com/wecloud/im/enums/PlatformEnum.java
+++ b/core/src/main/java/com/wecloud/im/enums/PlatformEnum.java
@@ -2,18 +2,23 @@ package com.wecloud.im.enums;
 import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
-public enum PlatformEnum implements BaseEnum {
+/**
+ * @Author wenzhida
-    WEB(1, "web端"),
+ * @Date 2022/3/2 17:15
+ * @Description 设备类型枚举
+ */
+public enum DeviceTypeEnum implements BaseEnum {
+    IOS(1, "IOS端"),
    ANDROID(2, "安卓端"),
-    IOS(3, "IOS端"),
+    WEB(3, "web端"),
    WIN(4, "PC-windows端"),
    MAC(5, "PC-macOs端");
    private final Integer code;
    private final String desc;
-    PlatformEnum(Integer code, String desc) {
+    DeviceTypeEnum(Integer code, String desc) {
        this.code = code;
        this.desc = desc;
    }

--- a/core/src/main/java/com/wecloud/im/externalaccess/param/UserLoginParam.java
+++ b/core/src/main/java/com/wecloud/im/externalaccess/param/UserLoginParam.java
 package com.wecloud.im.externalaccess.param;
+import com.wecloud.im.enums.DeviceTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -36,12 +37,10 @@ public class UserLoginParam implements Serializable {
    /**
     * 客户端平台
-     * @see com.wecloud.im.enums.PlatformEnum
+     * @see DeviceTypeEnum
     */
    @NotNull(message = "平台不可为空")
    @ApiModelProperty("客户端平台: 1 web, 2 安卓, 3 ios, 4 pc-win, 5 pc-macOs")
    private Integer platform;
-    @ApiModelProperty("设备推送token")
-    private String deviceToken;
 }
--- a/core/src/main/java/com/wecloud/im/externalaccess/service/UserService.java
+++ b/core/src/main/java/com/wecloud/im/externalaccess/service/UserService.java
@@ -3,19 +3,12 @@ package com.wecloud.im.externalaccess.service;
 import cn.hutool.core.lang.Snowflake;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.wecloud.im.constant.NumberConstant;
+import com.wecloud.im.constant.RedisKeyPrefixConstant;
 import com.wecloud.im.entity.ImApplication;
 import com.wecloud.im.entity.ImClient;
 import com.wecloud.im.enums.FriendStateEnum;
 import com.wecloud.im.enums.RelationEnum;
 import com.wecloud.im.enums.VerifySceneEnum;
-import com.wecloud.im.friend.entity.ImFriend;
-import com.wecloud.im.friend.service.ImFriendService;
-import com.wecloud.im.param.add.ImClientHeadPortraitAdd;
-import com.wecloud.im.param.add.ImClientNicknameUpdate;
-import com.wecloud.im.service.ImApplicationService;
-import com.wecloud.im.service.ImClientBlacklistService;
-import com.wecloud.im.service.ImClientService;
-import com.wecloud.im.constant.RedisKeyPrefixConstant;
 import com.wecloud.im.externalaccess.entity.User;
 import com.wecloud.im.externalaccess.mapper.UserMapper;
 import com.wecloud.im.externalaccess.param.ChangePhoneParam;
@@ -31,6 +24,13 @@ import com.wecloud.im.externalaccess.param.ResetPasswordParam;
 import com.wecloud.im.externalaccess.param.UserBaseDto;
 import com.wecloud.im.externalaccess.param.UserLoginParam;
 import com.wecloud.im.externalaccess.param.UserRegisterParam;
+import com.wecloud.im.friend.entity.ImFriend;
+import com.wecloud.im.friend.service.ImFriendService;
+import com.wecloud.im.param.add.ImClientHeadPortraitAdd;
+import com.wecloud.im.param.add.ImClientNicknameUpdate;
+import com.wecloud.im.service.ImApplicationService;
+import com.wecloud.im.service.ImClientBlacklistService;
+import com.wecloud.im.service.ImClientService;
 import com.wecloud.im.ws.utils.RedisUtils;
 import com.wecloud.utils.AesUtil;
 import com.wecloud.utils.RandomUtil;
@@ -71,6 +71,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 校验手机号码是否可使用
+     *
     * @param param
     */
    public Boolean checkPhone(CheckPhoneParam param) {
@@ -84,6 +85,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 注册用户
+     *
     * @param param
     */
    public String registerUser(UserRegisterParam param) {
@@ -108,6 +110,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 用户登录
+     *
     * @param param
     */
    public LoginSuccessDto loginUser(UserLoginParam param) {
@@ -136,11 +139,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
            imClient.setClientId(user.getId().toString());
            imClient.setHeadPortrait(user.getHeadPortrait());
            imClient.setNickname(user.getNickname());
-            imClient.setPlatform(param.getPlatform());
            imClientService.save(imClient);
-        } else {
-            imClient.setPlatform(param.getPlatform());
-            imClientService.updateById(imClient);
        }
        LoginSuccessDto loginSuccessDto = new LoginSuccessDto();
@@ -151,6 +150,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 重置密码
+     *
     * @param param
     */
    public void resetPassword(ResetPasswordParam param) {
@@ -167,6 +167,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 更换手机号码
+     *
     * @param param
     */
    public void changePhone(ChangePhoneParam param) {
@@ -208,6 +209,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 查找用户
+     *
     * @param param
     */
    public UserBaseDto findUser(FindUserParam param) {
@@ -239,6 +241,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 查找用户
+     *
     * @param param
     */
    public UserBaseDto getUserByUserId(GetUserParam param) {
@@ -266,6 +269,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 修改头像
+     *
     * @param param
     */
    @Transactional(rollbackFor = Exception.class)
@@ -283,6 +287,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 修改昵称
+     *
     * @param param
     */
    @Transactional(rollbackFor = Exception.class)
@@ -303,6 +308,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 修改昵称
+     *
     * @param param
     */
    public void modifyLandouNo(ModifyLandouParam param) {
@@ -323,6 +329,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 修改性别
+     *
     * @param param
     */
    public void modifySex(ModifySexParam param) {
@@ -336,16 +343,18 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 根据蓝豆号获取用户
+     *
     * @param landouNo
     * @return
     */
-    public User getByLandouNo (String landouNo) {
+    public User getByLandouNo(String landouNo) {
        return this.getOne(new QueryWrapper<User>().lambda()
                .eq(User::getIdNumber, landouNo));
    }
    /**
     * 校验短信验证码
+     *
     * @param verifyCode
     * @param redisKey
     */
@@ -359,9 +368,10 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
    /**
     * 获取可使用蓝豆号
+     *
     * @return
     */
-    private String getLandouNo () {
+    private String getLandouNo() {
        String landouNo;
        do {
            landouNo = RandomUtil.generateRandomStr(8);

--- a/core/src/main/java/com/wecloud/im/friend/service/FriendEventSender.java
+++ b/core/src/main/java/com/wecloud/im/friend/service/FriendEventSender.java
@@ -66,7 +66,9 @@ public class FriendEventSender {
        pushVO.setTitle(FRIEND_APPLY_TITLE);
        pushVO.setSubTitle(FRIEND_APPLY_TITLE_SUB);
        PushDTO pushDTO = mqSender.buildPushDto(pushVO, receiveClient, app);
-        mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+        if (pushDTO != null) {
+            mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+        }
    }
    public void sendFriendApproveEventMsg(ImClient claimerClient, ImClient receiveClient, boolean isAgree, String rejectRemark) {
@@ -94,6 +96,8 @@ public class FriendEventSender {
        pushVO.setTitle(FRIEND_APPROVE_TITLE);
        pushVO.setSubTitle(isAgree ? FRIEND_APPROVE_TITLE_AGREE : FRIEND_APPROVE_TITLE_REJECT);
        PushDTO pushDTO = mqSender.buildPushDto(pushVO, receiveClient, app);
-        mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+        if (pushDTO != null) {
+            mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+        }
    }
 }
--- a/core/src/main/java/com/wecloud/im/mapper/ImClientDeviceMapper.java
+++ b/core/src/main/java/com/wecloud/im/mapper/ImClientDeviceMapper.java
@@ -2,6 +2,7 @@ package com.wecloud.im.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.wecloud.im.entity.ImClientDevice;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 /**
@@ -12,4 +13,12 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ImClientDeviceMapper extends BaseMapper<ImClientDevice> {
+    /**
+     * 清除旧token
+     * @param appId
+     * @param deviceToken
+     * @return
+     */
+    int removeOldToken(@Param("appId") Long appId, @Param("deviceToken") String deviceToken);
 }
--- a/core/src/main/java/com/wecloud/im/mq/MqSender.java
+++ b/core/src/main/java/com/wecloud/im/mq/MqSender.java
 package com.wecloud.im.mq;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.wecloud.im.entity.ImApplication;
 import com.wecloud.im.entity.ImClient;
+import com.wecloud.im.entity.ImClientDevice;
+import com.wecloud.im.entity.ImConversationMembers;
+import com.wecloud.im.service.ImClientDeviceService;
 import com.wecloud.im.service.ImInboxService;
 import com.wecloud.im.ws.model.request.PushVO;
 import com.wecloud.pushserver.client.model.constant.MqConstant;
+import com.wecloud.pushserver.client.model.dto.ApplicationDTO;
+import com.wecloud.pushserver.client.model.dto.ClientDTO;
+import com.wecloud.pushserver.client.model.dto.ClientDeviceDTO;
 import com.wecloud.pushserver.client.model.dto.ImApplicationDTO;
 import com.wecloud.pushserver.client.model.dto.ImClientDTO;
 import com.wecloud.pushserver.client.model.dto.MessageDTO;
 import com.wecloud.pushserver.client.model.dto.PushDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.List;
 import static com.wecloud.im.ws.ImConstant.PUSH_BODY;
 import static com.wecloud.im.ws.ImConstant.PUSH_TITLE;
@@ -34,8 +44,12 @@ public class MqSender {
    @Autowired
    private RocketMqProducerService rocketMqProducerService;
+    @Autowired
+    private ImClientDeviceService imClientDeviceService;
    /**
     * mq同步推送方法
+     *
     * @param topic
     * @param tag
     * @param pushDTO
@@ -50,6 +64,7 @@ public class MqSender {
    /**
     * mq异步推送方法
+     *
     * @param topic
     * @param tag
     * @param pushDTO
@@ -62,6 +77,7 @@ public class MqSender {
    /**
     * mq按顺序发送
+     *
     * @param topic
     * @param tag
     * @param pushDTO
@@ -89,23 +105,34 @@ public class MqSender {
        // 统计未读消息数量
        int badge = imInboxService.countMyNotReadCount(imClientReceiver.getId());
        messageDTO.setBadge(badge);
-        ImClientDTO imClientDTO = new ImClientDTO();
+        ClientDTO clientDTO = new ClientDTO();
-        imClientDTO.setClientId(imClientReceiver.getClientId());
+        clientDTO.setClientId(imClientReceiver.getClientId());
-        imClientDTO.setValid(imClientReceiver.getValid());
+        List<ImClientDevice> clientDeviceList = imClientDeviceService.list(
-        imClientDTO.setDeviceType(imClientReceiver.getDeviceType());
+                new QueryWrapper<ImClientDevice>().lambda()
-        imClientDTO.setDeviceToken(imClientReceiver.getDeviceToken());
+                        .eq(ImClientDevice::getFkClientId, imClientReceiver.getId()));
-        messageDTO.setImClientDTO(imClientDTO);
+        if (CollectionUtils.isEmpty(clientDeviceList)) {
-        ImApplicationDTO imApplicationDTO = new ImApplicationDTO();
+            return null;
-        imApplicationDTO.setId(imApplication.getId());
+        }
-        imApplicationDTO.setAppKey(imApplication.getAppKey());
+        List<ClientDeviceDTO> deviceDTOList = Lists.newArrayList();
-        imApplicationDTO.setAppSecret(imApplication.getAppSecret());
+        for (ImClientDevice imClientDevice : clientDeviceList) {
-        imApplicationDTO.setAppName(imApplication.getAppName());
+            ClientDeviceDTO clientDeviceDTO = new ClientDeviceDTO();
-        imApplicationDTO.setIosPushChannel(imApplication.getIosPushChannel());
+            clientDeviceDTO.setValid(imClientDevice.getValid());
-        imApplicationDTO.setAndroidPushChannel(imApplication.getAndroidPushChannel());
+            clientDeviceDTO.setDeviceType(imClientDevice.getDeviceType());
-        imApplicationDTO.setUmengKey(imApplication.getUmengKey());
+            clientDeviceDTO.setDeviceToken(imClientDevice.getDeviceToken());
-        imApplicationDTO.setUmengSecret(imApplication.getUmengSecret());
+        }
-        imApplicationDTO.setFirebaseSecret(imApplication.getFirebaseSecret());
+        clientDTO.setDeviceDTOList(deviceDTOList);
-        messageDTO.setImApplicationDTO(imApplicationDTO);
+        messageDTO.setClientDTO(clientDTO);
+        ApplicationDTO applicationDTO = new ApplicationDTO();
+        applicationDTO.setId(imApplication.getId());
+        applicationDTO.setAppKey(imApplication.getAppKey());
+        applicationDTO.setAppSecret(imApplication.getAppSecret());
+        applicationDTO.setAppName(imApplication.getAppName());
+        applicationDTO.setIosPushChannel(imApplication.getIosPushChannel());
+        applicationDTO.setAndroidPushChannel(imApplication.getAndroidPushChannel());
+        applicationDTO.setUmengKey(imApplication.getUmengKey());
+        applicationDTO.setUmengSecret(imApplication.getUmengSecret());
+        applicationDTO.setFirebaseSecret(imApplication.getFirebaseSecret());
+        messageDTO.setApplicationDTO(applicationDTO);
        pushDTO.setMessageDTOList(Lists.newArrayList(messageDTO));
        return pushDTO;
    }

--- a/core/src/main/java/com/wecloud/im/param/LogoutParam.java
+++ b/core/src/main/java/com/wecloud/im/param/LogoutParam.java
+package com.wecloud.im.param;
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.NotNull;
+/**
+ * 添加或修改推送设备信息
+ *
+ * @author wei
+ * @since 2021-04-27
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "添加或修改推送设备信息")
+public class LogoutParam extends BaseEntity {
+    private static final long serialVersionUID = -2718673661281424767L;
+    /**
+     * 设备类型
+     * @see com.wecloud.im.enums.DeviceTypeEnum
+     */
+    @ApiModelProperty("设备类型 1:ios; 2:android; 3:web; 4:win; 5:mac")
+    @NotNull(message = "设备类型不能为空")
+    private Integer deviceType;
+    @ApiModelProperty("唯一设备id")
+    private String uniqueDeviceId;
+}
--- a/core/src/main/java/com/wecloud/im/param/add/ImClientDeviceInfoAdd.java
+++ b/core/src/main/java/com/wecloud/im/param/add/ImClientDeviceInfoAdd.java
@@ -17,15 +17,22 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "添加或修改推送设备信息")
-public class ImClientDeviceInfoAdd extends BaseEntity {
+public class ClientDeviceUpdateParam extends BaseEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("设备不想收到推送提醒, 1想, 0不想")
    private Integer valid;
-    @ApiModelProperty("设备类型1:ios; 2:android; 3:web")
+    /**
+     * 设备类型
+     * @see com.wecloud.im.enums.DeviceTypeEnum
+     */
+    @ApiModelProperty("设备类型 1:ios; 2:android; 3:web; 4:win; 5:mac")
    private Integer deviceType;
    @ApiModelProperty("设备推送token")
    private String deviceToken;
+    @ApiModelProperty("唯一设备id")
+    private String uniqueDeviceId;
 }
--- a/core/src/main/java/com/wecloud/im/service/ImClientDeviceService.java
+++ b/core/src/main/java/com/wecloud/im/service/ImClientDeviceService.java
@@ -10,4 +10,12 @@ import io.geekidea.springbootplus.framework.common.service.BaseService;
 */
 public interface ImClientDeviceService extends BaseService<ImClientDevice> {
+    /**
+     * 清除旧token
+     * @param appId
+     * @param deviceToken
+     * @return
+     */
+    int removeOldToken(Long appId, String deviceToken);
 }
--- a/core/src/main/java/com/wecloud/im/service/ImClientService.java
+++ b/core/src/main/java/com/wecloud/im/service/ImClientService.java
@@ -6,7 +6,8 @@ import com.wecloud.im.param.GetClientInfoParam;
 import com.wecloud.im.param.ImClientPageParam;
 import com.wecloud.im.param.ImClientQueryVo;
 import com.wecloud.im.param.ImClientSimpleDto;
-import com.wecloud.im.param.add.ImClientDeviceInfoAdd;
+import com.wecloud.im.param.LogoutParam;
+import com.wecloud.im.param.add.ClientDeviceUpdateParam;
 import com.wecloud.im.param.add.ImClientHeadPortraitAdd;
 import com.wecloud.im.param.add.ImClientHeadPortraitAndNicknameUpdate;
 import com.wecloud.im.param.add.ImClientNicknameAdd;
@@ -85,9 +86,14 @@ public interface ImClientService extends BaseService<ImClient> {
     * @param imClientDevice
     * @return
     */
-    boolean updateDeviceInfo(ImClientDeviceInfoAdd imClientDevice);
+    boolean updateDeviceInfo(ClientDeviceUpdateParam imClientDevice);
-    boolean logout();
+    /**
+     * 登出操作
+     * @param param
+     * @return
+     */
+    boolean logout(LogoutParam param);
    /**

--- a/core/src/main/java/com/wecloud/im/service/impl/ImClientDeviceServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImClientDeviceServiceImpl.java
@@ -5,6 +5,7 @@ import com.wecloud.im.mapper.ImClientDeviceMapper;
 import com.wecloud.im.service.ImClientDeviceService;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 /**
@@ -16,5 +17,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class ImClientDeviceServiceImpl extends BaseServiceImpl<ImClientDeviceMapper, ImClientDevice> implements ImClientDeviceService {
+    @Autowired
+    private ImClientDeviceMapper imClientDeviceMapper;
+    @Override
+    public int removeOldToken(Long appId, String deviceToken) {
+        return imClientDeviceMapper.removeOldToken(appId, deviceToken);
+    }
 }
--- a/core/src/main/java/com/wecloud/im/service/impl/ImClientServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImClientServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.wecloud.im.entity.ImApplication;
 import com.wecloud.im.entity.ImClient;
+import com.wecloud.im.entity.ImClientDevice;
 import com.wecloud.im.enums.FriendStateEnum;
 import com.wecloud.im.enums.RelationEnum;
 import com.wecloud.im.friend.entity.ImFriend;
@@ -18,13 +19,15 @@ import com.wecloud.im.param.GetClientInfoParam;
 import com.wecloud.im.param.ImClientPageParam;
 import com.wecloud.im.param.ImClientQueryVo;
 import com.wecloud.im.param.ImClientSimpleDto;
-import com.wecloud.im.param.add.ImClientDeviceInfoAdd;
+import com.wecloud.im.param.LogoutParam;
+import com.wecloud.im.param.add.ClientDeviceUpdateParam;
 import com.wecloud.im.param.add.ImClientHeadPortraitAdd;
 import com.wecloud.im.param.add.ImClientHeadPortraitAndNicknameUpdate;
 import com.wecloud.im.param.add.ImClientNicknameAdd;
 import com.wecloud.im.param.add.ImClientNicknameUpdate;
 import com.wecloud.im.service.ImApplicationService;
 import com.wecloud.im.service.ImClientBlacklistService;
+import com.wecloud.im.service.ImClientDeviceService;
 import com.wecloud.im.service.ImClientService;
 import com.wecloud.im.vo.ClientInfoVo;
 import com.wecloud.im.vo.GetInfoListVo;
@@ -71,6 +74,9 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
    @Autowired
    private ImClientBlacklistService imClientBlacklistService;
+    @Autowired
+    private ImClientDeviceService imClientDeviceService;
    @Override
    public MyInfoVo getMyInfo() {
@@ -186,12 +192,6 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
    public boolean updateNickname(ImClientNicknameAdd imClientNicknameAdd) throws Exception {
        ImClient curentClient = getCurrentClient();
-        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
-        //  根据appKey查询appid
-//        ImApplication imApplication = imApplicationService.getOneByAppKey(curentJwtToken.getAppKey());
        curentClient.setNickname(imClientNicknameAdd.getNickname());
        imClientMapper.updateById(curentClient);
@@ -209,52 +209,35 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public boolean updateDeviceInfo(ImClientDeviceInfoAdd imClientDevice) {
+    public boolean updateDeviceInfo(ClientDeviceUpdateParam param) {
+        ImClient currentClient = getCurrentClient();
-        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
-        //  根据appKey查询appid
-        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());
-        // 清除旧client的redis缓存
+         ImClientDevice clientDevice = imClientDeviceService.getOne(new QueryWrapper<ImClientDevice>().lambda()
-        ImClient imClient = this.getOne(new QueryWrapper<ImClient>().lambda()
+                .eq(ImClientDevice::getFkAppid, currentClient.getFkAppid())
-                .eq(ImClient::getFkAppid, imApplication.getId())
+                .eq(ImClientDevice::getDeviceToken, param.getDeviceToken()));
-                .eq(ImClient::getDeviceToken, imClientDevice.getDeviceToken()));
+        if (clientDevice != null) {
-        if (imClient != null) {
-            deleteCacheImClient(imClient.getFkAppid(), imClient.getClientId());
            // client登陆的时候 判断数据库内是否已经存在这个设备token,如果存在就清空旧的
-            this.removeOldToken(imApplication.getId(), curentJwtToken.getToken());
+            JwtToken currentJwtToken = JwtUtil.getCurrentJwtToken();
+            imClientDeviceService.removeOldToken(currentClient.getId(), currentJwtToken.getToken());
        }
-        ImClient client = getCurrentClient();
-        ImClient clientNew = new ImClient();
-        BeanUtils.copyProperties(imClientDevice, clientNew);
-        clientNew.setId(client.getId());
-        // 清除新client的redis缓存
-        deleteCacheImClient(client.getFkAppid(), client.getClientId());
        // 修改
-        return this.updateImClient(clientNew);
+        return imClientDeviceService.update(new UpdateWrapper<ImClientDevice>().lambda()
+                .eq(ImClientDevice::getFkAppid, currentClient.getFkAppid())
+                .eq(ImClientDevice::getFkClientId, currentClient.getId())
+                .eq(ImClientDevice::getDeviceType, param.getDeviceType())
+                .set(ImClientDevice::getDeviceToken, param.getDeviceToken())
+        );
    }
    @Override
-    public boolean logout() {
+    public boolean logout(LogoutParam param) {
+        ImClient currentClient = getCurrentClient();
-        ImClient curentClient = getCurrentClient();
        // 清除设备token
-        boolean update = this.update(new UpdateWrapper<ImClient>().lambda()
+        return imClientDeviceService.update(new UpdateWrapper<ImClientDevice>().lambda()
-                .eq(ImClient::getFkAppid, curentClient.getFkAppid())
+                .eq(ImClientDevice::getFkAppid, currentClient.getFkAppid())
-                .eq(ImClient::getId, curentClient.getId())
+                .eq(ImClientDevice::getFkClientId, currentClient.getId())
-                .set(ImClient::getDeviceToken, null)
+                .eq(ImClientDevice::getDeviceType, param.getDeviceType())
-        );
+                .set(ImClientDevice::getDeviceToken, null));
-        if (update) {
-            // 清除新client的redis缓存
-            deleteCacheImClient(curentClient.getFkAppid(), curentClient.getClientId());
-        }
-        return update;
    }
    @Transactional(rollbackFor = Exception.class)
@@ -286,7 +269,7 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
    public ImClient getCurrentClient() {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询appid
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());
        return getCacheImClient(imApplication.getId(), curentJwtToken.getClientId());

--- a/core/src/main/java/com/wecloud/im/service/impl/ImConversationMembersServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImConversationMembersServiceImpl.java
@@ -84,7 +84,7 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa
    public ApiResult<Boolean> saveOrUpdateClientRemarkName(ImConvMemeClientRemarkNameParam imConvMemeClientRemarkNameParam) {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询application
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());
@@ -138,7 +138,7 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa
    public ApiResult<Boolean> saveOrUpdateAttr(ImConversationMemAttrUpdate imConversationMemAttrUpdate) {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询application
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());

--- a/core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
@@ -131,7 +131,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
        }
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询application
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());
@@ -261,7 +261,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    public ApiResult<Boolean> addClientToConversation(ImClientToConversation imClientToConversation) {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询application
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());
@@ -396,7 +396,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    public ApiResult<Boolean> delClientToConversation(ImClientToConversation imClientToConversation) throws Exception {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询application
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());
@@ -626,7 +626,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    @Transactional(rollbackFor = Exception.class)
    public Boolean transferOwner(TransferOwnerParam param) {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询application
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());
        ImClient imClientSender = imClientService.getCurrentClient();
@@ -759,7 +759,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    public ApiResult<Boolean> saveOrUpdateName(ImConversationNameUpdate imConversationNameUpdate) throws Exception {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询application
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());
@@ -842,7 +842,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    public ApiResult<Boolean> saveOrUpdateAttr(ImConversationAttrUpdate imConversationAttrUpdate) throws Exception {
        // shiro线程中获取当前token
-        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        JwtToken curentJwtToken = JwtUtil.getCurrentJwtToken();
        //  根据appKey查询application
        ImApplication imApplication = imApplicationService.getCacheAppByAppKey(curentJwtToken.getAppKey());

--- a/core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
@@ -16,6 +16,7 @@ import com.wecloud.im.entity.ImMessage;
 import com.wecloud.im.entity.ImMessageOnlineSend;
 import com.wecloud.im.enums.ChatTypeEnum;
 import com.wecloud.im.mapper.ImMessageMapper;
+import com.wecloud.im.mq.MqSender;
 import com.wecloud.im.param.ChatContentVo;
 import com.wecloud.im.param.GetReadersParam;
 import com.wecloud.im.param.ImClientSimpleDto;
@@ -40,8 +41,9 @@ import com.wecloud.im.ws.model.WsResponse;
 import com.wecloud.im.ws.model.request.PushVO;
 import com.wecloud.im.ws.model.request.ReceiveDataVO;
 import com.wecloud.im.ws.model.request.ReceiveVO;
-import com.wecloud.im.ws.sender.AsyncPush;
 import com.wecloud.im.ws.sender.ChannelSender;
+import com.wecloud.pushserver.client.model.constant.MqConstant;
+import com.wecloud.pushserver.client.model.dto.PushDTO;
 import com.wecloud.utils.JsonUtils;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
@@ -81,9 +83,6 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
    private ImConversationService imConversationService;
    @Autowired
-    private AsyncPush asyncPush;
-    @Autowired
    private ImApplicationService imApplicationService;
@@ -96,6 +95,9 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
    @Autowired
    private ThousandChatService thousandChatService;
+    @Autowired
+    private MqSender mqSender;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public ApiResult<Boolean> restApiImMessageSend(ImMsgSendToOnlineClient imMsgSendToOnlineClient, ImApplication imApplication) {
@@ -296,11 +298,11 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
                responseModel.setReqId(null);
                channelSender.sendMsg(responseModel, imClientReceiver.getId());
-                // 获取自定义推送字段
-                PushVO pushVO = imMsgRecall.getPush();
                // 异步推送系统通知消息
-                asyncPush.push(pushVO, imClientReceiver, imApplication);
+                PushDTO pushDTO = mqSender.buildPushDto(imMsgRecall.getPush(), imClientReceiver, imApplication);
+                if (pushDTO != null) {
+                    mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+                }
            }
            return Boolean.TRUE;

--- a/core/src/main/java/com/wecloud/im/thousandchat/action/ThousandChatAction.java
+++ b/core/src/main/java/com/wecloud/im/thousandchat/action/ThousandChatAction.java
@@ -9,6 +9,7 @@ import com.wecloud.im.entity.ImClient;
 import com.wecloud.im.entity.ImConversationMembers;
 import com.wecloud.im.entity.ImMessage;
 import com.wecloud.im.entity.ImMessageOnlineSend;
+import com.wecloud.im.mq.MqSender;
 import com.wecloud.im.param.ChatContentVo;
 import com.wecloud.im.param.ImClientSimpleDto;
 import com.wecloud.im.param.ImConversationQueryVo;
@@ -21,8 +22,9 @@ import com.wecloud.im.service.ImMessageService;
 import com.wecloud.im.thousandchat.cache.ThousandChatCacheManager;
 import com.wecloud.im.ws.enums.WsResponseCmdEnum;
 import com.wecloud.im.ws.model.WsResponse;
-import com.wecloud.im.ws.sender.AsyncPush;
 import com.wecloud.im.ws.sender.ChannelSender;
+import com.wecloud.pushserver.client.model.constant.MqConstant;
+import com.wecloud.pushserver.client.model.dto.PushDTO;
 import com.wecloud.utils.JsonUtils;
 import com.wecloud.utils.SnowflakeUtil;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
@@ -54,8 +56,6 @@ public class ThousandChatAction {
    @Autowired
    private ImConversationService imConversationService;
    @Autowired
-    private AsyncPush systemPush;
-    @Autowired
    private ImConversationMembersService imConversationMembersService;
    @Autowired
    private ImMessageService imMessageService;
@@ -64,6 +64,9 @@ public class ThousandChatAction {
    @Autowired
    private ThousandChatCacheManager thousandChatCacheManager;
+    @Autowired
+    private MqSender mqSender;
    @ActionMapping("/thousand/send")
    public void sendMsg(ActionRequest request, ChatContentVo data, String reqId) {
        if (log.isDebugEnabled()) {
@@ -117,7 +120,10 @@ public class ThousandChatAction {
                continue;
            }
            // 异步推送系统通知消息
-            systemPush.push(data.getPush(), imClientReceiver, imApplication);
+            PushDTO pushDTO = mqSender.buildPushDto(data.getPush(), imClientReceiver, imApplication);
+            if (pushDTO != null) {
+                mqSender.orderSend(MqConstant.Topic.IM_ORDER_MSG_TOPIC, MqConstant.Tag.IM_ORDER_MSG_TAG, pushDTO);
+            }
        }
        // 响应发送方消息id等信息

--- a/core/src/main/java/com/wecloud/im/ws/sender/AsyncPush.java
+++ b/core/src/main/java/com/wecloud/im/ws/sender/AsyncPush.java
-package com.wecloud.im.ws.sender;
-import cn.hutool.core.codec.Base64;
-import com.turo.pushy.apns.DeliveryPriority;
-import com.turo.pushy.apns.PushType;
-import com.wecloud.im.entity.ImApplication;
-import com.wecloud.im.entity.ImClient;
-import com.wecloud.im.entity.ImIosApns;
-import com.wecloud.im.push.PushUtils;
-import com.wecloud.im.service.ImInboxService;
-import com.wecloud.im.service.ImIosApnsService;
-import com.wecloud.im.ws.model.request.PushVO;
-import lombok.extern.slf4j.Slf4j;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import static com.wecloud.im.ws.ImConstant.PUSH_BODY;
-import static com.wecloud.im.ws.ImConstant.PUSH_TITLE;
-import static com.wecloud.im.ws.ImConstant.SUB_TITLE;
-import static com.wecloud.im.ws.ImConstant.TITLE;
-/**
- * 异步系统推送
- */
-@Component
-@Slf4j
-public class AsyncPush {
-    /**
-     * 谷歌推送地址
-     */
-    private static final String API_URL_FCM = "https://fcm.googleapis.com/fcm/send";
-    //    /**
-//     * 您收到一条新消息
-//     */
-//    private static final String PUSH_TITLE = "You have received a new message";
-//    /**
-//     * 点击查看
-//     */
-//    private static final String PUSH_BODY = "Click to view";
-//    private static final String TITLE = "title";
-//    private static final String SUB_TITLE = "subTitle";
-    @Autowired
-    private ImIosApnsService imIosApnsService;
-    @Autowired
-    private ImInboxService imInboxService;
-    /**
-     * 异步系统推送
-     *
-     * @param imClientReceiver
-     */
-    @Async
-    public void push(PushVO pushVO, ImClient imClientReceiver, ImApplication imApplication) {
-        log.info("push: {}", imClientReceiver.getClientId());
-        if (pushVO == null) {
-            pushVO = new PushVO();
-            pushVO.setTitle(PUSH_TITLE);
-            pushVO.setSubTitle(PUSH_BODY);
-        }
-        // 校验参数
-        if (imClientReceiver.getValid() == null || imClientReceiver.getDeviceToken() == null || imClientReceiver.getDeviceType() == null) {
-            log.info("{} 应用未配置push,或client无DeviceToken {}", imApplication.getId(), imClientReceiver.getClientId());
-            return;
-        }
-        // 设备不想收到推送提醒, 1想, 0不想
-        if (imClientReceiver.getValid() == 0) {
-            return;
-        }
-        //  设备类型1:ios; 2:android
-        if (imClientReceiver.getDeviceType() == 1) {
-            ios(pushVO, imClientReceiver, imApplication);
-        } else {
-            android(pushVO, imClientReceiver, imApplication);
-        }
-    }
-    /**
-     * 异步系统推送
-     *
-     * @param imClientReceiver
-     */
-    @Async
-    public void push(HashMap<String, String> pushMap, ImClient imClientReceiver, ImApplication imApplication) {
-        log.info("push:" + imClientReceiver.getClientId());
-        PushVO pushVO = new PushVO();
-        if (pushMap == null || pushMap.isEmpty()) {
-            pushVO.setTitle(PUSH_TITLE);
-            pushVO.setSubTitle(PUSH_BODY);
-        } else {
-            pushVO.setTitle(pushMap.get(TITLE));
-            pushVO.setSubTitle(pushMap.get(SUB_TITLE));
-        }
-        this.push(pushVO, imClientReceiver, imApplication);
-    }
-    private void android(PushVO pushVO, ImClient imClientReceiver, ImApplication imApplication) {
-        if (imApplication.getAndroidPushChannel() == null) {
-            return;
-        }
-        // 安卓推送通道,友盟:1;firebase:2; 信鸽3
-        if (imApplication.getAndroidPushChannel() == 1) {
-            log.info("友盟");
-            // 友盟推送
-            PushUtils pushUtils = new PushUtils(imApplication.getUmengKey(), imApplication.getUmengSecret());
-            // 安卓 单推
-            String deviceToken = imClientReceiver.getDeviceToken();
-            try {
-                pushUtils.sendIOSUnicast(deviceToken, pushVO.getTitle(), pushVO.getSubTitle(), PUSH_BODY);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } else if (imApplication.getAndroidPushChannel() == 2) {
-            //firebase:2
-            log.info("android_firebase");
-            firebase(pushVO, imClientReceiver, imApplication);
-        } else if (imApplication.getAndroidPushChannel() == 3) {
-            //  信鸽3
-            log.info("信鸽3");
-        } else {
-            log.info("没有找到推送类型");
-        }
-    }
-    private void ios(PushVO pushVO, ImClient imClientReceiver, ImApplication imApplication) {
-        if (imApplication.getIosPushChannel() == null) {
-            return;
-        }
-        // ios推送通道,友盟:1;firebase:2; apns原生:3
-        if (imApplication.getIosPushChannel() == 1) {
-            log.info("友盟");
-            // 友盟推送
-            PushUtils pushUtils = new PushUtils(imApplication.getUmengKey(), imApplication.getUmengSecret());
-            // 安卓单推
-            String deviceToken = imClientReceiver.getDeviceToken();
-            String unicastText = "Android unicast text";
-            String unicastTicker = pushVO.getSubTitle();
-            try {
-                pushUtils.sendAndroidUnicast(deviceToken, unicastText, unicastTicker, pushVO.getTitle());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } else if (imApplication.getIosPushChannel() == 2) {
-            //firebase:2
-            log.info("firebase");
-            firebase(pushVO, imClientReceiver, imApplication);
-        } else if (imApplication.getIosPushChannel() == 3) {
-            //  apns原生:3
-            log.info("apns原生");
-            apnsPush(pushVO, imClientReceiver, imApplication);
-        } else {
-            log.info("没有找到推送类型");
-        }
-    }
-    public void firebase(PushVO pushVO, ImClient imClientReceiver, ImApplication imApplication) {
-        String jsonStr = null;
-        try {
-            URL url = new URL(API_URL_FCM);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setUseCaches(false);
-            conn.setDoInput(true);
-            conn.setDoOutput(true);
-            conn.setConnectTimeout(10000);
-            conn.setRequestMethod("POST");
-            //不设置默认发送文本格式。设置就是json
-            conn.setRequestProperty("Content-Type", "application/json");
-            conn.setRequestProperty("Authorization", "key=" + imApplication.getFirebaseSecret());
-            JSONObject json = new JSONObject();
-            //推送到哪台客户端机器
-            json.put("to", imClientReceiver.getDeviceToken());
-            JSONObject info = new JSONObject();
-            info.put("title", pushVO.getTitle());
-            info.put("body", pushVO.getSubTitle());
-            //数据消息data  通知消息 notification
-            json.put("notification", info);
-            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-            jsonStr = json.toString();
-            wr.write(jsonStr);
-            wr.flush();
-            InputStream inputStream = conn.getInputStream();
-            InputStreamReader in = new InputStreamReader(inputStream);
-            BufferedReader reader = new BufferedReader(in);
-            String line = reader.readLine();
-            log.info(line);
-            wr.close();
-            reader.close();
-        } catch (Exception e) {
-            log.error("FCM push failure: " + jsonStr, e);
-        }
-    }
-    private void apnsPush(PushVO pushVO, ImClient imClientReceiver, ImApplication imApplication) {
-        // 查询apns证书
-        ImIosApns apns = imIosApnsService.getImIosApnsByAppId(imApplication.getId());
-        Map<String, Object> customProperty = new HashMap<String, Object>(1);
-        String deviceToken = imClientReceiver.getDeviceToken();
-        String alertTitle = pushVO.getTitle();
-        String alertBody = pushVO.getSubTitle();
-        // 统计未读消息数量
-        int badge = imInboxService.countMyNotReadCount(imClientReceiver.getId());
-        String topicBundleId = apns.getBundleId();
-        String certificatePassword = apns.getPwd();
-        boolean contentAvailable = false;
-        String sound = "default";
-        // 解码
-        byte[] decode = Base64.decode(apns.getApnsFileValue());
-        InputStream inputStream2 = new ByteArrayInputStream(decode);
-        //  productFlag      环境,测试=Boolean.FALSE,正式=Boolean.TRUE
-        Boolean productFlag = Boolean.FALSE;
-        // 正式1,测试0
-        if (apns.getEnv() == 1) {
-            productFlag = Boolean.TRUE;
-        }
-        IosPush.push(certificatePassword, inputStream2, productFlag, deviceToken, alertTitle, alertBody,
-                contentAvailable, customProperty, badge
-                , DeliveryPriority.IMMEDIATE, PushType.ALERT, topicBundleId,
-                sound);
-    }
-}
--- a/core/src/main/resources/mapper/ImClientDeviceMapper.xml
+++ b/core/src/main/resources/mapper/ImClientDeviceMapper.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wecloud.im.mapper.ImClientDeviceMapper">
+    <update id="removeOldToken">
+        UPDATE im_client_device
+        SET device_token = NULL
+        WHERE device_token = #{deviceToken}
+          AND fk_appid = #{appId}
+    </update>
 </mapper>
--- a/docs/db/feature-cluster增量.sql
+++ b/docs/db/feature-cluster增量.sql
 -- 在feature-cluster 2021年12月22日之后，需要执行的的sql增量脚本
@@ -103,15 +103,17 @@ CREATE TABLE `im_user`
 CREATE TABLE `im_client_device`
 (
    `id`                   bigint  NOT NULL COMMENT '主键id',
+    `fk_appid`              bigint DEFAULT NULL COMMENT '应用appid',
    `fk_client_id`         bigint NOT NULL COMMENT '客户端id',
    `valid`                 int DEFAULT NULL COMMENT '设备不想收到推送提醒',
    `device_type`           int DEFAULT NULL COMMENT '设备类型1:ios; 2:android',
    `device_token`          varchar(300) DEFAULT NULL COMMENT '设备推送token',
-    `unique_id`          varchar(50) DEFAULT NULL COMMENT '设备唯一id(由设备端生成)',
+    `unique_device_id`          varchar(50) DEFAULT NULL COMMENT '设备唯一id(由设备端生成)',
-    `platform`              int DEFAULT NULL COMMENT '平台编码：1 web, 2 安卓, 3 ios, 4 pc-win, 5 pc-macOs',
    `create_time`          timestamp NULL DEFAULT NULL COMMENT '创建时间',
    `update_time`          timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
-    PRIMARY KEY (`id`) USING BTREE
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_fk_client_id` (`fk_client_id`) USING BTREE,
+    KEY `idx_device_token_appid` (`device_token`,`fk_appid`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户端设备表';

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtUtil.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtUtil.java
@@ -59,7 +59,7 @@ public class JwtUtil {
     *
     * @return
     */
-    public static JwtToken getCurentJwtToken() {
+    public static JwtToken getCurrentJwtToken() {
        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
        return jwtToken;
    }