diff --git a/src/main/java/com/four/auth/controller/TokenController.java b/src/main/java/com/four/auth/controller/TokenController.java index fade02c..67719ee 100644 --- a/src/main/java/com/four/auth/controller/TokenController.java +++ b/src/main/java/com/four/auth/controller/TokenController.java @@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest; import com.four.auth.service.SysMailService; import com.four.common.duck.request.RequestRegistrationInformation; +import com.four.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.four.auth.form.LoginBody; @@ -97,7 +98,23 @@ public class TokenController { return R.ok(); } + /*** + * 患者注册 + */ + @PostMapping("PatientRegisterBody") + public R PatientRegisterBody(@RequestBody RegisterBody registerBody){ + sysMailService.verifyCode(registerBody.getEmail(),registerBody.getCode()); + sysLoginService.PatientRegisterBody(registerBody); + return R.ok(); + } + + + /*** + * 发送验证码 + * @param email + * @return + */ @GetMapping("/sendCode/{email}") public R sendCode(@PathVariable String email) { sysMailService.sendCode(email); diff --git a/src/main/java/com/four/auth/service/SysLoginService.java b/src/main/java/com/four/auth/service/SysLoginService.java index e037574..af8e455 100644 --- a/src/main/java/com/four/auth/service/SysLoginService.java +++ b/src/main/java/com/four/auth/service/SysLoginService.java @@ -1,5 +1,6 @@ package com.four.auth.service; +import com.four.auth.form.RegisterBody; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.four.common.core.constant.CacheConstants; @@ -241,4 +242,45 @@ public class SysLoginService } recordLogService.recordLogininfor(requestRegistrationInformation.getEmail(), Constants.REGISTER,"注册成功"); } + + /*** + * 用户注册 + * @param registerBody + */ + public void PatientRegisterBody(RegisterBody registerBody) { + if(StringUtils.isAllBlank(registerBody.getEmail(),registerBody.getPassword())){ + throw new ServiceException("邮箱/密码必须填写"); + } + if(registerBody.getPassword().length() < UserConstants.PASSWORD_MIN_LENGTH + || registerBody.getPassword().length() > UserConstants.PASSWORD_MAX_LENGTH){ + + throw new ServiceException("密码必须填写"); + } + + registerBody.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword())); + + + SysUser sysUser = new SysUser(); + sysUser.setDeptId(4L); + sysUser.setBindBankCardStatus(1); + sysUser.setRealNameAuthenticationStatus(1); + sysUser.setBindBankCardStatus(1); + sysUser.setDifferentialState(2); + sysUser.setStatus("0"); + sysUser.setUserMoney(new BigDecimal(0)); + sysUser.setEmail(registerBody.getEmail()); + sysUser.setNickName(registerBody.getEmail()); + sysUser.setUserName(registerBody.getEmail()); + sysUser.setPassword(registerBody.getPassword()); + + + System.out.println(sysUser); + + R registerBodys = remoteUserService.PatientRegisterBody(sysUser,SecurityConstants.INNER); + if(R.FAIL == registerBodys.getCode()){ + throw new ServiceException(registerBodys.getMsg()); + } + recordLogService.recordLogininfor(registerBody.getEmail(),Constants.REGISTER,"注册成功"); + } + } diff --git a/src/main/java/com/four/auth/service/SysMailService.java b/src/main/java/com/four/auth/service/SysMailService.java index 7b0346b..320d634 100644 --- a/src/main/java/com/four/auth/service/SysMailService.java +++ b/src/main/java/com/four/auth/service/SysMailService.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Component; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import java.util.Set; import java.util.concurrent.TimeUnit; @Component @@ -79,4 +80,5 @@ public class SysMailService { redisService.setCacheObject(email,verifyCode,5L, TimeUnit.MINUTES); } + } diff --git a/src/main/java/com/four/auth/service/SysRecordLogService.java b/src/main/java/com/four/auth/service/SysRecordLogService.java index 1604968..67fc230 100644 --- a/src/main/java/com/four/auth/service/SysRecordLogService.java +++ b/src/main/java/com/four/auth/service/SysRecordLogService.java @@ -1,5 +1,6 @@ package com.four.auth.service; +import com.four.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.four.common.core.constant.Constants;