Commit 1aae4d34 by lenx065@gmail.com

手机密码注册

parent 7a8b10a2
......@@ -19,15 +19,8 @@ public class RegisterPcRequest {
@ApiModelProperty(value = "短信验证码")
private String smsCode;
@ApiModelProperty(value = "渠道ID")
private Integer channelId;
@NotBlank(message = "请输入登录密码")
@ApiModelProperty(value = "用户昵称")
private String nickName;
@NotBlank(message = "请输入登录密码")
@Size(max = 15, min = 6, message = "请输入6-15位登录密码")
@Size(max = 24, min = 6, message = "请输入6-24位登录密码")
@ApiModelProperty(value = "登录密码")
private String password;
......
......@@ -175,13 +175,6 @@ public class UserServiceImpl implements UserService {
}
String ip = IPUtils.getRealIP(request);
Integer channelId = registerRequest.getChannelId();
long exist = systemConfigMapper.selectCount(Wrappers.<SystemConfig>lambdaQuery()
.eq(SystemConfig::getConfigName, SystemConfigEnum.SOURCE_CHANNEL.getTitle())
.eq(SystemConfig::getDeleted, StatusEnum.ENABLE.getCode())
.eq(SystemConfig::getConfigValue, channelId)
);
String deviceId = null;
try {
deviceId = CommonMethod.getDeviceId(request);
......@@ -193,10 +186,10 @@ public class UserServiceImpl implements UserService {
.id(IdGen.uuid())
.phone(registerRequest.getPhone())
.ip(ip)
.userName(registerRequest.getNickName())
.userName(registerRequest.getPhone())
.role(0)
.type(0)
.channel(exist > 0 ? channelId : 0)
.channel(0)
.password(MD5Util.string2MD5(registerRequest.getPassword()))
.build();
......
......@@ -60,18 +60,18 @@ public class UserController {
// return userService.userInfoById(ids, request);
// }
// @PostMapping(value = "/registerByPc")
// @ApiOperation(value = "PC 版 用户手机号注册")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> registerByPc(@RequestBody @Validated RegisterPcRequest registerRequest, HttpServletRequest request) {
// return userService.registerByPc(registerRequest, request);
// }
@PostMapping(value = "/registerByPc")
@ApiOperation(value = "PC 版 用户手机号密码注册")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> registerByPc(@RequestBody @Validated RegisterPcRequest registerRequest, HttpServletRequest request) {
return userService.registerByPc(registerRequest, request);
}
@PostMapping(value = "/loginByPwd")
@ApiOperation(value = "密码登录")
......@@ -134,18 +134,18 @@ public class UserController {
// return userService.updatePhoneByApp(loginPcRequest, request);
// }
//
// @PostMapping(value = "/forgotPassword")
// @ApiOperation(value = "PC 版 忘记密码")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> forgotPassword(@RequestBody @Validated ForgotPasswordRequest forgotPasswordRequest, HttpServletRequest request) {
// return userService.forgotPassword(forgotPasswordRequest, request);
// }
@PostMapping(value = "/forgotPassword")
@ApiOperation(value = "PC 版 忘记密码")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> forgotPassword(@RequestBody @Validated ForgotPasswordRequest forgotPasswordRequest, HttpServletRequest request) {
return userService.forgotPassword(forgotPasswordRequest, request);
}
@PostMapping(value = "/loginOut")
@ApiOperation(value = "用户退出登录")
......@@ -272,36 +272,36 @@ public class UserController {
// return userService.userApplyAnchor(userApplyAnchorRequest, request);
// }
@PostMapping(value = "/getUserMsgList")
@ApiOperation(value = "获取用户消息列表")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "登录凭证(登录后 token 值)", dataType = "String", paramType = "header", required = true)
})
public ResponseData<?> getUserMsgList(@RequestBody CommonPage commonPage, HttpServletRequest request) {
return userService.getUserMsgList(commonPage, request);
}
@PostMapping(value = "/updateMsgStatus")
@ApiOperation(value = "修改消息已读根据消息 id 数组")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "登录凭证(登录后 token 值)", dataType = "String", paramType = "header", required = true)
})
public ResponseData<?> updateMsgStatus(@RequestBody UserMsgRequest userMsgRequest, HttpServletRequest request) {
return userService.updateMsgStatus(userMsgRequest, request);
}
// @PostMapping(value = "/getUserMsgList")
// @ApiOperation(value = "获取用户消息列表")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// @ApiImplicitParams({
// @ApiImplicitParam(name = "token", value = "登录凭证(登录后 token 值)", dataType = "String", paramType = "header", required = true)
// })
// public ResponseData<?> getUserMsgList(@RequestBody CommonPage commonPage, HttpServletRequest request) {
// return userService.getUserMsgList(commonPage, request);
// }
//
// @PostMapping(value = "/updateMsgStatus")
// @ApiOperation(value = "修改消息已读根据消息 id 数组")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// @ApiImplicitParams({
// @ApiImplicitParam(name = "token", value = "登录凭证(登录后 token 值)", dataType = "String", paramType = "header", required = true)
// })
// public ResponseData<?> updateMsgStatus(@RequestBody UserMsgRequest userMsgRequest, HttpServletRequest request) {
// return userService.updateMsgStatus(userMsgRequest, request);
// }
}
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