添加客户端设备表；

调整包名

core/src/main/java/com/wecloud/im/entity/ImClientDevice.java

+package com.wecloud.im.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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;
+import java.util.Date;
+
+/**
+ * @Author wenzhida
+ * @Date 2022/3/2 14:52
+ * @Description 客户端设备
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "客户端设备")
+public class ImClientDevice extends BaseEntity {
+
+    private static final long serialVersionUID = 6988763580951760226L;
+
+    @NotNull(message = "主键id不能为空")
+    @ApiModelProperty("主键id")
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    @ApiModelProperty("client主键id")
+    private Long fkClientId;
+
+    @ApiModelProperty("设备不想收到推送提醒, 1想, 0不想")
+    private Integer valid;
+
+    @ApiModelProperty("设备类型1:ios; 2:android")
+    private Integer deviceType;
+
+    @ApiModelProperty("设备推送token")
+    private String deviceToken;
+
+    @ApiModelProperty("唯一id")
+    private String uniqueId;
+
+    /**
+     * 客户端平台
+     * @see com.wecloud.im.enums.PlatformEnum
+     */
+    @NotNull(message = "平台不可为空")
+    @ApiModelProperty("客户端平台: 1 web, 2 安卓, 3 ios, 4 pc-win, 5 pc-macOs")
+    private Integer platform;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+}

core/src/main/java/com/wecloud/im/user/controller/FriendController.java → core/src/main/java/com/wecloud/im/externalaccess/controller/FriendController.java

-package com.wecloud.im.user.controller;
+package com.wecloud.im.externalaccess.controller;
 
 import com.wecloud.im.friend.param.ImFriendBaseParam;
 import com.wecloud.im.service.ImClientService;
-import com.wecloud.im.user.param.FriendDto;
-import com.wecloud.im.user.service.FriendService;
+import com.wecloud.im.externalaccess.param.FriendDto;
+import com.wecloud.im.externalaccess.service.FriendService;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;

core/src/main/java/com/wecloud/im/user/controller/UserController.java → core/src/main/java/com/wecloud/im/externalaccess/controller/UserController.java

-package com.wecloud.im.user.controller;
+package com.wecloud.im.externalaccess.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.wecloud.im.user.param.ChangePhoneParam;
-import com.wecloud.im.user.param.CheckPhoneParam;
-import com.wecloud.im.user.param.FindUserParam;
-import com.wecloud.im.user.param.GetUserParam;
-import com.wecloud.im.user.param.LoginSuccessDto;
-import com.wecloud.im.user.param.ModifyHeadPortraitParam;
-import com.wecloud.im.user.param.ModifyLandouParam;
-import com.wecloud.im.user.param.ModifyNicknameParam;
-import com.wecloud.im.user.param.ModifySexParam;
-import com.wecloud.im.user.param.RegisterSuccessDto;
-import com.wecloud.im.user.param.ResetPasswordParam;
-import com.wecloud.im.user.param.UserBaseDto;
-import com.wecloud.im.user.param.UserLoginParam;
-import com.wecloud.im.user.param.UserRegisterParam;
-import com.wecloud.im.user.service.UserService;
+import com.wecloud.im.externalaccess.param.ChangePhoneParam;
+import com.wecloud.im.externalaccess.param.CheckPhoneParam;
+import com.wecloud.im.externalaccess.param.FindUserParam;
+import com.wecloud.im.externalaccess.param.GetUserParam;
+import com.wecloud.im.externalaccess.param.LoginSuccessDto;
+import com.wecloud.im.externalaccess.param.ModifyHeadPortraitParam;
+import com.wecloud.im.externalaccess.param.ModifyLandouParam;
+import com.wecloud.im.externalaccess.param.ModifyNicknameParam;
+import com.wecloud.im.externalaccess.param.ModifySexParam;
+import com.wecloud.im.externalaccess.param.RegisterSuccessDto;
+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.externalaccess.service.UserService;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;

core/src/main/java/com/wecloud/im/user/controller/VerifyCodeController.java → core/src/main/java/com/wecloud/im/externalaccess/controller/VerifyCodeController.java

-package com.wecloud.im.user.controller;
+package com.wecloud.im.externalaccess.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.wecloud.im.enums.VerifySceneEnum;
 import com.wecloud.im.constant.RedisKeyPrefixConstant;
-import com.wecloud.im.user.entity.User;
-import com.wecloud.im.user.param.SendVerifyCodeParam;
-import com.wecloud.im.user.service.UserService;
+import com.wecloud.im.externalaccess.entity.User;
+import com.wecloud.im.externalaccess.param.SendVerifyCodeParam;
+import com.wecloud.im.externalaccess.service.UserService;
 import com.wecloud.im.ws.utils.RedisUtils;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

core/src/main/java/com/wecloud/im/user/entity/User.java → core/src/main/java/com/wecloud/im/externalaccess/entity/User.java

-package com.wecloud.im.user.entity;
+package com.wecloud.im.externalaccess.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

core/src/main/java/com/wecloud/im/user/mapper/UserMapper.java → core/src/main/java/com/wecloud/im/externalaccess/mapper/UserMapper.java

-package com.wecloud.im.user.mapper;
+package com.wecloud.im.externalaccess.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.wecloud.im.user.entity.User;
+import com.wecloud.im.externalaccess.entity.User;
 import org.springframework.stereotype.Repository;
 
 /**

core/src/main/java/com/wecloud/im/user/param/ChangePhoneParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/ChangePhoneParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/CheckPhoneParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/CheckPhoneParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/FindUserParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/FindUserParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/FriendDto.java → core/src/main/java/com/wecloud/im/externalaccess/param/FriendDto.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import com.wecloud.im.friend.param.ImFriendBaseDto;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * @Author wenzhida
  * @Date 2022/2/22 23:20

core/src/main/java/com/wecloud/im/user/param/GetUserParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/GetUserParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/LoginSuccessDto.java → core/src/main/java/com/wecloud/im/externalaccess/param/LoginSuccessDto.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/ModifyHeadPortraitParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/ModifyHeadPortraitParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/ModifyLandouParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/ModifyLandouParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/ModifyNicknameParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/ModifyNicknameParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/ModifySexParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/ModifySexParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/RegisterSuccessDto.java → core/src/main/java/com/wecloud/im/externalaccess/param/RegisterSuccessDto.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

core/src/main/java/com/wecloud/im/user/param/ResetPasswordParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/ResetPasswordParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/SendVerifyCodeParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/SendVerifyCodeParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/UserBaseDto.java → core/src/main/java/com/wecloud/im/externalaccess/param/UserBaseDto.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/UserLoginParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/UserLoginParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/param/UserRegisterParam.java → core/src/main/java/com/wecloud/im/externalaccess/param/UserRegisterParam.java

-package com.wecloud.im.user.param;
+package com.wecloud.im.externalaccess.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

core/src/main/java/com/wecloud/im/user/service/FriendService.java → core/src/main/java/com/wecloud/im/externalaccess/service/FriendService.java

-package com.wecloud.im.user.service;
+package com.wecloud.im.externalaccess.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
@@ -10,9 +10,9 @@ import com.wecloud.im.friend.param.ImFriendBaseParam;
 import com.wecloud.im.friend.param.ImFriendPageParam;
 import com.wecloud.im.friend.service.ImFriendService;
 import com.wecloud.im.service.ImClientService;
-import com.wecloud.im.user.entity.User;
-import com.wecloud.im.user.mapper.UserMapper;
-import com.wecloud.im.user.param.FriendDto;
+import com.wecloud.im.externalaccess.entity.User;
+import com.wecloud.im.externalaccess.mapper.UserMapper;
+import com.wecloud.im.externalaccess.param.FriendDto;
 import io.geekidea.springbootplus.framework.common.exception.BusinessException;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;

core/src/main/java/com/wecloud/im/user/service/UserService.java → core/src/main/java/com/wecloud/im/externalaccess/service/UserService.java

-package com.wecloud.im.user.service;
+package com.wecloud.im.externalaccess.service;
 
 import cn.hutool.core.lang.Snowflake;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,21 +16,21 @@ 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.user.entity.User;
-import com.wecloud.im.user.mapper.UserMapper;
-import com.wecloud.im.user.param.ChangePhoneParam;
-import com.wecloud.im.user.param.CheckPhoneParam;
-import com.wecloud.im.user.param.FindUserParam;
-import com.wecloud.im.user.param.GetUserParam;
-import com.wecloud.im.user.param.LoginSuccessDto;
-import com.wecloud.im.user.param.ModifyHeadPortraitParam;
-import com.wecloud.im.user.param.ModifyLandouParam;
-import com.wecloud.im.user.param.ModifyNicknameParam;
-import com.wecloud.im.user.param.ModifySexParam;
-import com.wecloud.im.user.param.ResetPasswordParam;
-import com.wecloud.im.user.param.UserBaseDto;
-import com.wecloud.im.user.param.UserLoginParam;
-import com.wecloud.im.user.param.UserRegisterParam;
+import com.wecloud.im.externalaccess.entity.User;
+import com.wecloud.im.externalaccess.mapper.UserMapper;
+import com.wecloud.im.externalaccess.param.ChangePhoneParam;
+import com.wecloud.im.externalaccess.param.CheckPhoneParam;
+import com.wecloud.im.externalaccess.param.FindUserParam;
+import com.wecloud.im.externalaccess.param.GetUserParam;
+import com.wecloud.im.externalaccess.param.LoginSuccessDto;
+import com.wecloud.im.externalaccess.param.ModifyHeadPortraitParam;
+import com.wecloud.im.externalaccess.param.ModifyLandouParam;
+import com.wecloud.im.externalaccess.param.ModifyNicknameParam;
+import com.wecloud.im.externalaccess.param.ModifySexParam;
+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.ws.utils.RedisUtils;
 import com.wecloud.utils.AesUtil;
 import com.wecloud.utils.RandomUtil;

core/src/main/java/com/wecloud/im/mapper/ImClientDeviceMapper.java

+package com.wecloud.im.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wecloud.im.entity.ImClientDevice;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author wenzhida
+ * @Date 2022/3/2 14:57
+ * @Description 客户端设备mapper
+ */
+@Repository
+public interface ImClientDeviceMapper extends BaseMapper<ImClientDevice> {
+
+}

core/src/main/java/com/wecloud/im/service/ImClientDeviceService.java

+package com.wecloud.im.service;
+
+import com.wecloud.im.entity.ImClientDevice;
+import io.geekidea.springbootplus.framework.common.service.BaseService;
+
+/**
+ * @Author wenzhida
+ * @Date 2022/3/2 14:58
+ * @Description 客户端设备服务接口
+ */
+public interface ImClientDeviceService extends BaseService<ImClientDevice> {
+
+}

core/src/main/java/com/wecloud/im/service/impl/ImClientDeviceServiceImpl.java

+package com.wecloud.im.service.impl;
+
+import com.wecloud.im.entity.ImClientDevice;
+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.stereotype.Service;
+
+/**
+ * @Author wenzhida
+ * @Date 2022/3/2 15:00
+ * @Description 客户端设备服务接口实现
+ */
+@Slf4j
+@Service
+public class ImClientDeviceServiceImpl extends BaseServiceImpl<ImClientDeviceMapper, ImClientDevice> implements ImClientDeviceService {
+
+
+}

core/src/main/resources/mapper/ImClientDeviceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
+
+</mapper>

docs/db/feature-cluster增量.sql

--- 在feature-cluster 2021年12月22日之后，需要执行的的sql增量脚本
+-- 在feature-cluster 2021年12月22日之后，需要执行的的sql增量脚本
@@ -98,6 +98,25 @@ CREATE TABLE `im_user`
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户表';
 
 
+-- 20220302 by wenzhida
+
+CREATE TABLE `im_client_device`
+(
+    `id`                   bigint  NOT NULL COMMENT '主键id',
+    `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(由设备端生成)',
+    `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
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户端设备表';
+
+
+
+