登录注册逻辑调整

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

@@ -2,7 +2,6 @@ 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;
@@ -40,22 +39,14 @@ public class ImClientDevice extends BaseEntity {
     @ApiModelProperty("设备不想收到推送提醒, 1想, 0不想")
     private Integer valid;
 
-    @ApiModelProperty("设备类型1:ios; 2:android")
+    @ApiModelProperty("设备类型 1:ios; 2:android; 3:web; 4:win; 5:mac")
     private Integer deviceType;
 
     @ApiModelProperty("设备推送token")
     private String deviceToken;
 
     @ApiModelProperty("唯一id")
-    private String uniqueId;
-
-    /**
-     * 客户端平台
-     * @see DeviceTypeEnum
-     */
-    @NotNull(message = "平台不可为空")
-    @ApiModelProperty("客户端平台: 1 web, 2 安卓, 3 ios, 4 pc-win, 5 pc-macOs")
-    private Integer platform;
+    private String uniqueDeviceId;
 
     @ApiModelProperty("创建时间")
     private Date createTime;

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

@@ -36,11 +36,11 @@ public class UserLoginParam implements Serializable {
     private String appKey;
 
     /**
-     * 客户端平台
+     * 设备类型
      * @see DeviceTypeEnum
      */
-    @NotNull(message = "平台不可为空")
-    @ApiModelProperty("客户端平台: 1 web, 2 安卓, 3 ios, 4 pc-win, 5 pc-macOs")
-    private Integer platform;
+    @NotNull(message = "设备类型不可为空")
+    @ApiModelProperty("设备类型 1:ios; 2:android; 3:web; 4:win; 5:mac")
+    private Integer deviceType;
 
 }

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

@@ -6,6 +6,7 @@ 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.entity.ImClientDevice;
 import com.wecloud.im.enums.FriendStateEnum;
 import com.wecloud.im.enums.RelationEnum;
 import com.wecloud.im.enums.VerifySceneEnum;
@@ -30,6 +31,7 @@ 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.ImClientDeviceService;
 import com.wecloud.im.service.ImClientService;
 import com.wecloud.im.ws.utils.RedisUtils;
 import com.wecloud.utils.AesUtil;
@@ -134,12 +136,20 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
                 .eq(ImClient::getClientId, user.getId()));
         if (imClient == null) {
             imClient = new ImClient();
-            imClient.setId(new Snowflake(1L, 1L).nextId());
+            imClient.setId(SnowflakeUtil.getId());
             imClient.setFkAppid(imApplication.getId());
             imClient.setClientId(user.getId().toString());
             imClient.setHeadPortrait(user.getHeadPortrait());
             imClient.setNickname(user.getNickname());
             imClientService.save(imClient);
+            ImClientDevice imClientDevice = new ImClientDevice();
+            imClientDevice.setId(SnowflakeUtil.getId());
+            imClientDevice.setFkAppid(imApplication.getId());
+            imClientDevice.setFkClientId(imClient.getId());
+            imClientDevice.setValid(1);
+            imClientDevice.setDeviceType(param.getDeviceType());
+            imClientDevice.setCreateTime(new Date());
+            imClientDevice.setUpdateTime(new Date());
         }
 
         LoginSuccessDto loginSuccessDto = new LoginSuccessDto();

core/src/main/java/com/wecloud/im/friend/service/FriendEventSender.java

@@ -38,8 +38,8 @@ public class FriendEventSender {
     private final static String FRIEND_APPLY_TITLE = "好友申请";
     private final static String FRIEND_APPLY_TITLE_SUB = "您有好友申请待验证";
     private final static String FRIEND_APPROVE_TITLE = "好友验证结果";
-    private final static String FRIEND_APPROVE_TITLE_AGREE = "您的好友拒绝了您的好友申请";
-    private final static String FRIEND_APPROVE_TITLE_REJECT = "您的好友同意了您的好友申请";
+    private final static String FRIEND_APPROVE_TITLE_AGREE = "您的好友同意了您的好友申请";
+    private final static String FRIEND_APPROVE_TITLE_REJECT = "您的好友拒绝了您的好友申请";
 
 
     public void sendFriendApplyEventMsg(ImClient claimerClient, ImClient receiveClient, String requestRemark) {

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

@@ -32,10 +32,6 @@ public interface ImClientMapper extends BaseMapper<ImClient> {
      */
     IPage<ImClientQueryVo> getImClientPageList(@Param("page") Page page, @Param("param") ImClientPageParam imClientPageParam);
 
-
-    int removeOldToken(@Param("appId") Long appId, @Param("deviceToken") String deviceToken);
-
-
     List<GetInfoListVo> getInfoList(@Param("appId") Long appId, @Param("conversationId") Long conversationId, @Param("clientIds") List<String> clientIds);
 
     List<ImClientSimpleDto> getSimpleClients(@Param("appId")Long appId, @Param("clientIds")List<String> clientIds);

core/src/main/java/com/wecloud/im/param/LogoutParam.java

@@ -10,15 +10,12 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotNull;
 
 /**
- * 添加或修改推送设备信息
- *
- * @author wei
- * @since 2021-04-27
+ * @Author wenzhida
+ * @Date 2022/3/2 18:11
+ * @Description 登出操作入参
  */
 @Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "添加或修改推送设备信息")
+@ApiModel(value = "登出操作入参")
 public class LogoutParam extends BaseEntity {
 
     private static final long serialVersionUID = -2718673661281424767L;

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

@@ -115,15 +115,6 @@ public interface ImClientService extends BaseService<ImClient> {
     boolean deleteImClient(Long id) throws Exception;
 
     /**
-     * 移除旧的设备token
-     *
-     * @param appId
-     * @param deviceToken
-     * @return
-     */
-    int removeOldToken(Long appId, String deviceToken);
-
-    /**
      * 获取分页对象
      *
      * @param imClientPageParam

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

@@ -251,13 +251,6 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
         return super.removeById(id);
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int removeOldToken(Long appId, String deviceToken) {
-
-        return imClientMapper.removeOldToken(appId, deviceToken);
-    }
-
     @Override
     public Paging<ImClientQueryVo> getImClientPageList(ImClientPageParam imClientPageParam) throws Exception {
         Page<ImClientQueryVo> page = new PageInfo<>(imClientPageParam, OrderItem.desc(getLambdaColumn(ImClient::getCreateTime)));

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

@@ -5,14 +5,8 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , create_time, update_time, fk_appid, attributes,client_id,device_type,valid,device_token,head_portrait,nickname
+        , create_time, update_time, fk_appid, attributes,client_id,head_portrait,nickname
     </sql>
-    <update id="removeOldToken">
-        UPDATE im_client
-        SET device_token = NULL
-        WHERE device_token = #{deviceToken}
-          AND fk_appid = #{appId}
-    </update>
 
     <select id="getImClientPageList" parameterType="com.wecloud.im.param.ImClientPageParam"
             resultType="com.wecloud.im.param.ImClientQueryVo">
@@ -20,6 +14,7 @@
         <include refid="Base_Column_List"/>
         from im_client
     </select>
+
     <select id="getInfoList" resultType="com.wecloud.im.vo.GetInfoListVo">
 
         SELECT