diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java index 8e4e10f..b578144 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java @@ -17,10 +17,7 @@ import com.fuyuanshen.common.core.enums.LoginType; import com.fuyuanshen.common.core.enums.UserType; import com.fuyuanshen.common.core.exception.user.CaptchaExpireException; import com.fuyuanshen.common.core.exception.user.UserException; -import com.fuyuanshen.common.core.utils.MessageUtils; -import com.fuyuanshen.common.core.utils.ServletUtils; -import com.fuyuanshen.common.core.utils.StringUtils; -import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.core.utils.*; import com.fuyuanshen.common.json.utils.JsonUtils; import com.fuyuanshen.common.redis.utils.RedisUtils; import com.fuyuanshen.common.satoken.utils.AppLoginHelper; @@ -61,9 +58,9 @@ public class AppSmsAuthStrategy implements IAuthStrategy { AppUserVo user = loadUserByPhonenumber(phonenumber); if (ObjectUtil.isNull(user)) { //新增Appuser - addAppUser(tenantId, phonenumber); - - user = appUserMapper.selectVoOne(new LambdaQueryWrapper().eq(AppUser::getPhonenumber, phonenumber)); + AppUser appUser = addAppUser(tenantId, phonenumber); + MapstructUtils.convert(appUser, user); +// user = appUserMapper.selectVoOne(new LambdaQueryWrapper().eq(AppUser::getPhonenumber, phonenumber)); // loginService.recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists", phonenumber)); // throw new UserException("user.not.exists", phonenumber); } @@ -90,7 +87,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy { return loginVo; } - private void addAppUser(String tenantId, String phonenumber) { + private AppUser addAppUser(String tenantId, String phonenumber) { AppUser appUser = new AppUser(); appUser.setPhonenumber(phonenumber); appUser.setUserName(phonenumber); @@ -99,6 +96,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy { appUser.setLoginIp(ServletUtils.getClientIP()); appUser.setTenantId(tenantId); appUserMapper.insert(appUser); + return appUser; }