From a7bbd32e55832214f5d6160be8dcba31db35bcfa Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 10 Oct 2024 16:39:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-auth/pom.xml | 8 ++++++++ .../auth/service/BladeUserDetailsServiceImpl.java | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index c758dcd6..5f180ba4 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -122,6 +122,14 @@ + + + + org.springblade + blade-log + ${bladex.project.version} + + diff --git a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java index 02d06f99..eec23507 100644 --- a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java +++ b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java @@ -31,6 +31,8 @@ import org.springblade.auth.utils.TokenUtil; import org.springblade.common.cache.CacheNames; import org.springblade.core.jwt.JwtUtil; import org.springblade.core.jwt.props.JwtProperties; +import org.springblade.core.log.feign.ILogClient; +import org.springblade.core.log.model.LogUsual; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; @@ -71,6 +73,8 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService { private final BladeRedis bladeRedis; private final JwtProperties jwtProperties; + private final ILogClient logClient; + // private final IBasicdataWarehouseClient basicdataWarehouseClient; @Override @@ -175,7 +179,9 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService { // 成功则清除登录错误次数 delFailCount(tenantId, username); - + LogUsual logUsual = new LogUsual(); + logUsual.setTenantId(tenantId); + logClient.saveUsualLog(logUsual);// 记录登录日志 BladeUserDetails bladeUserDetails = new BladeUserDetails(user.getId(), user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR), username, AuthConstant.ENCRYPT + user.getPassword(), userInfo.getDetail(), true, true, true, true,