bug fix

a1bb0024 · Future · eb5b5d60 · a1bb0024 · a1bb0024 · a1bb0024
Commit a1bb0024 authored Mar 02, 2022 by Future
10 changed files
--- a/core/src/main/java/com/wecloud/im/constant/NumberConstant.java
+++ b/core/src/main/java/com/wecloud/im/constant/NumberConstant.java
+package com.wecloud.im.constant;
+/**
+ * @Author wenzhida
+ * @Date 2022/3/1 18:17
+ * @Description 数字常量
+ */
+public class NumberConstant {
+    /**
+     * 数字常量
+     */
+    public static final int NUM_30 = 30;
+    public static final int NUM_32 = 32;
+}
--- a/core/src/main/java/com/wecloud/im/user/constant/RedisKeyPrefixConstant.java
+++ b/core/src/main/java/com/wecloud/im/user/constant/RedisKeyPrefixConstant.java
-package com.wecloud.im.user.constant;
+package com.wecloud.im.constant;
 /**
 * @Author wenzhida

--- a/core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
@@ -230,6 +230,26 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
            imConversationMembers2.setFkClientId(client2.getId());
            imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode());
            imConversationMembersService.save(imConversationMembers2);
+            // 给被拉入群的成员下发事件消息
+            ImMessage imMessage = new ImMessage();
+            Map<String, Object> content = new HashMap<>();
+            content.put("operator", createClient.getClientId()); //操作的client ID
+            content.put("passivityOperator", client2.getClientId()); //被操作的client ID
+            imMessage.setContent(JsonUtils.encodeJson(content));
+            //  保存消息至消息表
+            imMessage.setId(SnowflakeUtil.getId());
+            imMessage.setMsgType(MsgTypeEnum.CLIENT_JOIN_NEW_CONVERSATION.getUriCode());
+            imMessage.setCreateTime(new Date());
+            imMessage.setFkAppid(imApplication.getId());
+            imMessage.setSender(createClient.getId());
+            imMessage.setWithdraw(false);
+            imMessage.setEvent(true);
+            imMessage.setSystemFlag(false);
+            imMessage.setSendStatus(2);
+            imMessage.setFkConversationId(imConversation.getId());
+            imMessageService.save(imMessage);
+            sendEventMsgToMember(imApplication, client2.getId(), imMessage, createClient, client2);
        }
        ImConversationCreateVo imConversationCreateVo = new ImConversationCreateVo();
@@ -777,10 +797,8 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
            // 内容
            HashMap<String, String> content = new HashMap<>();
-            content.put("type", "-1015");
            content.put("name", imConversationById.getName());
            // 遍历发送
            for (ImConversationMembers conversationMembers : membersList) {
@@ -797,6 +815,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
 //                imMessageOnlineSend.setMsgId(null);
 //                imMessageOnlineSend.setSender(imClientSender.getClientId());
+                imMessageOnlineSend.setType(MsgTypeEnum.CONVERSATION_NAME_CHANGE.getUriCode());
                imMessageOnlineSend.setContent(content);
                imMessageOnlineSend.setConversationId(conversationMembers.getFkConversationId());
 //                imMessageOnlineSend.setWithdraw(Boolean.FALSE);
@@ -862,7 +881,6 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
            // 内容
            HashMap<String, String> content = new HashMap<>();
-            content.put("type", "-1014");
            content.put("attributes", imConversationById.getAttributes());
@@ -882,6 +900,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
 //                imMessageOnlineSend.setMsgId(null);
 //                imMessageOnlineSend.setSender(imClientSender.getClientId());
+                imMessageOnlineSend.setType(MsgTypeEnum.CONVERSATION_EXPAND_FIELD_CHANGE.getUriCode());
                imMessageOnlineSend.setContent(content);
                imMessageOnlineSend.setConversationId(conversationMembers.getFkConversationId());
 //                imMessageOnlineSend.setWithdraw(Boolean.FALSE);

--- a/core/src/main/java/com/wecloud/im/user/controller/UserController.java
+++ b/core/src/main/java/com/wecloud/im/user/controller/UserController.java
@@ -44,9 +44,9 @@ public class UserController extends BaseController {
    private UserService userService;
    @PostMapping("/checkPhone")
-    @ApiOperation(value = "校验手机号码是否可使用 true-可使用 false-不可使用")
+    @ApiOperation(value = "校验手机号码是否未注册用户 true-可使用 false-不可使用")
    public ApiResult<Boolean> checkPhone(@RequestBody @Validated CheckPhoneParam param) {
-        log.info("校验手机号码是否可使用入参 {}", JSON.toJSONString(param));
+        log.info("校验手机号码是否未注册用户 {}", JSON.toJSONString(param));
        if (param == null) {
            return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null);
        }

--- a/core/src/main/java/com/wecloud/im/user/controller/VerifyCodeController.java
+++ b/core/src/main/java/com/wecloud/im/user/controller/VerifyCodeController.java
 package com.wecloud.im.user.controller;
 import com.wecloud.im.enums.VerifySceneEnum;
-import com.wecloud.im.user.constant.RedisKeyPrefixConstant;
+import com.wecloud.im.constant.RedisKeyPrefixConstant;
 import com.wecloud.im.user.param.SendVerifyCodeParam;
 import com.wecloud.im.ws.utils.RedisUtils;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;

--- a/core/src/main/java/com/wecloud/im/user/param/FriendDto.java
+++ b/core/src/main/java/com/wecloud/im/user/param/FriendDto.java
@@ -23,6 +23,12 @@ public class FriendDto extends ImFriendBaseDto {
    @ApiModelProperty("昵称")
    private String nickname;
+    @ApiModelProperty("好友拒绝原因")
+    private String rejectRemark;
+    @ApiModelProperty("好友请求说明")
+    private String requestRemark;
    /**
     * 头像路径url
     */

--- a/core/src/main/java/com/wecloud/im/user/service/UserService.java
+++ b/core/src/main/java/com/wecloud/im/user/service/UserService.java
@@ -2,6 +2,7 @@ package com.wecloud.im.user.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.entity.ImApplication;
 import com.wecloud.im.entity.ImClient;
 import com.wecloud.im.enums.FriendStateEnum;
@@ -14,7 +15,7 @@ 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.user.constant.RedisKeyPrefixConstant;
+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;
@@ -76,7 +77,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
        User userExist = this.getOne(new QueryWrapper<User>().lambda()
                .eq(User::getPhone, param.getPhone()));
        if (userExist != null) {
-            return Boolean.FALSE;
+            throw new BusinessException("该手机号已被注册");
        }
        return Boolean.TRUE;
    }
@@ -289,6 +290,9 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
        if (user == null) {
            throw new BusinessException("查无用户");
        }
+        if (param.getNickname().length() > NumberConstant.NUM_30) {
+            throw new BusinessException("昵称长度需小于30位");
+        }
        user.setNickname(param.getNickname());
        this.updateById(user);
        ImClientNicknameUpdate imClientNicknameUpdate = new ImClientNicknameUpdate();
@@ -309,6 +313,9 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
        if (userByLando != null) {
            throw new BusinessException("该蓝豆号已被使用，请更换");
        }
+        if (param.getLandouNo().length() > NumberConstant.NUM_32) {
+            throw new BusinessException("蓝豆号输入长度需小于32位");
+        }
        user.setIdNumber(param.getLandouNo());
        this.updateById(user);
    }

--- a/core/src/main/java/com/wecloud/im/ws/ImConstant.java
+++ b/core/src/main/java/com/wecloud/im/ws/ImConstant.java
@@ -46,12 +46,12 @@ public class ImConstant implements Serializable {
    /**
     * 您收到一条新消息
     */
-    public static final String PUSH_TITLE = "You have received a new message";
+    public static final String PUSH_TITLE = "您收到一条新消息";
    /**
     * 点击查看
     */
-    public static final String PUSH_BODY = "Click to view";
+    public static final String PUSH_BODY = "点击查看";
    /**
     * 会话id的key名

--- a/core/src/main/java/com/wecloud/im/ws/enums/MsgTypeEnum.java
+++ b/core/src/main/java/com/wecloud/im/ws/enums/MsgTypeEnum.java
@@ -29,6 +29,13 @@ public enum MsgTypeEnum {
    //    成为新群主 -1013
    CONVERSATION_NEW_CREATOR(-1013),
+    //    群拓展字段变动事件 -1014
+    CONVERSATION_EXPAND_FIELD_CHANGE(-1014),
+    //    会话名称字段变动事件 -1015
+    CONVERSATION_NAME_CHANGE(-1015),
    //    消息撤回 -1016
    MSG_WITHDRAW(-1016),

--- a/core/src/main/resources/mapper/ImFriendMapper.xml
+++ b/core/src/main/resources/mapper/ImFriendMapper.xml
@@ -25,7 +25,7 @@
    <select id="getApplyFriendPageList" resultType="com.wecloud.im.friend.param.ImFriendApplyDto">
        select
-            friend.id, client.client_id as friendClientId, friend.friend_name, claimer.client_id as claimerClientId,
+            friend.id, client.client_id as friendClientId, friend.friend_name as friendName, claimer.client_id as claimerClientId,
            friend.reject_remark, friend.request_remark, friend.state, friend.create_time
        from im_friend friend inner join im_client client on friend.client_id_friend = client.client_id
                inner join im_client claimer on friend.client_id_claimer = claimer.client_id