From f19e92e2dc4689acd1b8ed5ba5f3a83a5e52d8db Mon Sep 17 00:00:00 2001 From: shimingxy Date: Tue, 17 Dec 2024 09:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88LoginHistoryRepository=20=20?= =?UTF-8?q?=E5=88=B0=20HistoryLoginService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../realm/AbstractAuthenticationRealm.java | 6 +- .../realm/jdbc/JdbcAuthenticationRealm.java | 10 +- .../AuthnProviderAutoConfiguration.java | 6 - .../realm/AbstractAuthenticationRealm.java | 6 +- .../realm/jdbc/JdbcAuthenticationRealm.java | 10 +- .../AuthnProviderAutoConfiguration.java | 6 - .../repository/LoginHistoryRepository.java | 136 ------------------ .../service/HistoryLoginService.java | 2 + .../service/impl/HistoryLoginServiceImpl.java | 35 ++++- .../maxkey/autoconfigure/MaxKeyConfig.java | 6 +- .../maxkey/autoconfigure/MaxKeyMgtConfig.java | 6 +- .../autoconfigure/MaxKeyOpenApiConfig.java | 6 +- 12 files changed, 61 insertions(+), 174 deletions(-) delete mode 100644 maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java diff --git a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java index b5d3c2029..b55a530cb 100644 --- a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java @@ -28,9 +28,9 @@ import org.dromara.maxkey.entity.idm.Groups; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.ip2location.IpLocationParser; import org.dromara.maxkey.ip2location.Region; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.persistence.service.UserInfoService; import org.dromara.maxkey.web.WebConstants; import org.dromara.maxkey.web.WebContext; @@ -54,7 +54,7 @@ public abstract class AbstractAuthenticationRealm { protected LoginRepository loginRepository; - protected LoginHistoryRepository loginHistoryRepository; + protected HistoryLoginService historyLoginService; protected UserInfoService userInfoService; @@ -158,7 +158,7 @@ public abstract class AbstractAuthenticationRealm { historyLogin.setCity(ipRegion.getCity()); historyLogin.setLocation(ipRegion.getAddr()); } - loginHistoryRepository.login(historyLogin); + historyLoginService.login(historyLogin); loginRepository.updateLastLogin(userInfo); diff --git a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java index 2748fccec..2df4a9f0f 100644 --- a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java @@ -26,9 +26,9 @@ import org.dromara.maxkey.entity.ChangePassword; import org.dromara.maxkey.entity.cnf.CnfPasswordPolicy; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.ip2location.IpLocationParser; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.persistence.service.UserInfoService; import org.dromara.maxkey.web.WebConstants; import org.dromara.maxkey.web.WebContext; @@ -60,7 +60,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm { PasswordEncoder passwordEncoder, PasswordPolicyValidator passwordPolicyValidator, LoginRepository loginRepository, - LoginHistoryRepository loginHistoryRepository, + HistoryLoginService historyLoginService, UserInfoService userInfoService, IpLocationParser ipLocationParser, JdbcTemplate jdbcTemplate) { @@ -68,7 +68,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm { this.passwordEncoder =passwordEncoder; this.passwordPolicyValidator=passwordPolicyValidator; this.loginRepository = loginRepository; - this.loginHistoryRepository = loginHistoryRepository; + this.historyLoginService = historyLoginService; this.userInfoService = userInfoService; this.ipLocationParser = ipLocationParser; this.jdbcTemplate = jdbcTemplate; @@ -78,7 +78,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm { PasswordEncoder passwordEncoder, PasswordPolicyValidator passwordPolicyValidator, LoginRepository loginRepository, - LoginHistoryRepository loginHistoryRepository, + HistoryLoginService historyLoginService, UserInfoService userInfoService, IpLocationParser ipLocationParser, JdbcTemplate jdbcTemplate, @@ -86,7 +86,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm { this.passwordEncoder = passwordEncoder; this.passwordPolicyValidator = passwordPolicyValidator; this.loginRepository = loginRepository; - this.loginHistoryRepository = loginHistoryRepository; + this.historyLoginService = historyLoginService; this.userInfoService = userInfoService; this.ipLocationParser = ipLocationParser; this.jdbcTemplate = jdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java index 9c14b1563..9afdc6328 100644 --- a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java @@ -25,7 +25,6 @@ import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.password.sms.SmsOtpAuthnService; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; import org.slf4j.Logger; @@ -109,9 +108,4 @@ public class AuthnProviderAutoConfiguration { return new LoginRepository(jdbcTemplate); } - @Bean - LoginHistoryRepository loginHistoryRepository(JdbcTemplate jdbcTemplate) { - return new LoginHistoryRepository(jdbcTemplate); - } - } diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java index 17606140f..45990159c 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/AbstractAuthenticationRealm.java @@ -28,9 +28,9 @@ import org.dromara.maxkey.entity.idm.Groups; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.ip2location.IpLocationParser; import org.dromara.maxkey.ip2location.Region; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.persistence.service.UserInfoService; import org.dromara.maxkey.web.WebConstants; import org.dromara.maxkey.web.WebContext; @@ -54,7 +54,7 @@ public abstract class AbstractAuthenticationRealm { protected LoginRepository loginRepository; - protected LoginHistoryRepository loginHistoryRepository; + protected HistoryLoginService historyLoginService; protected UserInfoService userInfoService; @@ -158,7 +158,7 @@ public abstract class AbstractAuthenticationRealm { historyLogin.setCity(ipRegion.getCity()); historyLogin.setLocation(ipRegion.getAddr()); } - loginHistoryRepository.login(historyLogin); + historyLoginService.login(historyLogin); loginRepository.updateLastLogin(userInfo); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java index 2748fccec..2df4a9f0f 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java @@ -26,9 +26,9 @@ import org.dromara.maxkey.entity.ChangePassword; import org.dromara.maxkey.entity.cnf.CnfPasswordPolicy; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.ip2location.IpLocationParser; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.persistence.service.UserInfoService; import org.dromara.maxkey.web.WebConstants; import org.dromara.maxkey.web.WebContext; @@ -60,7 +60,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm { PasswordEncoder passwordEncoder, PasswordPolicyValidator passwordPolicyValidator, LoginRepository loginRepository, - LoginHistoryRepository loginHistoryRepository, + HistoryLoginService historyLoginService, UserInfoService userInfoService, IpLocationParser ipLocationParser, JdbcTemplate jdbcTemplate) { @@ -68,7 +68,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm { this.passwordEncoder =passwordEncoder; this.passwordPolicyValidator=passwordPolicyValidator; this.loginRepository = loginRepository; - this.loginHistoryRepository = loginHistoryRepository; + this.historyLoginService = historyLoginService; this.userInfoService = userInfoService; this.ipLocationParser = ipLocationParser; this.jdbcTemplate = jdbcTemplate; @@ -78,7 +78,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm { PasswordEncoder passwordEncoder, PasswordPolicyValidator passwordPolicyValidator, LoginRepository loginRepository, - LoginHistoryRepository loginHistoryRepository, + HistoryLoginService historyLoginService, UserInfoService userInfoService, IpLocationParser ipLocationParser, JdbcTemplate jdbcTemplate, @@ -86,7 +86,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm { this.passwordEncoder = passwordEncoder; this.passwordPolicyValidator = passwordPolicyValidator; this.loginRepository = loginRepository; - this.loginHistoryRepository = loginHistoryRepository; + this.historyLoginService = historyLoginService; this.userInfoService = userInfoService; this.ipLocationParser = ipLocationParser; this.jdbcTemplate = jdbcTemplate; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java index 74fd51406..6d03c42af 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java @@ -27,7 +27,6 @@ import org.dromara.maxkey.authn.support.rememberme.AbstractRemeberMeManager; import org.dromara.maxkey.authn.support.rememberme.JdbcRemeberMeManager; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.password.sms.SmsOtpAuthnService; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; import org.slf4j.Logger; @@ -143,11 +142,6 @@ public class AuthnProviderAutoConfiguration { return new LoginRepository(jdbcTemplate); } - @Bean - LoginHistoryRepository loginHistoryRepository(JdbcTemplate jdbcTemplate) { - return new LoginHistoryRepository(jdbcTemplate); - } - /** * remeberMeService . * @return 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 deleted file mode 100644 index c40a10cd2..000000000 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginHistoryRepository.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.dromara.maxkey.persistence.repository; - -import java.sql.Types; - -import org.apache.commons.lang3.StringUtils; -import org.dromara.maxkey.entity.history.HistoryLogin; -import org.dromara.maxkey.web.WebContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.jdbc.core.JdbcTemplate; - -public class LoginHistoryRepository { - private static Logger logger = LoggerFactory.getLogger(LoginHistoryRepository.class); - - private static final String HISTORY_LOGIN_INSERT_STATEMENT = """ - insert into mxk_history_login - ( id , - sessionid , - category , - userid , - username , - displayname , - logintype , - message , - code , - provider , - sourceip , - country , - province , - city , - location , - browser , - platform , - application , - sessionstatus , - instid) - values( ? , ? , ? , ? , ? , ? , ? , ?, ? , ? , ? , ?, ?, ? , ? , ?, ? , ? , ? , ?) - """; - - protected JdbcTemplate jdbcTemplate; - - public LoginHistoryRepository(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - } - - public void login(HistoryLogin historyLogin) { - historyLogin.setId(WebContext.genId()); - if(StringUtils.isBlank(historyLogin.getInstId())) { - historyLogin.setInstId("1"); - } - //Thread insert - new Thread(new HistoryLoginRunnable(jdbcTemplate,historyLogin)).start(); - } - - public class HistoryLoginRunnable implements Runnable{ - - JdbcTemplate jdbcTemplate; - - HistoryLogin historyLogin; - - public HistoryLoginRunnable(JdbcTemplate jdbcTemplate, HistoryLogin historyLogin) { - super(); - this.jdbcTemplate = jdbcTemplate; - this.historyLogin = historyLogin; - } - - @Override - public void run() { - logger.debug("History Login {}" , historyLogin); - - jdbcTemplate.update(HISTORY_LOGIN_INSERT_STATEMENT, - new Object[] { - historyLogin.getId(), - historyLogin.getSessionId(), - historyLogin.getCategory(), - historyLogin.getUserId(), - historyLogin.getUsername(), - historyLogin.getDisplayName(), - historyLogin.getLoginType(), - historyLogin.getMessage(), - historyLogin.getCode(), - historyLogin.getProvider(), - historyLogin.getSourceIp(), - historyLogin.getCountry(), - historyLogin.getProvince(), - historyLogin.getCity(), - historyLogin.getLocation(), - historyLogin.getBrowser(), - historyLogin.getPlatform(), - "Browser", - historyLogin.getSessionStatus(), - historyLogin.getInstId() - }, - new int[] { - Types.VARCHAR, - Types.VARCHAR, - Types.INTEGER, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.VARCHAR, - Types.INTEGER, - Types.VARCHAR - }); - } - } - -} diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java index fc1022c4b..e0abe09b2 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java @@ -24,4 +24,6 @@ import org.dromara.mybatis.jpa.entity.JpaPageResults; public interface HistoryLoginService extends IJpaService{ public JpaPageResults queryOnlineSession(HistoryLogin historyLogin); + + public void login(HistoryLogin historyLogin); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginServiceImpl.java index d455fc7e1..e767e37d0 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginServiceImpl.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginServiceImpl.java @@ -17,17 +17,50 @@ package org.dromara.maxkey.persistence.service.impl; +import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.entity.history.HistoryLogin; import org.dromara.maxkey.persistence.mapper.HistoryLoginMapper; import org.dromara.maxkey.persistence.service.HistoryLoginService; +import org.dromara.maxkey.web.WebContext; import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository public class HistoryLoginServiceImpl extends JpaServiceImpl implements HistoryLoginService{ - + private static Logger logger = LoggerFactory.getLogger(HistoryLoginServiceImpl.class); + public JpaPageResults queryOnlineSession(HistoryLogin historyLogin) { return this.fetchPageResults("queryOnlineSession",historyLogin); } + + public void login(HistoryLogin historyLogin) { + historyLogin.setId(WebContext.genId()); + if(StringUtils.isBlank(historyLogin.getInstId())) { + historyLogin.setInstId("1"); + } + //Thread insert + new Thread(new HistoryLoginRunnable(this,historyLogin)).start(); + } + + public class HistoryLoginRunnable implements Runnable{ + + HistoryLoginService historyLoginService; + + HistoryLogin historyLogin; + + public HistoryLoginRunnable(HistoryLoginService historyLoginService, HistoryLogin historyLogin) { + super(); + this.historyLoginService = historyLoginService; + this.historyLogin = historyLogin; + } + + @Override + public void run() { + logger.debug("History Login {}" , historyLogin); + this.historyLoginService.insert(historyLogin); + } + } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyConfig.java index 5d089a761..044777f31 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyConfig.java @@ -42,10 +42,10 @@ import org.dromara.maxkey.password.onetimepwd.impl.MailOtpAuthn; import org.dromara.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; import org.dromara.maxkey.password.onetimepwd.token.RedisOtpTokenStore; import org.dromara.maxkey.persistence.redis.RedisConnectionFactory; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; import org.dromara.maxkey.persistence.service.CnfLdapContextService; +import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.persistence.service.UserInfoService; import org.dromara.maxkey.schedule.ScheduleAdapterBuilder; import org.quartz.Scheduler; @@ -90,7 +90,7 @@ public class MaxKeyConfig { @Qualifier("passwordEncoder") PasswordEncoder passwordEncoder, PasswordPolicyValidator passwordPolicyValidator, LoginRepository loginService, - LoginHistoryRepository loginHistoryService, + HistoryLoginService historyLoginService, UserInfoService userInfoService, IpLocationParser ipLocationParser, JdbcTemplate jdbcTemplate, @@ -101,7 +101,7 @@ public class MaxKeyConfig { passwordEncoder, passwordPolicyValidator, loginService, - loginHistoryService, + historyLoginService, userInfoService, ipLocationParser, jdbcTemplate, diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java index 1523563bd..db49d048b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java @@ -21,9 +21,9 @@ import org.dromara.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; import org.dromara.maxkey.ip2location.IpLocationParser; import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.dromara.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +44,7 @@ public class MaxKeyMgtConfig { PasswordEncoder passwordEncoder, PasswordPolicyValidator passwordPolicyValidator, LoginRepository loginRepository, - LoginHistoryRepository loginHistoryRepository, + HistoryLoginService historyLoginService, UserInfoService userInfoService, IpLocationParser ipLocationParser, JdbcTemplate jdbcTemplate) { @@ -53,7 +53,7 @@ public class MaxKeyMgtConfig { passwordEncoder, passwordPolicyValidator, loginRepository, - loginHistoryRepository, + historyLoginService, userInfoService, ipLocationParser, jdbcTemplate); diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiConfig.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiConfig.java index 948e54fc9..3f401da8f 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiConfig.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiConfig.java @@ -21,9 +21,9 @@ import org.dromara.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; import org.dromara.maxkey.ip2location.IpLocationParser; import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.dromara.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; -import org.dromara.maxkey.persistence.repository.LoginHistoryRepository; import org.dromara.maxkey.persistence.repository.LoginRepository; import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator; +import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.persistence.service.UserInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +44,7 @@ public class MaxKeyOpenApiConfig{ PasswordEncoder passwordEncoder, PasswordPolicyValidator passwordPolicyValidator, LoginRepository loginRepository, - LoginHistoryRepository loginHistoryRepository, + HistoryLoginService historyLoginService, UserInfoService userInfoService, IpLocationParser ipLocationParser, JdbcTemplate jdbcTemplate) { @@ -53,7 +53,7 @@ public class MaxKeyOpenApiConfig{ passwordEncoder, passwordPolicyValidator, loginRepository, - loginHistoryRepository, + historyLoginService, userInfoService, ipLocationParser, jdbcTemplate);