屏幕解锁+ 密码错误 也异地登录

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -1012,26 +1012,17 @@ namespace IRaCIS.Core.Application.Service
 
             var loginUser = await _identityUserRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
-            if (loginUser == null)
+            var existUserLoginInfo = await _identityUserRepository.Where(u => u.UserName == userName).Select(t => new { t.LastLoginIP, t.LastChangePassWordTime, t.Id }).FirstOrDefaultAsync();
-            {
 
-                //错误次数累加
+            var isExistAccount = existUserLoginInfo != null;
-                failCount++;
-                await _fusionCache.SetAsync(cacheKey, failCount, TimeSpan.FromMinutes(lockoutMinutes));
 
-                var errorPwdUserId = await _identityUserRepository.Where(u => u.UserName == userName).Select(t => t.Id).FirstOrDefaultAsync();
+            var isLoginUncommonly = false;
-
-                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionUserName = userName, LoginPassword = password, OptType = UserOptType.AccountOrPasswordError }, true);
-
-                return ResponseOutput.NotOk(_localizer["User_CheckNameOrPw"], new IRCLoginReturnDTO());
-
-            }
 
             //登录用户是系统用户的时候，就要要记录异地登录
 
-            #region 处理用户状态
+            //账号在系统存在
-
+            if (isExistAccount || loginUser != null)
-
+            {
                 var ipinfo = _searcher.Search(_userInfo.IP);
 
                 var iPRegion = string.Join('|', ipinfo.Split('|').TakeLast(3));
@@ -1042,25 +1033,65 @@ namespace IRaCIS.Core.Application.Service
                     return parts.Length >= 3 ? parts[0] + parts[1] : string.Join("", parts);
                 }
 
-            if (loginUser.LastLoginIP != string.Empty)
+                if (existUserLoginInfo.LastLoginIP != string.Empty)
                 {
                     // 与上一次区域不一致
-                if (SplitAndConcatenate(loginUser.LastLoginIP) != SplitAndConcatenate(iPRegion))
+                    if (SplitAndConcatenate(existUserLoginInfo.LastLoginIP) != SplitAndConcatenate(iPRegion))
                     {
+
+                        isLoginUncommonly = true;
+
+                        //设置上次登录的IP
+                        await _identityUserRepository.BatchUpdateNoTrackingAsync(x => x.Id == existUserLoginInfo.Id, x => new IdentityUser()
+                        {
+                            LastLoginIP = iPRegion,
+                            LastLoginTime = DateTime.Now
+
+                        });
+
+                        if (loginUser != null)
+                        {
+                            //异地登录
                             loginUser.LoginState = 2;
-                }
+
-            }
                             //超过90天没修改密码
                             if (_verifyConfig.CurrentValue.IsNeedChangePassWord && loginUser.LastChangePassWordTime != null && DateTime.Now.AddDays(-_verifyConfig.CurrentValue.ChangePassWordDays) > loginUser.LastChangePassWordTime.Value)
                             {
                                 loginUser.NeedChangePassWord = true;
                             }
+                        }
+                    }
+                }
+
+            }
+
+            if (loginUser == null)
+            {
+
+                //错误次数累加
+                failCount++;
+                await _fusionCache.SetAsync(cacheKey, failCount, TimeSpan.FromMinutes(lockoutMinutes));
+
+
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionUserName = userName, LoginPassword = password, OptType = UserOptType.AccountOrPasswordError }, true);
+
+
+                return ResponseOutput.NotOk(_localizer["User_CheckNameOrPw"], new IRCLoginReturnDTO());
+
+            }
+
+            #region 处理用户状态
+
+
+
+
+
 
             #endregion
 
             if (loginUser.Status == 0)
             {
-                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = loginUser.IdentityUserId, ActionUserName = userName, OptType = UserOptType.LoginLockedAccount, IsLoginUncommonly = (loginUser.LoginState == 2) }, true);
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = loginUser.IdentityUserId, ActionUserName = userName, OptType = UserOptType.LoginLockedAccount, IsLoginUncommonly = isLoginUncommonly }, true);
 
                 //---该用户已经被禁用。
                 return ResponseOutput.NotOk(_localizer["User_Disabled"], new IRCLoginReturnDTO());
@@ -1070,7 +1101,7 @@ namespace IRaCIS.Core.Application.Service
             await _fusionCache.SetAsync(cacheKey, 0, TimeSpan.FromMinutes(lockoutMinutes));
 
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = loginUser.IdentityUserId, OptType = UserOptType.Login, IsLoginUncommonly = (loginUser.LoginState == 2) }, true);
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = loginUser.IdentityUserId, OptType = UserOptType.Login, IsLoginUncommonly = isLoginUncommonly }, true);
 
             userLoginReturnModel.BasicInfo = loginUser;
 
@@ -1084,12 +1115,7 @@ namespace IRaCIS.Core.Application.Service
 
             }
 
-            await _identityUserRepository.BatchUpdateNoTrackingAsync(x => x.Id == loginUser.IdentityUserId, x => new IdentityUser()
-            {
-                LastLoginIP = iPRegion,
-                LastLoginTime = DateTime.Now
 
-            });
 
             //返回临时token
             userLoginReturnModel.JWTStr = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = loginUser.IdentityUserId, UserName = userName });
@@ -1112,7 +1138,7 @@ namespace IRaCIS.Core.Application.Service
                 userLoginReturnModel.BasicInfo.EMail = hiddenEmail;
 
                 //修改密码  || 90天修改密码再mfa 之前
-                if (userLoginReturnModel.BasicInfo.IsFirstAdd || userLoginReturnModel.BasicInfo.LoginState == 1)
+                if (userLoginReturnModel.BasicInfo.IsFirstAdd || userLoginReturnModel.BasicInfo.NeedChangePassWord)
                 {
                     //userLoginReturnModel.JWTStr = _tokenService.GetToken(userLoginReturnModel.BasicInfo);
                 }