|
|
@@ -208,14 +208,14 @@ public class AdminUserServiceImpl extends MPJBaseServiceImpl<AdminUserMapper, Ad
|
|
|
// 用户名存入session,统一日志读取使用
|
|
|
StpUtil.getSession().set("mobilePhone", adminUser.getMobilePhone());
|
|
|
StpUtil.getSession().set("username", adminUser.getUsername());
|
|
|
- user.setLastLoginTime(LocalDateTime.now());
|
|
|
- user.setMobilePhone(user.getMobilePhone());
|
|
|
+ adminUser.setLastLoginTime(LocalDateTime.now());
|
|
|
+ adminUser.setMobilePhone(adminUser.getMobilePhone());
|
|
|
this.updateById(adminUser);
|
|
|
LOGGER.info("微信用户union:{},name:{},phone:{},id:{}登录", adminUser.getOpenId(), adminUser.getUsername(), adminUser.getMobilePhone(), adminUser.getId());
|
|
|
// token在cookie中有隐式返回,这里多做显式返回
|
|
|
- user.setPassword(null);
|
|
|
- user.setOpenId(null);
|
|
|
- return Map.of("user", user, "satoken", StpUtil.getTokenValue());
|
|
|
+ adminUser.setPassword(null);
|
|
|
+ adminUser.setOpenId(null);
|
|
|
+ return Map.of("user", adminUser, "satoken", StpUtil.getTokenValue());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -231,12 +231,11 @@ public class AdminUserServiceImpl extends MPJBaseServiceImpl<AdminUserMapper, Ad
|
|
|
// 用户名存入session,统一日志读取使用
|
|
|
StpUtil.getSession().set("mobilePhone", adminUser.getMobilePhone());
|
|
|
StpUtil.getSession().set("username", adminUser.getUsername());
|
|
|
- user.setLastLoginTime(LocalDateTime.now());
|
|
|
- user.setMobilePhone(user.getMobilePhone());
|
|
|
+ adminUser.setLastLoginTime(LocalDateTime.now());
|
|
|
this.updateById(adminUser);
|
|
|
- user.setPassword(null);
|
|
|
- user.setOpenId(null);
|
|
|
- return Map.of("user", user, "satoken", StpUtil.getTokenValue());
|
|
|
+ adminUser.setPassword(null);
|
|
|
+ adminUser.setOpenId(null);
|
|
|
+ return Map.of("user", adminUser, "satoken", StpUtil.getTokenValue());
|
|
|
}
|
|
|
}
|
|
|
}
|