Merge branch 'dev' into pre-production

blade-auth/pom.xml

@@ -122,6 +122,14 @@
 <!--            <artifactId>logpm-basicdata-api</artifactId>-->
 <!--            <version>3.2.0.RELEASE</version>-->
 <!--        </dependency>-->
+
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-log</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

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,