From 430da5996397800918bb68c2519ef2f00291ba05 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Thu, 31 Oct 2024 09:24:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D=E5=92=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0IP=E5=9C=B0=E5=9D=80=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E5=9C=B0=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=88=A0=E9=99=A4loginUrl?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/maxkey/entity/history/HistoryLogin.java | 12 ------------ .../repository/LoginHistoryRepository.java | 6 +----- .../mapper/xml/mysql/HistoryLoginMapper.xml | 4 ++-- .../routes/access/sessions/sessions.component.html | 2 ++ .../audit/audit-logins/audit-logins.component.html | 4 +++- .../maxkey-web-app/src/assets/i18n/en-US.json | 1 + .../maxkey-web-app/src/assets/i18n/zh-CN.json | 1 + .../maxkey-web-app/src/assets/i18n/zh-TW.json | 1 + 8 files changed, 11 insertions(+), 20 deletions(-) diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java index 1679f0ca1..ecf2838b8 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/history/HistoryLogin.java @@ -79,8 +79,6 @@ public class HistoryLogin extends JpaEntity implements Serializable{ @Column String application; @Column - String loginUrl; - @Column Date loginTime; @Column Date logoutTime; @@ -234,14 +232,6 @@ public class HistoryLogin extends JpaEntity implements Serializable{ this.application = application; } - public String getLoginUrl() { - return loginUrl; - } - - public void setLoginUrl(String loginUrl) { - this.loginUrl = loginUrl; - } - public Date getLoginTime() { return loginTime; } @@ -335,8 +325,6 @@ public class HistoryLogin extends JpaEntity implements Serializable{ builder.append(platform); builder.append(", application="); builder.append(application); - builder.append(", loginUrl="); - builder.append(loginUrl); builder.append(", loginTime="); builder.append(loginTime); builder.append(", logoutTime="); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java index faa9e560d..4d66b1df3 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java @@ -47,10 +47,9 @@ public class LoginHistoryRepository { browser , platform , application , - loginurl , sessionstatus , instid) - values( ? , ? , ? , ? , ? , ? , ? , ? , ?, ? , ? , ? , ?, ?, ? , ? , ?, ? , ? , ?) + values( ? , ? , ? , ? , ? , ? , ? , ?, ? , ? , ? , ?, ?, ? , ? , ?, ? , ? , ?) """; protected JdbcTemplate jdbcTemplate; @@ -61,7 +60,6 @@ public class LoginHistoryRepository { public void login(HistoryLogin historyLogin) { historyLogin.setId(WebContext.genId()); - historyLogin.setLoginUrl(WebContext.getRequest().getRequestURI()); //Thread insert new Thread(new HistoryLoginRunnable(jdbcTemplate,historyLogin)).start(); } @@ -101,7 +99,6 @@ public class LoginHistoryRepository { historyLogin.getBrowser(), historyLogin.getPlatform(), "Browser", - historyLogin.getLoginUrl(), historyLogin.getSessionStatus(), historyLogin.getInstId() }, @@ -123,7 +120,6 @@ public class LoginHistoryRepository { Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, - Types.VARCHAR, Types.INTEGER, Types.VARCHAR }); diff --git a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml index ac5d35a92..2bb5d8002 100644 --- a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml +++ b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml @@ -50,10 +50,10 @@ code, provider, sourceip, + location, browser, platform, application, - loginurl, logintime, logouttime from mxk_history_login @@ -76,10 +76,10 @@ code, provider, sourceip, + location, browser, platform, application, - loginurl, logintime, logouttime from mxk_history_login diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html index 4f842f910..cc22dc71f 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/access/sessions/sessions.component.html @@ -73,6 +73,7 @@ {{ 'mxk.history.login.username' | i18n }} {{ 'mxk.history.login.displayName' | i18n }} {{ 'mxk.history.login.sourceIp' | i18n }} + {{ 'mxk.history.login.location' | i18n }} {{ 'mxk.history.login.browser' | i18n }} {{ 'mxk.history.login.platform' | i18n }} {{ 'mxk.history.login.loginTime' | i18n }} @@ -91,6 +92,7 @@ {{ data.username }} {{ data.displayName }} {{ data.sourceIp }} + {{ data.location }} {{ data.browser }} {{ data.platform }} {{ data.loginTime }} diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-logins/audit-logins.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-logins/audit-logins.component.html index 788dbd75f..3819c920f 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-logins/audit-logins.component.html +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/audit/audit-logins/audit-logins.component.html @@ -67,6 +67,7 @@ {{ 'mxk.history.login.message' | i18n }} {{ 'mxk.history.login.loginType' | i18n }} {{ 'mxk.history.login.sourceIp' | i18n }} + {{ 'mxk.history.login.location' | i18n }} {{ 'mxk.history.login.browser' | i18n }} {{ 'mxk.history.login.platform' | i18n }} {{ 'mxk.history.login.loginTime' | i18n }} @@ -80,9 +81,10 @@ {{ data.username }} {{ data.displayName }} - {{ data.provider }} + {{ data.message }} {{ data.loginType }} {{ data.sourceIp }} + {{ data.location }} {{ data.browser }} {{ data.platform }} {{ data.loginTime }} diff --git a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json index a3f3fb101..687402bdc 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json +++ b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json @@ -599,6 +599,7 @@ "login.message": "message", "login.loginType": "loginType", "login.sourceIp": "sourceIp", + "login.location": "location", "login.browser": "browser", "login.loginTime": "loginTime", "login.logoutTime": "logoutTime", diff --git a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json index 47eb6cf8c..c25d4cd83 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json +++ b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json @@ -603,6 +603,7 @@ "login.message": "状态", "login.loginType": "登录方式", "login.sourceIp": "访问地址", + "login.location": "归属地", "login.browser": "浏览器", "login.loginTime": "登录时间", "login.logoutTime": "退出时间", diff --git a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json index 92e3c0ed6..4de067c91 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json +++ b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json @@ -603,6 +603,7 @@ "login.message": "狀態", "login.loginType": "登錄方式", "login.sourceIp": "訪問地址", + "login.location": "归属地", "login.browser": "瀏覽器", "login.loginTime": "登錄時間", "login.logoutTime": "退出時間",