From 58b2290cedb4c92e89f17984a238dc38fa04c43a Mon Sep 17 00:00:00 2001 From: wanggeng888 <450292408@qq.com> Date: Sun, 2 May 2021 10:20:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=8F=AF=E6=8E=A5=E5=8F=97?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/api/RegisterController.java | 12 ++++++++---- .../base/service/IRegisterService.java | 8 ++++++-- .../service/impl/RegisterServiceImpl.java | 19 ++++++++++--------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/register-base/src/main/java/ink/wgink/register/base/controller/app/api/RegisterController.java b/register-base/src/main/java/ink/wgink/register/base/controller/app/api/RegisterController.java index bc85cee3..59787f8b 100644 --- a/register-base/src/main/java/ink/wgink/register/base/controller/app/api/RegisterController.java +++ b/register-base/src/main/java/ink/wgink/register/base/controller/app/api/RegisterController.java @@ -1,9 +1,9 @@ package ink.wgink.register.base.controller.app.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.DependencyException; import ink.wgink.exceptions.ParamsException; -import ink.wgink.exceptions.PropertiesException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.interfaces.sms.ISmsBaseService; import ink.wgink.pojo.result.ErrorResult; @@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + /** * When you feel like quitting. Think about why you started * 当你想要放弃的时候，想想当初你为何开始 @@ -36,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "注册") @RestController @RequestMapping(ISystemConstant.APP_PREFIX + "/register") -public class RegisterController { +public class RegisterController extends DefaultBaseController { @Autowired(required = false) private ISmsBaseService smsBaseService; @@ -57,7 +59,8 @@ public class RegisterController { if (!RegexUtil.isPasswordMiddle(registerDefaultVO.getPassword())) { throw new ParamsException("密码强度不够, 密码6到16位，包含数字、字母、特殊字符，其中的任意两种"); } - registerService.defaultRegister(registerDefaultVO); + Map params = requestParams(); + registerService.defaultRegister(registerDefaultVO, params); return new SuccessResult(); } @@ -76,7 +79,8 @@ public class RegisterController { if (!StringUtils.equals(verifyCode, registerPhoneVO.getVerifyCode())) { throw new ParamsException("验证码错误"); } - registerService.phoneRegister(registerPhoneVO); + Map params = requestParams(); + registerService.phoneRegister(registerPhoneVO, params); return new SuccessResult(); } diff --git a/register-base/src/main/java/ink/wgink/register/base/service/IRegisterService.java b/register-base/src/main/java/ink/wgink/register/base/service/IRegisterService.java index 0e54d449..27c17294 100644 --- a/register-base/src/main/java/ink/wgink/register/base/service/IRegisterService.java +++ b/register-base/src/main/java/ink/wgink/register/base/service/IRegisterService.java @@ -3,6 +3,8 @@ package ink.wgink.register.base.service; import ink.wgink.register.base.pojo.vos.RegisterDefaultVO; import ink.wgink.register.base.pojo.vos.RegisterPhoneVO; +import java.util.Map; + /** * When you feel like quitting. Think about why you started * 当你想要放弃的时候，想想当初你为何开始 @@ -19,15 +21,17 @@ public interface IRegisterService { * 默认，用户名密码注册 * * @param registerDefaultVO + * @param params * @throws Exception */ - void defaultRegister(RegisterDefaultVO registerDefaultVO) throws Exception; + void defaultRegister(RegisterDefaultVO registerDefaultVO, Map params) throws Exception; /** * 手机注册 * * @param registerPhoneVO + * @param params * @throws Exception */ - void phoneRegister(RegisterPhoneVO registerPhoneVO) throws Exception; + void phoneRegister(RegisterPhoneVO registerPhoneVO, Map params) throws Exception; } diff --git a/register-base/src/main/java/ink/wgink/register/base/service/impl/RegisterServiceImpl.java b/register-base/src/main/java/ink/wgink/register/base/service/impl/RegisterServiceImpl.java index 0c45e702..8fac4a8a 100644 --- a/register-base/src/main/java/ink/wgink/register/base/service/impl/RegisterServiceImpl.java +++ b/register-base/src/main/java/ink/wgink/register/base/service/impl/RegisterServiceImpl.java @@ -1,8 +1,7 @@ package ink.wgink.register.base.service.impl; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.exceptions.base.SystemException; -import ink.wgink.interfaces.expand.register.IRegisterHandler; +import ink.wgink.interfaces.expand.register.IRegisterHandlerService; import ink.wgink.register.base.pojo.vos.RegisterDefaultVO; import ink.wgink.register.base.pojo.vos.RegisterPhoneVO; import ink.wgink.register.base.service.IRegisterService; @@ -17,6 +16,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Map; + /** * When you feel like quitting. Think about why you started * 当你想要放弃的时候，想想当初你为何开始 @@ -32,22 +33,22 @@ public class RegisterServiceImpl extends DefaultBaseService implements IRegister private static final Logger LOG = LoggerFactory.getLogger(RegisterServiceImpl.class); @Autowired(required = false) - private IRegisterHandler registerHandler; + private IRegisterHandlerService registerHandler; @Autowired private IUserService userService; @Override - public void defaultRegister(RegisterDefaultVO registerDefaultVO) throws Exception { - register(registerDefaultVO.getUsername(), registerDefaultVO.getPassword()); + public void defaultRegister(RegisterDefaultVO registerDefaultVO, Map params) throws Exception { + register(registerDefaultVO.getUsername(), registerDefaultVO.getPassword(), params); } @Override - public void phoneRegister(RegisterPhoneVO registerPhoneVO) throws Exception { + public void phoneRegister(RegisterPhoneVO registerPhoneVO, Map params) throws Exception { // 生成8位随机密码 - register(registerPhoneVO.getPhone(), WStringUtil.randomSubStr(UUIDUtil.get32UUID(), 8)); + register(registerPhoneVO.getPhone(), WStringUtil.randomSubStr(UUIDUtil.get32UUID(), 8), params); } - private void register(String username, String password) throws Exception { + private void register(String username, String password, Map params) throws Exception { UserVO userVO = new UserVO(); userVO.setUserUsername(username); userVO.setUserPassword(password); @@ -56,7 +57,7 @@ public class RegisterServiceImpl extends DefaultBaseService implements IRegister userVO.setUserType(UserTypeEnum.NORMAL.getValue()); String userId = userService.saveAndReturnId(userVO, true); if (registerHandler == null) { - registerHandler.handler(userId); + registerHandler.handler(userId, params); } }