From e6a92a479b766bf5c9d2a71eae95f5cab205295f Mon Sep 17 00:00:00 2001 From: mofung1 <2279254178@qq.com> Date: Wed, 29 Mar 2023 15:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=8F=8A=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/front/service/impl/LoginServiceImpl.java | 13 +++++++------ .../com/mdd/front/service/impl/UserServiceImpl.java | 5 ++++- .../java/com/mdd/front/vo/login/LoginTokenVo.java | 3 +++ .../java/com/mdd/front/vo/users/UserCenterVo.java | 2 ++ 4 files changed, 16 insertions(+), 7 deletions(-) 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 98018c99..31e83815 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 @@ -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() - .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() - .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; } 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 5573772f..a906a4a6 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 @@ -54,7 +54,7 @@ public class UserServiceImpl implements IUserService { @Override public UserCenterVo center(Integer userId, Integer terminal) { User user = userMapper.selectOne(new QueryWrapper() - .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; } diff --git a/server/like-front/src/main/java/com/mdd/front/vo/login/LoginTokenVo.java b/server/like-front/src/main/java/com/mdd/front/vo/login/LoginTokenVo.java index 259f18a4..9462711b 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/login/LoginTokenVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/login/LoginTokenVo.java @@ -21,4 +21,7 @@ public class LoginTokenVo implements Serializable { @ApiModelProperty(value = "登录令牌") private String token; + @ApiModelProperty(value = "是否为新用户") + private Integer isNew; + } diff --git a/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java b/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java index 686e9d90..81c4b128 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java @@ -43,5 +43,7 @@ public class UserCenterVo implements Serializable { @ApiModelProperty(value = "是否绑定微信") private Boolean isBindWechat; + @ApiModelProperty(value = "是否有设置登录密码") + private Boolean hasPwd; }