From 34e27dffca7435f14fc4c8a2a73ad5613bc77c40 Mon Sep 17 00:00:00 2001
From: mlogclub <mlog1@qq.com>
Date: Thu, 30 Apr 2026 17:57:28 +0800
Subject: [PATCH] fix(auth): align lockout check ordering

---
 internal/services/auth_service.go      | 9 +++------
 internal/services/auth_service_test.go | 7 +++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/internal/services/auth_service.go b/internal/services/auth_service.go
index 7f35ba2..bcf5966 100644
--- a/internal/services/auth_service.go
+++ b/internal/services/auth_service.go
@@ -86,15 +86,12 @@ func (s *authService) Login(req request.LoginRequest, authCfg config.AuthConfig,
 		return nil, errorsx.InvalidParam("用户名和密码不能为空")
 	}
 
-	user := UserService.GetByUsername(username)
 	if s.isCredentialLocked(username, authCfg) {
-		userID := int64(0)
-		if user != nil {
-			userID = user.ID
-		}
-		_ = s.createLoginCredentialLog(username, userID, false, clientIP, userAgent, "credential locked")
+		_ = s.createLoginCredentialLog(username, 0, false, clientIP, userAgent, "credential locked")
 		return nil, errorsx.CredentialLocked("登录失败次数过多，请稍后再试")
 	}
+
+	user := UserService.GetByUsername(username)
 	if user == nil || user.Status != enums.StatusOk {
 		_ = s.createLoginCredentialLog(username, 0, false, clientIP, userAgent, "user not found")
 		return nil, errorsx.InvalidAccount("用户名或密码错误")
diff --git a/internal/services/auth_service_test.go b/internal/services/auth_service_test.go
index 4c85e49..ac2acf7 100644
--- a/internal/services/auth_service_test.go
+++ b/internal/services/auth_service_test.go
@@ -324,6 +324,13 @@ func setupAuthServiceTestDB(t *testing.T) *gorm.DB {
 		t.Fatalf("migrate auth tables: %v", err)
 	}
 	sqls.SetDB(db)
+	t.Cleanup(func() {
+		sqls.SetDB(nil)
+		sqlDB, err := db.DB()
+		if err == nil {
+			_ = sqlDB.Close()
+		}
+	})
 	return db
 }