增加配置文件

handlers/auth.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"log/slog"
 	"net/http"
 	"time"
 
@@ -9,7 +10,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt/v5"
-	"golang.org/x/crypto/bcrypt"
 )
 
 var jwtSecret = []byte("your-secret-key-change-in-production")
@@ -54,16 +54,22 @@ func Login(c *gin.Context) {
 		return
 	}
 
-	if user.Status == 0 {
+	if user.Status == 0 || !user.IsActive {
 		c.JSON(http.StatusForbidden, gin.H{"error": "账号已被禁用"})
 		return
 	}
 
-	if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(req.Password)); err != nil {
+	// 使用 User 模型的 CheckPassword 方法
+	if !user.CheckPassword(req.Password) {
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "用户名或密码错误"})
 		return
 	}
 
+	// 记录登录信息
+	if err := user.RecordLogin(database.DB); err != nil {
+		slog.Warn("记录登录信息失败", "user_id", user.ID, "error", err)
+	}
+
 	// 生成 JWT
 	claims := Claims{
 		UserID:   user.ID,
@@ -85,12 +91,14 @@ func Login(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{
 		"token": tokenString,
 		"user": gin.H{
-			"id":       user.ID,
-			"username": user.Username,
-			"nickname": user.Nickname,
-			"email":    user.Email,
-			"role":     user.Role,
-			"avatar":   user.Avatar,
+			"id":            user.ID,
+			"username":      user.Username,
+			"nickname":      user.Nickname,
+			"email":         user.Email,
+			"role":          user.Role,
+			"avatar":        user.Avatar,
+			"last_login_at": user.LastLoginAt,
+			"login_count":   user.LoginCount,
 		},
 	})
 }
@@ -118,20 +126,20 @@ func Register(c *gin.Context) {
 		return
 	}
 
-	// 加密密码
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "密码加密失败"})
-		return
-	}
-
+	// 使用 User 模型的 SetPassword 方法
 	user := models.User{
 		Username: req.Username,
-		Password: string(hashedPassword),
 		Nickname: req.Nickname,
 		Email:    req.Email,
 		Role:     "user",
 		Status:   1,
+		IsActive: true,
+	}
+
+	// 加密密码
+	if err := user.SetPassword(req.Password); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "密码加密失败"})
+		return
 	}
 
 	if err := database.DB.Create(&user).Error; err != nil {
@@ -221,18 +229,18 @@ func ChangePassword(c *gin.Context) {
 		return
 	}
 
-	if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(req.OldPassword)); err != nil {
+	// 使用 User 模型的 CheckPassword 方法
+	if !user.CheckPassword(req.OldPassword) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "原密码错误"})
 		return
 	}
 
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.NewPassword), bcrypt.DefaultCost)
-	if err != nil {
+	// 使用 User 模型的 SetPassword 方法
+	if err := user.SetPassword(req.NewPassword); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "密码加密失败"})
 		return
 	}
 
-	user.Password = string(hashedPassword)
 	if err := database.DB.Save(&user).Error; err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "修改密码失败"})
 		return