|
@@ -113,6 +113,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
|
|
public UserDTO getUserByLoginName(String loginName) {
|
|
public UserDTO getUserByLoginName(String loginName) {
|
|
QueryWrapper queryWrapper = new QueryWrapper ();
|
|
QueryWrapper queryWrapper = new QueryWrapper ();
|
|
queryWrapper.eq ("a.login_name", loginName);
|
|
queryWrapper.eq ("a.login_name", loginName);
|
|
|
|
+ queryWrapper.eq("a.del_flag","0");
|
|
UserDTO userDTO = baseMapper.get(queryWrapper);
|
|
UserDTO userDTO = baseMapper.get(queryWrapper);
|
|
|
|
|
|
final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
|
|
final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
|
|
@@ -128,7 +129,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
|
|
|
|
|
|
userDTO.setLoginTime(new Date());
|
|
userDTO.setLoginTime(new Date());
|
|
|
|
|
|
- userDTO.setIp(ip);
|
|
|
|
|
|
+ userDTO.setLoginIp(ip);
|
|
userDTO.setLoginLocation(address);
|
|
userDTO.setLoginLocation(address);
|
|
userDTO.setOs(os);
|
|
userDTO.setOs(os);
|
|
userDTO.setBrowser(browser);
|
|
userDTO.setBrowser(browser);
|