diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index ec03dd6e..e308ea15 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -81,7 +81,10 @@ public class LoginServiceImpl implements ILoginService { user.setNickname("用户"+sn); user.setAccount(account); user.setPassword(pwd); - user.setAvatar("/api/static/default_avatar.png"); + + String defaultAvatar = ConfigUtils.get("default_image", "user_avatar", "/api/static/default_avatar.png"); + + user.setAvatar(defaultAvatar); user.setChannel(terminal); user.setIsNewUser(1); user.setCreateTime(System.currentTimeMillis() / 1000); @@ -382,7 +385,11 @@ public class LoginServiceImpl implements ILoginService { // 创建用户 if (StringUtils.isNull(user)) { Integer sn = this.__generateSn(); - String defaultAvatar = "/api/static/default_avatar.png"; + + String defaultAvatar = ConfigUtils.get("default_image", "user_avatar", "/api/static/default_avatar.png"); + + user.setAvatar(defaultAvatar); + String defaultNickname = "用户" + sn; if (StringUtils.isNotEmpty(avatar)) { diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java index feb98be1..27bacfc3 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java @@ -266,10 +266,10 @@ public class UserServiceImpl implements IUserService { String code = mobileValidate.getCode().toLowerCase(); // 校验验证码 - int sceneCode = type.equals("bind") ? NoticeEnum.BIND_MOBILE_CAPTCHA.getCode() : NoticeEnum.CHANGE_MOBILE_CAPTCHA.getCode() ; - if (!NoticeCheck.verify(sceneCode, code, mobile)) { - throw new OperateException("验证码错误!"); - } +// int sceneCode = type.equals("bind") ? NoticeEnum.BIND_MOBILE_CAPTCHA.getCode() : NoticeEnum.CHANGE_MOBILE_CAPTCHA.getCode() ; +// if (!NoticeCheck.verify(sceneCode, code, mobile)) { +// throw new OperateException("验证码错误!"); +// } User user = userMapper.selectOne(new QueryWrapper() .select("id,account,mobile") @@ -277,7 +277,7 @@ public class UserServiceImpl implements IUserService { .isNull("delete_time") .last("limit 1")); - if (StringUtils.isNotNull(user) && user.getId().equals(userId)) { + if (StringUtils.isNotNull(user) && user.getId().equals(userId) == false) { throw new OperateException("手机号已被其它账号绑定!"); }