From 3a613b5b231e1a73febd42b4ed446c005932e470 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Apr 2022 16:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxkj/admin/service/impl/SystemLoginServiceImpl.java | 9 ++++++++- .../src/main/java/com/hxkj/common/core/ServerResult.java | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java index a17bb29a..7e88fe61 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java @@ -66,7 +66,6 @@ public class SystemLoginServiceImpl implements ISystemLoginService { String newPWd = password + sysAdmin.getSalt(); String md5Pwd = ToolsUtil.makeMd5(newPWd); - System.out.println(md5Pwd); if (!md5Pwd.equals(sysAdmin.getPassword())) { this.recordLoginLog(sysAdmin.getId(), systemLoginParam.getUsername(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg()); throw new LoginException(HttpEnum.LOGIN_ACCOUNT_ERROR.getCode(), HttpEnum.LOGIN_ACCOUNT_ERROR.getMsg()); @@ -77,13 +76,21 @@ public class SystemLoginServiceImpl implements ISystemLoginService { sysAdmin.setLastLoginTime(System.currentTimeMillis() / 1000); systemAdminMapper.updateById(sysAdmin); + // 缓存登录信息 String token = ToolsUtil.makeToken(); RedisUtil.set(AdminConfig.backstageTokenKey+token, sysAdmin.getId(), 7200); iSystemAdminService.cacheAdminUserByUid(sysAdmin.getId()); + // 返回登录信息 Map response = new LinkedHashMap<>(); response.put("token", token); + // 更新登录信息 + sysAdmin.setLastLoginIp(HttpUtil.ip()); + sysAdmin.setLastLoginTime(TimeUtil.timestamp()); + systemAdminMapper.updateById(sysAdmin); + + // 记录登录日志 this.recordLoginLog(sysAdmin.getId(), systemLoginParam.getUsername(), ""); return response; diff --git a/like-framework/like-common/src/main/java/com/hxkj/common/core/ServerResult.java b/like-framework/like-common/src/main/java/com/hxkj/common/core/ServerResult.java index 0ceab337..031402dc 100644 --- a/like-framework/like-common/src/main/java/com/hxkj/common/core/ServerResult.java +++ b/like-framework/like-common/src/main/java/com/hxkj/common/core/ServerResult.java @@ -45,6 +45,7 @@ public class ServerResult { map.put("mem", this.mem); map.put("sys", this.sys); map.put("disk", this.disk); + map.put("jvm", this.jvm); return map; }