mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop 

# Conflicts:
#	uniapp/src/pages/login/login.vue
This commit is contained in:
damonyuan 2024-11-13 23:37:16 +08:00
parent 14949fa18f cda749d388
commit f81d5cdf4d
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
View File

@ -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)) {

10
server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
View File

@ -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<User>()
.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("手机号已被其它账号绑定!");
}