|
|
@@ -13,7 +13,6 @@ import com.qnfhq.common.utils.DateUtils;
|
|
|
import com.qnfhq.common.utils.IpUtils;
|
|
|
import com.qnfhq.common.utils.MessageUtils;
|
|
|
import com.qnfhq.common.utils.Result;
|
|
|
-import com.qnfhq.common.validator.ValidatorUtils;
|
|
|
import com.qnfhq.constant.ApiConstant;
|
|
|
import com.qnfhq.modules.user.dao.AppUserDao;
|
|
|
import com.qnfhq.modules.user.dto.*;
|
|
|
@@ -95,11 +94,7 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
|
|
|
@Override
|
|
|
public AppUserEntity getUserByUserId(Long userId) {
|
|
|
- return baseDao.selectOne(new LambdaQueryWrapper<AppUserEntity>()
|
|
|
- .eq(AppUserEntity::getId, userId)
|
|
|
- .eq(AppUserEntity::getStatus, UserStatus.OK.getCode())
|
|
|
- .last(" limit 1")
|
|
|
- );
|
|
|
+ return baseDao.selectById(userId);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -140,7 +135,7 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
EmailValidUtils.validateEmail(registerDto.getEmail());
|
|
|
//密码强度检测
|
|
|
PasswordStrengthValidator.validatePasswordStrength(registerDto.getLoginPassword());
|
|
|
- log.info("password valid end");
|
|
|
+
|
|
|
|
|
|
//验证码校验
|
|
|
String codeType = registerDto.getCodeType();
|
|
|
@@ -234,10 +229,10 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
@Override
|
|
|
public Result login(AppLoginDTO dto, HttpServletRequest request)
|
|
|
{
|
|
|
- //图形验证码
|
|
|
- if(!captchaService.validate(dto.getUuid(), dto.getCode())) {
|
|
|
- throw new RenException(MessageUtils.message("appUser.login.code.err"));//验证码错误
|
|
|
- }
|
|
|
+ //图形验证码 要改滑动码
|
|
|
+ //if(!captchaService.validate(dto.getUuid(), dto.getCode())) {
|
|
|
+ // throw new RenException(MessageUtils.message("appUser.login.code.err"));//验证码错误
|
|
|
+ //}
|
|
|
|
|
|
//账号密码失败重试次数
|
|
|
checkPwdErrTryTimes(dto.getLoginName());
|
|
|
@@ -454,6 +449,8 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
final String emailCodeResultKey = String.format("%s%s%s%s", CachePrefix.EMAIL_CODE.getPrefix(), UserCodeTypeEnum.valueOf(codeType).name(), email,":result");
|
|
|
verifyResult(emailCodeResultKey);
|
|
|
|
|
|
+ //密码强度检测
|
|
|
+ PasswordStrengthValidator.validatePasswordStrength(newPwd);
|
|
|
//更新密码
|
|
|
AppUserEntity appUser = getUserByEmail(email);
|
|
|
if(Objects.isNull(appUser)){
|
|
|
@@ -480,7 +477,8 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
final String phoneCodeResultKey = String.format("%s%s%s%s%s",CachePrefix.SMS_CODE.getPrefix(),UserCodeTypeEnum.valueOf(codeType).name(),zone,phone,":result");
|
|
|
verifyResult(phoneCodeResultKey);
|
|
|
|
|
|
-
|
|
|
+ //密码强度检测
|
|
|
+ PasswordStrengthValidator.validatePasswordStrength(newPwd);
|
|
|
//更新密码
|
|
|
AppUserEntity appUser = getUserByMobile(phone,zone);
|
|
|
if(Objects.isNull(appUser)){
|
|
|
@@ -600,7 +598,18 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
{
|
|
|
//校验手机验证码
|
|
|
final String phoneCodeKey = String.format("%s%s%s%s",CachePrefix.SMS_CODE.getPrefix(),UserCodeTypeEnum.valueOf(codeType).name(),zone,phone);
|
|
|
- return checkCode(phoneCodeKey,code);
|
|
|
+ checkCode(phoneCodeKey,code);
|
|
|
+
|
|
|
+ AppUserEntity user = getUserByMobile(phone,zone);
|
|
|
+ if(Objects.isNull(user)) {
|
|
|
+ throw new RenException(MessageUtils.message("user.not.exist"));//用户不存在
|
|
|
+ }
|
|
|
+ Map data = MapUtil.of("phone",user.getPhone());
|
|
|
+ data.put("zone",user.getZone());
|
|
|
+ data.put("email",user.getEmail());
|
|
|
+ Result result = new Result();
|
|
|
+ result.setData(data);
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -609,7 +618,18 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
{
|
|
|
//校验邮箱验证码
|
|
|
final String emailCodeKey = String.format("%s%s%s", CachePrefix.EMAIL_CODE.getPrefix(), UserCodeTypeEnum.valueOf(codeType).name(), email);
|
|
|
- return checkCode(emailCodeKey,code);
|
|
|
+ checkCode(emailCodeKey,code);
|
|
|
+
|
|
|
+ AppUserEntity user = getUserByEmail(email);
|
|
|
+ if(Objects.isNull(user)) {
|
|
|
+ throw new RenException(MessageUtils.message("user.not.exist"));//用户不存在
|
|
|
+ }
|
|
|
+ Map data = MapUtil.of("phone",user.getPhone());
|
|
|
+ data.put("zone",user.getZone());
|
|
|
+ data.put("email",user.getEmail());
|
|
|
+ Result result = new Result();
|
|
|
+ result.setData(data);
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -618,7 +638,7 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
* @param code
|
|
|
* @return
|
|
|
*/
|
|
|
- private Result checkCode(String cacheKey,String code) {
|
|
|
+ private void checkCode(String cacheKey,String code) {
|
|
|
Object checkCode = redisUtils.get(cacheKey);
|
|
|
if (checkCode == null) {
|
|
|
throw new RenException(MessageUtils.message("user.register.code.err"));//验证码错误
|
|
|
@@ -635,8 +655,5 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserDao, AppUserEntit
|
|
|
//设置验证结果
|
|
|
final String checkCodeResult = String.format("%s%s",cacheKey,":result");
|
|
|
redisUtils.set(checkCodeResult,1,ApiConstant.CHECK_EXPIRE);
|
|
|
-
|
|
|
- Result result = new Result();
|
|
|
- return result;
|
|
|
}
|
|
|
}
|