Commit 04018c00 by 段启岩

修改用户昵称可以重复

parent 728d3c75
...@@ -6,7 +6,6 @@ import cn.meteor.beyondclouds.core.annotation.Anonymous; ...@@ -6,7 +6,6 @@ import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.bean.Subject;
import cn.meteor.beyondclouds.core.validation.groups.UpdateGroup;
import cn.meteor.beyondclouds.modules.user.entity.User; import cn.meteor.beyondclouds.modules.user.entity.User;
import cn.meteor.beyondclouds.modules.user.entity.UserFollow; import cn.meteor.beyondclouds.modules.user.entity.UserFollow;
import cn.meteor.beyondclouds.modules.user.exception.UserServiceException; import cn.meteor.beyondclouds.modules.user.exception.UserServiceException;
...@@ -22,7 +21,6 @@ import io.swagger.annotations.ApiOperation; ...@@ -22,7 +21,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
...@@ -69,7 +67,7 @@ public class UserApi { ...@@ -69,7 +67,7 @@ public class UserApi {
@ApiOperation("修改我的基本信息") @ApiOperation("修改我的基本信息")
@PutMapping("/my/baseinfo") @PutMapping("/my/baseinfo")
public Response alterBaseInfo(@RequestBody @Validated(UpdateGroup.class) UserBaseInfoFrom userBaseinfoFrom, BindingResult result, public Response alterBaseInfo(@RequestBody @Valid UserBaseInfoFrom userBaseinfoFrom, BindingResult result,
@CurrentSubject Subject subject) throws UserServiceException { @CurrentSubject Subject subject) throws UserServiceException {
if (result.hasErrors()) { if (result.hasErrors()) {
return Response.fieldError(result.getFieldError()); return Response.fieldError(result.getFieldError());
......
...@@ -17,8 +17,7 @@ public enum UserErrorCode implements IErrorCode { ...@@ -17,8 +17,7 @@ public enum UserErrorCode implements IErrorCode {
FOLLOWED_USER_NOT_EXISTS(1004, "被关注用户不存在"), FOLLOWED_USER_NOT_EXISTS(1004, "被关注用户不存在"),
FOLLOWER_USER_NOT_EXISTS(1005, "关注者不存在"), FOLLOWER_USER_NOT_EXISTS(1005, "关注者不存在"),
ALREADY_FOLLOWED(1006, "已关注过该用户"), ALREADY_FOLLOWED(1006, "已关注过该用户"),
NON_FOLLOWED(1007, "没有关注过该用户"), NON_FOLLOWED(1007, "没有关注过该用户");
NICKNAME_ALREADY_EXIST(1008,"该昵称已存在");
UserErrorCode(long code, String msg) { UserErrorCode(long code, String msg) {
this.code = code; this.code = code;
......
...@@ -22,11 +22,11 @@ import javax.validation.constraints.Pattern; ...@@ -22,11 +22,11 @@ import javax.validation.constraints.Pattern;
public class UserBaseInfoFrom { public class UserBaseInfoFrom {
@ApiModelProperty("昵称") @ApiModelProperty("昵称")
@NullOrNotBlank(message = "请传入有效的昵称", groups = UpdateGroup.class) @NullOrNotBlank(message = "请传入有效的昵称")
private String nickName; private String nickName;
@ApiModelProperty("头像") @ApiModelProperty("头像")
@NullOrNotBlank(message = "请选择有效的头像", groups = UpdateGroup.class) @NullOrNotBlank(message = "请选择有效的头像")
private String userAvatar; private String userAvatar;
@ApiModelProperty("性别") @ApiModelProperty("性别")
...@@ -35,7 +35,7 @@ public class UserBaseInfoFrom { ...@@ -35,7 +35,7 @@ public class UserBaseInfoFrom {
private Integer gender; private Integer gender;
@ApiModelProperty("签名") @ApiModelProperty("签名")
@NullOrNotBlank(message = "请传入有效的签名", groups = UpdateGroup.class) @NullOrNotBlank(message = "请传入有效的签名")
private String signature; private String signature;
@ApiModelProperty("手机号") @ApiModelProperty("手机号")
...@@ -43,10 +43,10 @@ public class UserBaseInfoFrom { ...@@ -43,10 +43,10 @@ public class UserBaseInfoFrom {
private String mobile; private String mobile;
@ApiModelProperty("微信号") @ApiModelProperty("微信号")
@NullOrNotBlank(message = "请传入有效的微信号", groups = UpdateGroup.class) @NullOrNotBlank(message = "请传入有效的微信号")
private String wxNumber; private String wxNumber;
@ApiModelProperty("qq号") @ApiModelProperty("qq号")
@NullOrNotBlank(message = "请传入有效的qq号", groups = UpdateGroup.class) @NullOrNotBlank(message = "请传入有效的qq号")
private String qqNumber; private String qqNumber;
} }
...@@ -61,8 +61,9 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I ...@@ -61,8 +61,9 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
//3. 创建用户 //3. 创建用户
User user = new User(); User user = new User();
user.setNickName("自动生成的昵称"); user.setNickName("昵称");
user.setSignature("自动生成的默认签名"); user.setSignature("默认签名");
user.setUserAvatar("https://beyondclouds.oss-cn-beijing.aliyuncs.com/avatar/d389c748-f087-4d8e-a138-6756af8790b1.jpeg");
user.setMobile(mobile); user.setMobile(mobile);
save(user); save(user);
...@@ -100,7 +101,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I ...@@ -100,7 +101,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
// 1.创建用户 // 1.创建用户
User user = new User(); User user = new User();
user.setNickName(qqAuthResult.getNickName()); user.setNickName(qqAuthResult.getNickName());
user.setSignature("自动生成的默认签名"); user.setSignature("默认签名");
user.setGender(qqAuthResult.getGender()); user.setGender(qqAuthResult.getGender());
user.setUserAvatar(qqAuthResult.getAvatar()); user.setUserAvatar(qqAuthResult.getAvatar());
...@@ -118,12 +119,6 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I ...@@ -118,12 +119,6 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
@Override @Override
public void alterBaseInfo(User user) throws UserServiceException { public void alterBaseInfo(User user) throws UserServiceException {
//查看昵称是否重复
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("nick_name", user.getNickName());
if(null != getOne(queryWrapper)){
throw new UserServiceException(UserErrorCode.NICKNAME_ALREADY_EXIST);
}
updateById(user); updateById(user);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment