加默认昵称

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

 package com.wecloud.im.user.controller;
 package com.wecloud.im.user.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.wecloud.im.enums.VerifySceneEnum;
 import com.wecloud.im.enums.VerifySceneEnum;
 import com.wecloud.im.constant.RedisKeyPrefixConstant;
 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.param.SendVerifyCodeParam;
+import com.wecloud.im.user.service.UserService;
 import com.wecloud.im.ws.utils.RedisUtils;
 import com.wecloud.im.ws.utils.RedisUtils;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
 import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import io.geekidea.springbootplus.framework.common.exception.BusinessException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +38,9 @@ public class VerifyCodeController extends BaseController {
     @Autowired
     @Autowired
     private RedisUtils redisUtils;
     private RedisUtils redisUtils;
 
 
+    @Autowired
+    private UserService userService;
+
     /**
     /**
      * 发送验证码接口
      * 发送验证码接口
      */
      */
@@ -46,6 +53,14 @@ public class VerifyCodeController extends BaseController {
         if (BaseEnum.valueOf(VerifySceneEnum.class, param.getVerifyScene()) == null) {
         if (BaseEnum.valueOf(VerifySceneEnum.class, param.getVerifyScene()) == null) {
             return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null);
             return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION, null);
         }
         }
+        if (VerifySceneEnum.RESET_PWD.getCode().equals(param.getVerifyScene())) {
+            // 重置密码、找回密码校验手机号码已注册
+            User user = userService.getOne(new QueryWrapper<User>().lambda()
+                    .eq(User::getPhone, param.getPhone()));
+            if (user == null) {
+                throw new BusinessException("账号不存在");
+            }
+        }
 //        String verifyCode = RandomUtil.generateVerifyCode();
 //        String verifyCode = RandomUtil.generateVerifyCode();
         String verifyCode = "666666";
         String verifyCode = "666666";
         String key = new StringBuilder(RedisKeyPrefixConstant.VERIFY_CODE_PREFIX).append(param.getVerifyScene()).append(param.getPhone()).toString();
         String key = new StringBuilder(RedisKeyPrefixConstant.VERIFY_CODE_PREFIX).append(param.getVerifyScene()).append(param.getPhone()).toString();

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

@@ -96,6 +96,7 @@ public class UserService extends BaseServiceImpl<UserMapper, User> {
         }
         }
         User user = new User();
         User user = new User();
         user.setId(SnowflakeUtil.getId());
         user.setId(SnowflakeUtil.getId());
+        user.setNickname("蓝豆-" + RandomUtil.generateRandomStr(6));
         user.setIdNumber(this.getLandouNo());
         user.setIdNumber(this.getLandouNo());
         user.setPhone(param.getPhone());
         user.setPhone(param.getPhone());
         user.setPassword(AesUtil.encrypt(param.getPassword()));
         user.setPassword(AesUtil.encrypt(param.getPassword()));

core/src/main/java/com/wecloud/im/vo/ConversationMemberVo.java

@@ -19,14 +19,19 @@ public class ConversationMemberVo implements Serializable {
 
 
     @ApiModelProperty("会话中client的备注名")
     @ApiModelProperty("会话中client的备注名")
     private String clientRemarkName;
     private String clientRemarkName;
+
     @ApiModelProperty("头像")
     @ApiModelProperty("头像")
     private String headPortrait;
     private String headPortrait;
+
     @ApiModelProperty("主昵称")
     @ApiModelProperty("主昵称")
     private String nickname;
     private String nickname;
+
     @ApiModelProperty("clientId")
     @ApiModelProperty("clientId")
     private String clientId;
     private String clientId;
+
     @ApiModelProperty("client自己的自定义扩展属性")
     @ApiModelProperty("client自己的自定义扩展属性")
     private String clientAttributes;
     private String clientAttributes;
+
     @ApiModelProperty("会话成员列表的自定义扩展属性")
     @ApiModelProperty("会话成员列表的自定义扩展属性")
     private String memberAttributes;
     private String memberAttributes;