fix: 修复更改邮箱激活失败的问题
This commit is contained in:
parent
4634392438
commit
92899d578f
|
|
@ -242,12 +242,15 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
||||||
String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code);
|
String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code);
|
||||||
VUtils.trueThrowBusinessError(StrUtil.isBlank(email1))
|
VUtils.trueThrowBusinessError(StrUtil.isBlank(email1))
|
||||||
.throwMessage("无效的激活码");
|
.throwMessage("无效的激活码");
|
||||||
|
AdminUser user = lambdaQuery().eq(AdminUser::getIsDel, 0).eq(AdminUser::getLoginName, email).one();
|
||||||
|
VUtils.trueThrowBusinessError(Objects.isNull(user))
|
||||||
|
.throwMessage("用户不存在:" + email);
|
||||||
lambdaUpdate()
|
lambdaUpdate()
|
||||||
.set(AdminUser::getEmail, email1)
|
.set(AdminUser::getEmail, email1)
|
||||||
.set(AdminUser::getLoginName, email1)
|
.set(AdminUser::getLoginName, email1)
|
||||||
.set(AdminUser::getState, UserState.Activated.getState())
|
.set(AdminUser::getState, UserState.Activated.getState())
|
||||||
.set(AdminUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
|
.set(AdminUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
|
||||||
.set(AdminUser::getUpdateBy, AdminUserUtil.getUserId())
|
.set(AdminUser::getUpdateBy, user.getId())
|
||||||
.set(AdminUser::getUpdateTime, LocalDateTime.now())
|
.set(AdminUser::getUpdateTime, LocalDateTime.now())
|
||||||
.eq(AdminUser::getIsDel, 0)
|
.eq(AdminUser::getIsDel, 0)
|
||||||
.eq(AdminUser::getLoginName, email)
|
.eq(AdminUser::getLoginName, email)
|
||||||
|
|
|
||||||
|
|
@ -655,12 +655,15 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
|
||||||
String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code);
|
String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code);
|
||||||
VUtils.trueThrowBusinessError(StrUtil.isBlank(email1))
|
VUtils.trueThrowBusinessError(StrUtil.isBlank(email1))
|
||||||
.throwMessage("无效的激活码");
|
.throwMessage("无效的激活码");
|
||||||
|
AppUser user = lambdaQuery().eq(AppUser::getIsDel, 0).eq(AppUser::getLoginName, email).one();
|
||||||
|
VUtils.trueThrowBusinessError(Objects.isNull(user))
|
||||||
|
.throwMessage("用户不存在:" + email);
|
||||||
lambdaUpdate()
|
lambdaUpdate()
|
||||||
.set(AppUser::getEmail, email1)
|
.set(AppUser::getEmail, email1)
|
||||||
.set(AppUser::getLoginName, email1)
|
.set(AppUser::getLoginName, email1)
|
||||||
.set(AppUser::getState, UserState.Activated.getState())
|
.set(AppUser::getState, UserState.Activated.getState())
|
||||||
.set(AppUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
|
.set(AppUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
|
||||||
.set(AppUser::getUpdateBy,AppUserUtil.getUserName())
|
.set(AppUser::getUpdateBy,user.getName())
|
||||||
.set(AppUser::getUpdateTime, LocalDateTime.now())
|
.set(AppUser::getUpdateTime, LocalDateTime.now())
|
||||||
.eq(AppUser::getIsDel, 0)
|
.eq(AppUser::getIsDel, 0)
|
||||||
.eq(AppUser::getLoginName, email)
|
.eq(AppUser::getLoginName, email)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue