|
@@ -11,8 +11,7 @@ import com.citu.framework.common.util.validation.ValidationUtils;
|
|
|
import com.citu.module.menduner.common.enums.EventAsyncUrlEnum;
|
|
|
import com.citu.module.menduner.common.enums.PointBizTypeEnum;
|
|
|
import com.citu.module.menduner.common.message.EventAsyncConfirmMessage;
|
|
|
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseResetPasswordReqVO;
|
|
|
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.*;
|
|
|
+import com.citu.module.menduner.system.controller.app.common.auth.vo.*;
|
|
|
import com.citu.module.menduner.system.controller.app.jobhunt.user.vo.AppMdeUserResetPasswordReqVO;
|
|
|
import com.citu.module.menduner.system.convert.MdeAuthConvert;
|
|
|
import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
|
|
@@ -142,7 +141,12 @@ public class MdeAuthServiceImpl implements MdeAuthService {
|
|
|
}
|
|
|
if (!userService.isPasswordMatch(password, user.getPassword())) {
|
|
|
createLoginLog(user.getId(), account, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);
|
|
|
- throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
|
|
|
+ if (null == user.getLoginDate()) {
|
|
|
+ // 第一次登录
|
|
|
+ throw exception(MDE_USER_PHONE_INIT_PASSWORD);
|
|
|
+ } else {
|
|
|
+ throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
|
|
|
+ }
|
|
|
}
|
|
|
// 校验是否禁用
|
|
|
if (ObjectUtil.notEqual(user.getStatus(), MendunerStatusEnum.ENABLE.getStatus())) {
|
|
@@ -225,7 +229,7 @@ public class MdeAuthServiceImpl implements MdeAuthService {
|
|
|
}
|
|
|
|
|
|
// 创建用户并返回
|
|
|
- user = userService.createUserIfAbsent(reqVO.getPhone(),reqVO.getInviteCode());
|
|
|
+ user = userService.createUserIfAbsent(reqVO.getPhone(), reqVO.getInviteCode());
|
|
|
|
|
|
if (null != reqVO.getInviteCode()) {
|
|
|
// 给邀请人增加积分
|
|
@@ -351,7 +355,7 @@ public class MdeAuthServiceImpl implements MdeAuthService {
|
|
|
getClientIP())).getCheckedData();
|
|
|
|
|
|
// 更新密码
|
|
|
- userService.updateUserPassword(user.getId(),reqVO.getPassword());
|
|
|
+ userService.updateUserPassword(user.getId(), reqVO.getPassword());
|
|
|
}
|
|
|
|
|
|
@Override
|