diff --git a/register-base/src/main/java/ink/wgink/register/base/controller/app/api/RegisterAppController.java b/register-base/src/main/java/ink/wgink/register/base/controller/app/api/RegisterAppController.java index 55fafe5a..8ce330f1 100644 --- a/register-base/src/main/java/ink/wgink/register/base/controller/app/api/RegisterAppController.java +++ b/register-base/src/main/java/ink/wgink/register/base/controller/app/api/RegisterAppController.java @@ -60,7 +60,7 @@ public class RegisterAppController extends DefaultBaseController { throw new ParamsException("密码强度不够, 密码6到16位,包含数字、字母、特殊字符,其中的任意两种"); } Map params = requestParams(); - registerService.defaultRegister(registerDefaultVO, params); + registerService.registerDefault(registerDefaultVO, params); return new SuccessResult(); } @@ -80,7 +80,7 @@ public class RegisterAppController extends DefaultBaseController { throw new ParamsException("验证码错误"); } Map params = requestParams(); - registerService.phoneRegister(registerPhoneVO, params); + registerService.registerPhone(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 27c17294..db318792 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 @@ -24,7 +24,7 @@ public interface IRegisterService { * @param params * @throws Exception */ - void defaultRegister(RegisterDefaultVO registerDefaultVO, Map params) throws Exception; + void registerDefault(RegisterDefaultVO registerDefaultVO, Map params) throws Exception; /** * 手机注册 @@ -33,5 +33,5 @@ public interface IRegisterService { * @param params * @throws Exception */ - void phoneRegister(RegisterPhoneVO registerPhoneVO, Map params) throws Exception; + void registerPhone(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 8fac4a8a..4146a5f8 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 @@ -38,12 +38,12 @@ public class RegisterServiceImpl extends DefaultBaseService implements IRegister private IUserService userService; @Override - public void defaultRegister(RegisterDefaultVO registerDefaultVO, Map params) throws Exception { + public void registerDefault(RegisterDefaultVO registerDefaultVO, Map params) throws Exception { register(registerDefaultVO.getUsername(), registerDefaultVO.getPassword(), params); } @Override - public void phoneRegister(RegisterPhoneVO registerPhoneVO, Map params) throws Exception { + public void registerPhone(RegisterPhoneVO registerPhoneVO, Map params) throws Exception { // 生成8位随机密码 register(registerPhoneVO.getPhone(), WStringUtil.randomSubStr(UUIDUtil.get32UUID(), 8), params); } @@ -56,7 +56,7 @@ public class RegisterServiceImpl extends DefaultBaseService implements IRegister userVO.setUserState(UserStateEnum.NORMAL.getValue()); userVO.setUserType(UserTypeEnum.NORMAL.getValue()); String userId = userService.saveAndReturnId(userVO, true); - if (registerHandler == null) { + if (registerHandler != null) { registerHandler.handler(userId, params); } }