register

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -20,6 +20,7 @@ import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.sms.SmsCtcc;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
@@ -73,6 +74,8 @@ public class UserController {
 
     private final RedisUtil redisUtil;
 
+    private final SmsCtcc smsCtcc;
+
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "用户列表（不分页）")
@@ -361,6 +364,10 @@ public class UserController {
     @PostMapping("/register")
     @ApiOperation(value = "家长注册")
     public R register(@Valid @RequestBody AddUserDto dto) {
+        // 验证验证码
+        if (!smsCtcc.captchaVerify(dto.getMobile(), dto.getCode())) {
+            return R.error("验证码不正确！");
+        }
         // 赋值家长角色
         dto.setPostId(RoleEnum.PARENT.getCode());
         return R.ok(userService.add(dto));

src/main/java/com/xjrsoft/module/organization/dto/RegisterDto.java

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.organization.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class RegisterDto extends AddUserDto{
+
+    @ApiModelProperty(value = "验证码")
+    @NotBlank(message = "验证码不能为空！")
+    private String code;
+}

src/main/java/com/xjrsoft/module/system/controller/LoginController.java

@@ -55,7 +55,7 @@ public class LoginController {
 
     private KeyCloakConfig keyCloakConfig;
 
-    private SmsCtcc smsCtcc;
+    private final SmsCtcc smsCtcc;
 
     @PostMapping("/login")
     @ApiOperation(value = "登录", notes = "传入账号:account,密码:password")

src/main/java/com/xjrsoft/module/system/dto/CaptchaDto.java

@@ -4,11 +4,13 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 
 @Data
 public class CaptchaDto {
 
     @ApiModelProperty(value = "手机")
+    @Pattern(regexp = "1[3-9][0-9]\\d{8}",message = "手机号格式不正确！")
     @NotBlank(message = "手机不能为空！")
     private String mobile;
 

src/main/java/com/xjrsoft/module/system/dto/LoginCaptchaDto.java

@@ -4,11 +4,13 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 
 @Data
 public class LoginCaptchaDto {
 
     @ApiModelProperty(value = "手机")
+    @Pattern(regexp = "1[3-9][0-9]\\d{8}",message = "手机号格式不正确！")
     @NotBlank(message = "手机不能为空！")
     private String mobile;