diff --git a/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java b/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java index 82d397f4..6838b8fd 100644 --- a/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java +++ b/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java @@ -17,6 +17,7 @@ import ink.wgink.pojo.bos.LoginAppUser; import ink.wgink.service.user.enums.UserStateEnum; import ink.wgink.service.user.pojo.pos.UserPO; import ink.wgink.service.user.service.IUserService; +import ink.wgink.util.RegexUtil; import ink.wgink.util.date.DateUtil; import ink.wgink.util.request.RequestUtil; import org.apache.commons.lang3.StringUtils; @@ -58,7 +59,12 @@ public class AppSignServiceImpl extends BaseAppSignService implements IAppSignSe public String defaultSign(AppLoginDefaultVO appLoginDefaultVO) throws Exception { String userPassword = appLoginDefaultVO.getPassword(); checkApiLock(appLoginDefaultVO); - UserPO userPO = userService.getPOByUsername(appLoginDefaultVO.getUsername()); + UserPO userPO; + if (RegexUtil.isPhone(appLoginDefaultVO.getUsername())) { + userPO = userService.getPOByPhone(appLoginDefaultVO.getUsername()); + } else { + userPO = userService.getPOByUsername(appLoginDefaultVO.getUsername()); + } if (userPO == null) { throw new SearchException("用户不存在"); } @@ -71,7 +77,7 @@ public class AppSignServiceImpl extends BaseAppSignService implements IAppSignSe if (userPO.getUserState() == UserStateEnum.LOCK.getValue()) { throw new SearchException("用户已锁定"); } - if(DateUtil.isDateExpired(userPO.getUserExpiredDate())) { + if (DateUtil.isDateExpired(userPO.getUserExpiredDate())) { throw new UserAuthenticationException("账号已经过期"); } if (!passwordEncoder.matches(userPassword, userPO.getUserPassword())) { @@ -83,7 +89,7 @@ public class AppSignServiceImpl extends BaseAppSignService implements IAppSignSe @Override public String phoneSign(AppLoginPhoneVO appLoginPhoneVO) throws Exception { - UserPO userPO = userService.getPOByUsername(appLoginPhoneVO.getUsername()); + UserPO userPO = userService.getPOByPhone(appLoginPhoneVO.getUsername()); if (userPO == null) { throw new SearchException("用户不存在"); } 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 d44d64a3..a360f98e 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 @@ -15,6 +15,7 @@ import ink.wgink.service.user.enums.UserTypeEnum; import ink.wgink.service.user.pojo.vos.UserVO; import ink.wgink.service.user.service.IUserService; import ink.wgink.util.ReflectUtil; +import ink.wgink.util.RegexUtil; import ink.wgink.util.UUIDUtil; import ink.wgink.util.string.WStringUtil; import org.slf4j.Logger; @@ -79,12 +80,13 @@ public class RegisterServiceImpl extends DefaultBaseService implements IRegister } private void register(String username, String password, Map queryParams) throws Exception { - String isExamine = systemConfigManager.getSystemConfigParamsValue(ISystemConstant.REGISTER_USER_EXAMINE); - UserVO userVO = new UserVO(); userVO.setUserUsername(username); userVO.setUserPassword(password); userVO.setUserName(username); + if (RegexUtil.isPhone(username)) { + userVO.setUserPhone(username); + } if (isRegisterUserExamine()) { userVO.setUserState(UserStateEnum.UN_EXAMINE.getValue()); } else {