From b586b7fc36dbf544618ce113646b6704b111aa79 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Thu, 6 May 2021 17:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/app/api/RegisterAppController.java      | 4 ++--
 .../ink/wgink/register/base/service/IRegisterService.java   | 4 ++--
 .../register/base/service/impl/RegisterServiceImpl.java     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

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<String, Object> 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<String, Object> 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<String, Object> params) throws Exception;
+    void registerDefault(RegisterDefaultVO registerDefaultVO, Map<String, Object> params) throws Exception;
 
     /**
      * 手机注册
@@ -33,5 +33,5 @@ public interface IRegisterService {
      * @param params
      * @throws Exception
      */
-    void phoneRegister(RegisterPhoneVO registerPhoneVO, Map<String, Object> params) throws Exception;
+    void registerPhone(RegisterPhoneVO registerPhoneVO, Map<String, Object> 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<String, Object> params) throws Exception {
+    public void registerDefault(RegisterDefaultVO registerDefaultVO, Map<String, Object> params) throws Exception {
         register(registerDefaultVO.getUsername(), registerDefaultVO.getPassword(), params);
     }
 
     @Override
-    public void phoneRegister(RegisterPhoneVO registerPhoneVO, Map<String, Object> params) throws Exception {
+    public void registerPhone(RegisterPhoneVO registerPhoneVO, Map<String, Object> 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);
         }
     }