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

调整个人中心及登录接口

This commit is contained in:
mofung1 2023-03-29 15:42:56 +08:00
parent 07c1dd3a72
commit e6a92a479b
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ public class LoginServiceImpl implements ILoginService {
@Override
public LoginTokenVo accountLogin(String username, String password, Integer terminal) {
User user = userMapper.selectOne(new QueryWrapper<User>()
.select("id,username,password,salt,mobile,is_disable")
.select("id,username,password,salt,mobile,is_disable,is_new")
.eq("username", username)
.eq("is_delete", 0)
.last("limit 1"));
@ -103,7 +103,7 @@ public class LoginServiceImpl implements ILoginService {
Assert.isFalse(!pwd.equals(user.getPassword()), "账号或密码错误!");
Assert.isFalse(!user.getIsDisable().equals(0), "账号已被禁用!");
return this.__loginToken(user.getId(), user.getMobile(), terminal);
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNew(), terminal);
}
/**
@ -124,7 +124,7 @@ public class LoginServiceImpl implements ILoginService {
// 查询手机号
User user = userMapper.selectOne(new QueryWrapper<User>()
.select("id,username,mobile,is_disable")
.select("id,username,mobile,is_disable,is_new")
.eq("mobile", mobile)
.eq("is_delete", 0)
.last("limit 1"));
@ -132,7 +132,7 @@ public class LoginServiceImpl implements ILoginService {
Assert.notNull(user, "账号不存在!");
Assert.isFalse(user.getIsDisable() != 0, "账号已禁用!");
return this.__loginToken(user.getId(), user.getMobile(), terminal);
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNew(), terminal);
}
/**
@ -353,7 +353,7 @@ public class LoginServiceImpl implements ILoginService {
userAuthMapper.updateById(auth);
}
return this.__loginToken(user.getId(), user.getMobile(), terminal);
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNew(), terminal);
}
/**
@ -365,7 +365,7 @@ public class LoginServiceImpl implements ILoginService {
* @param terminal 终端
* @return LoginTokenVo
*/
private LoginTokenVo __loginToken(Integer userId, String mobile, Integer terminal) {
private LoginTokenVo __loginToken(Integer userId, String mobile, Integer isNew, Integer terminal) {
// 实现账号登录
StpUtil.login(userId, String.valueOf(terminal));
@ -380,6 +380,7 @@ public class LoginServiceImpl implements ILoginService {
vo.setId(userId);
vo.setIsBindMobile(!StringUtils.isEmpty(mobile));
vo.setToken(StpUtil.getTokenValue());
vo.setIsNew(isNew);
return vo;
}

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

@ -54,7 +54,7 @@ public class UserServiceImpl implements IUserService {
@Override
public UserCenterVo center(Integer userId, Integer terminal) {
User user = userMapper.selectOne(new QueryWrapper<User>()
.select("id,sn,avatar,real_name,nickname,username,mobile,money,is_new")
.select("id,sn,avatar,real_name,nickname,username,mobile,money,is_new,password")
.eq("id", userId)
.last("limit 1"));
@ -77,6 +77,9 @@ public class UserServiceImpl implements IUserService {
vo.setIsBindWechat(userAuth != null);
}
// 是否有设置登录密码
vo.setHasPwd(StringUtils.isNotBlank(user.getPassword()));
return vo;
}

3
server/like-front/src/main/java/com/mdd/front/vo/login/LoginTokenVo.java
View File

@ -21,4 +21,7 @@ public class LoginTokenVo implements Serializable {
@ApiModelProperty(value = "登录令牌")
private String token;
@ApiModelProperty(value = "是否为新用户")
private Integer isNew;
}

2
server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java
View File

@ -43,5 +43,7 @@ public class UserCenterVo implements Serializable {
@ApiModelProperty(value = "是否绑定微信")
private Boolean isBindWechat;
@ApiModelProperty(value = "是否有设置登录密码")
private Boolean hasPwd;
}