feat: 添加种子数据初始化功能，重构多个处理程序以简化错误响应和用户验证

internal/repository/helpers.go

@@ -0,0 +1,82 @@
+package repository
+
+import (
+	"carrotskin/pkg/database"
+	"errors"
+
+	"gorm.io/gorm"
+)
+
+// getDB 获取数据库连接（内部使用）
+func getDB() *gorm.DB {
+	return database.MustGetDB()
+}
+
+// IsNotFound 检查是否为记录未找到错误
+func IsNotFound(err error) bool {
+	return errors.Is(err, gorm.ErrRecordNotFound)
+}
+
+// HandleNotFound 处理记录未找到的情况，未找到时返回 nil, nil
+func HandleNotFound[T any](result *T, err error) (*T, error) {
+	if err != nil {
+		if IsNotFound(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return result, nil
+}
+
+// Paginate 创建分页查询
+func Paginate(page, pageSize int) func(db *gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+		if page < 1 {
+			page = 1
+		}
+		if pageSize < 1 {
+			pageSize = 20
+		}
+		if pageSize > 100 {
+			pageSize = 100
+		}
+		offset := (page - 1) * pageSize
+		return db.Offset(offset).Limit(pageSize)
+	}
+}
+
+// PaginatedQuery 执行分页查询，返回列表和总数
+func PaginatedQuery[T any](
+	baseQuery *gorm.DB,
+	page, pageSize int,
+	orderBy string,
+	preloads ...string,
+) ([]T, int64, error) {
+	var items []T
+	var total int64
+
+	// 获取总数
+	if err := baseQuery.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	// 分页查询
+	query := baseQuery.Scopes(Paginate(page, pageSize))
+
+	// 添加排序
+	if orderBy != "" {
+		query = query.Order(orderBy)
+	}
+
+	// 添加预加载
+	for _, preload := range preloads {
+		query = query.Preload(preload)
+	}
+
+	if err := query.Find(&items).Error; err != nil {
+		return nil, 0, err
+	}
+
+	return items, total, nil
+}
+

internal/repository/profile_repository.go

@@ -2,7 +2,6 @@ package repository
 
 import (
 	"carrotskin/internal/model"
-	"carrotskin/pkg/database"
 	"context"
 	"errors"
 	"fmt"
@@ -12,15 +11,13 @@ import (
 
 // CreateProfile 创建档案
 func CreateProfile(profile *model.Profile) error {
-	db := database.MustGetDB()
-	return db.Create(profile).Error
+	return getDB().Create(profile).Error
 }
 
 // FindProfileByUUID 根据UUID查找档案
 func FindProfileByUUID(uuid string) (*model.Profile, error) {
-	db := database.MustGetDB()
 	var profile model.Profile
-	err := db.Where("uuid = ?", uuid).
+	err := getDB().Where("uuid = ?", uuid).
 		Preload("Skin").
 		Preload("Cape").
 		First(&profile).Error
@@ -32,9 +29,8 @@ func FindProfileByUUID(uuid string) (*model.Profile, error) {
 
 // FindProfileByName 根据角色名查找档案
 func FindProfileByName(name string) (*model.Profile, error) {
-	db := database.MustGetDB()
 	var profile model.Profile
-	err := db.Where("name = ?", name).First(&profile).Error
+	err := getDB().Where("name = ?", name).First(&profile).Error
 	if err != nil {
 		return nil, err
 	}
@@ -43,44 +39,36 @@ func FindProfileByName(name string) (*model.Profile, error) {
 
 // FindProfilesByUserID 获取用户的所有档案
 func FindProfilesByUserID(userID int64) ([]*model.Profile, error) {
-	db := database.MustGetDB()
 	var profiles []*model.Profile
-	err := db.Where("user_id = ?", userID).
+	err := getDB().Where("user_id = ?", userID).
 		Preload("Skin").
 		Preload("Cape").
 		Order("created_at DESC").
 		Find(&profiles).Error
-	if err != nil {
-		return nil, err
-	}
-	return profiles, nil
+	return profiles, err
 }
 
 // UpdateProfile 更新档案
 func UpdateProfile(profile *model.Profile) error {
-	db := database.MustGetDB()
-	return db.Save(profile).Error
+	return getDB().Save(profile).Error
 }
 
 // UpdateProfileFields 更新指定字段
 func UpdateProfileFields(uuid string, updates map[string]interface{}) error {
-	db := database.MustGetDB()
-	return db.Model(&model.Profile{}).
+	return getDB().Model(&model.Profile{}).
 		Where("uuid = ?", uuid).
 		Updates(updates).Error
 }
 
 // DeleteProfile 删除档案
 func DeleteProfile(uuid string) error {
-	db := database.MustGetDB()
-	return db.Where("uuid = ?", uuid).Delete(&model.Profile{}).Error
+	return getDB().Where("uuid = ?", uuid).Delete(&model.Profile{}).Error
 }
 
 // CountProfilesByUserID 统计用户的档案数量
 func CountProfilesByUserID(userID int64) (int64, error) {
-	db := database.MustGetDB()
 	var count int64
-	err := db.Model(&model.Profile{}).
+	err := getDB().Model(&model.Profile{}).
 		Where("user_id = ?", userID).
 		Count(&count).Error
 	return count, err
@@ -88,30 +76,22 @@ func CountProfilesByUserID(userID int64) (int64, error) {
 
 // SetActiveProfile 设置档案为活跃状态（同时将用户的其他档案设置为非活跃）
 func SetActiveProfile(uuid string, userID int64) error {
-	db := database.MustGetDB()
-	return db.Transaction(func(tx *gorm.DB) error {
-		// 将用户的所有档案设置为非活跃
+	return getDB().Transaction(func(tx *gorm.DB) error {
 		if err := tx.Model(&model.Profile{}).
 			Where("user_id = ?", userID).
 			Update("is_active", false).Error; err != nil {
 			return err
 		}
 
-		// 将指定档案设置为活跃
-		if err := tx.Model(&model.Profile{}).
+		return tx.Model(&model.Profile{}).
 			Where("uuid = ? AND user_id = ?", uuid, userID).
-			Update("is_active", true).Error; err != nil {
-			return err
-		}
-
-		return nil
+			Update("is_active", true).Error
 	})
 }
 
 // UpdateProfileLastUsedAt 更新最后使用时间
 func UpdateProfileLastUsedAt(uuid string) error {
-	db := database.MustGetDB()
-	return db.Model(&model.Profile{}).
+	return getDB().Model(&model.Profile{}).
 		Where("uuid = ?", uuid).
 		Update("last_used_at", gorm.Expr("CURRENT_TIMESTAMP")).Error
 }
@@ -122,53 +102,40 @@ func FindOneProfileByUserID(userID int64) (*model.Profile, error) {
 	if err != nil {
 		return nil, err
 	}
-	profile := profiles[0]
-	return profile, nil
+	if len(profiles) == 0 {
+		return nil, errors.New("未找到角色")
+	}
+	return profiles[0], nil
 }
 
 func GetProfilesByNames(names []string) ([]*model.Profile, error) {
-	db := database.MustGetDB()
 	var profiles []*model.Profile
-	err := db.Where("name in (?)", names).Find(&profiles).Error
-	if err != nil {
-		return nil, err
-	}
-	return profiles, nil
+	err := getDB().Where("name in (?)", names).Find(&profiles).Error
+	return profiles, err
 }
 
 func GetProfileKeyPair(profileId string) (*model.KeyPair, error) {
-	db := database.MustGetDB()
-	// 1. 参数校验（保持原逻辑）
 	if profileId == "" {
 		return nil, errors.New("参数不能为空")
 	}
 
-	// 2. GORM 查询：只查询 key_pair 字段（对应原 mongo 投影）
-	var profile *model.Profile
-	// 条件：id = profileId（PostgreSQL 主键），只选择 key_pair 字段
-	result := db.WithContext(context.Background()).
-		Select("key_pair"). // 只查询需要的字段（投影）
-		Where("id = ?", profileId). // 查询条件（GORM 自动处理占位符，避免 SQL 注入）
-		First(&profile) // 查单条记录
+	var profile model.Profile
+	result := getDB().WithContext(context.Background()).
+		Select("key_pair").
+		Where("id = ?", profileId).
+		First(&profile)
 
-	// 3. 错误处理（适配 GORM 错误类型）
 	if result.Error != nil {
-		// 空结果判断（对应原 mongo.ErrNoDocuments / pgx.ErrNoRows）
-		if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+		if IsNotFound(result.Error) {
 			return nil, errors.New("key pair未找到")
 		}
-		// 保持原错误封装格式
 		return nil, fmt.Errorf("获取key pair失败: %w", result.Error)
 	}
 
-	// 4. JSONB 反序列化为 model.KeyPair
-	keyPair := &model.KeyPair{}
-	return keyPair, nil
+	return &model.KeyPair{}, nil
 }
 
 func UpdateProfileKeyPair(profileId string, keyPair *model.KeyPair) error {
-	db := database.MustGetDB()
-	// 仅保留最必要的入参校验（避免无效数据库请求）
 	if profileId == "" {
 		return errors.New("profileId 不能为空")
 	}
@@ -176,24 +143,18 @@ func UpdateProfileKeyPair(profileId string, keyPair *model.KeyPair) error {
 		return errors.New("keyPair 不能为 nil")
 	}
 
-	// 事务内执行核心更新（保证原子性，出错自动回滚）
-	return db.Transaction(func(tx *gorm.DB) error {
-		// 核心更新逻辑：按 profileId 匹配，直接更新 key_pair 相关字段
+	return getDB().Transaction(func(tx *gorm.DB) error {
 		result := tx.WithContext(context.Background()).
-			Table("profiles"). // 目标表名（与 PostgreSQL 表一致）
-			Where("id = ?", profileId). // 更新条件：profileId 匹配
-			// 直接映射字段（无需序列化，依赖 GORM 自动字段匹配）
+			Table("profiles").
+			Where("id = ?", profileId).
 			UpdateColumns(map[string]interface{}{
-				"private_key": keyPair.PrivateKey, // 数据库 private_key 字段
-				"public_key":  keyPair.PublicKey,  // 数据库 public_key 字段
-				// 若 key_pair 是单个字段（非拆分），替换为："key_pair": keyPair
+				"private_key": keyPair.PrivateKey,
+				"public_key":  keyPair.PublicKey,
 			})
 
-		// 仅处理数据库层面的致命错误
 		if result.Error != nil {
 			return fmt.Errorf("更新 keyPair 失败: %w", result.Error)
 		}
-
 		return nil
 	})
 }

internal/repository/system_config_repository.go

@@ -2,56 +2,35 @@ package repository
 
 import (
 	"carrotskin/internal/model"
-	"carrotskin/pkg/database"
-	"errors"
-
-	"gorm.io/gorm"
 )
 
 // GetSystemConfigByKey 根据键获取配置
 func GetSystemConfigByKey(key string) (*model.SystemConfig, error) {
-	db := database.MustGetDB()
 	var config model.SystemConfig
-	err := db.Where("key = ?", key).First(&config).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &config, nil
+	err := getDB().Where("key = ?", key).First(&config).Error
+	return HandleNotFound(&config, err)
 }
 
 // GetPublicSystemConfigs 获取所有公开配置
 func GetPublicSystemConfigs() ([]model.SystemConfig, error) {
-	db := database.MustGetDB()
 	var configs []model.SystemConfig
-	err := db.Where("is_public = ?", true).Find(&configs).Error
-	if err != nil {
-		return nil, err
-	}
-	return configs, nil
+	err := getDB().Where("is_public = ?", true).Find(&configs).Error
+	return configs, err
 }
 
 // GetAllSystemConfigs 获取所有配置（管理员用）
 func GetAllSystemConfigs() ([]model.SystemConfig, error) {
-	db := database.MustGetDB()
 	var configs []model.SystemConfig
-	err := db.Find(&configs).Error
-	if err != nil {
-		return nil, err
-	}
-	return configs, nil
+	err := getDB().Find(&configs).Error
+	return configs, err
 }
 
 // UpdateSystemConfig 更新配置
 func UpdateSystemConfig(config *model.SystemConfig) error {
-	db := database.MustGetDB()
-	return db.Save(config).Error
+	return getDB().Save(config).Error
 }
 
 // UpdateSystemConfigValue 更新配置值
 func UpdateSystemConfigValue(key, value string) error {
-	db := database.MustGetDB()
-	return db.Model(&model.SystemConfig{}).Where("key = ?", key).Update("value", value).Error
+	return getDB().Model(&model.SystemConfig{}).Where("key = ?", key).Update("value", value).Error
 }

internal/repository/texture_repository.go

@@ -2,63 +2,44 @@ package repository
 
 import (
 	"carrotskin/internal/model"
-	"carrotskin/pkg/database"
+
 	"gorm.io/gorm"
 )
 
 // CreateTexture 创建材质
 func CreateTexture(texture *model.Texture) error {
-	db := database.MustGetDB()
-	return db.Create(texture).Error
+	return getDB().Create(texture).Error
 }
 
 // FindTextureByID 根据ID查找材质
 func FindTextureByID(id int64) (*model.Texture, error) {
-	db := database.MustGetDB()
 	var texture model.Texture
-	err := db.Preload("Uploader").First(&texture, id).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &texture, nil
+	err := getDB().Preload("Uploader").First(&texture, id).Error
+	return HandleNotFound(&texture, err)
 }
 
 // FindTextureByHash 根据Hash查找材质
 func FindTextureByHash(hash string) (*model.Texture, error) {
-	db := database.MustGetDB()
 	var texture model.Texture
-	err := db.Where("hash = ?", hash).First(&texture).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &texture, nil
+	err := getDB().Where("hash = ?", hash).First(&texture).Error
+	return HandleNotFound(&texture, err)
 }
 
 // FindTexturesByUploaderID 根据上传者ID查找材质列表
 func FindTexturesByUploaderID(uploaderID int64, page, pageSize int) ([]*model.Texture, int64, error) {
-	db := database.MustGetDB()
+	db := getDB()
 	var textures []*model.Texture
 	var total int64
 
 	query := db.Model(&model.Texture{}).Where("uploader_id = ? AND status != -1", uploaderID)
 
-	// 获取总数
 	if err := query.Count(&total).Error; err != nil {
 		return nil, 0, err
 	}
 
-	// 分页查询
-	offset := (page - 1) * pageSize
-	err := query.Preload("Uploader").
+	err := query.Scopes(Paginate(page, pageSize)).
+		Preload("Uploader").
 		Order("created_at DESC").
-		Offset(offset).
-		Limit(pageSize).
 		Find(&textures).Error
 
 	if err != nil {
@@ -70,38 +51,29 @@ func FindTexturesByUploaderID(uploaderID int64, page, pageSize int) ([]*model.Te
 
 // SearchTextures 搜索材质
 func SearchTextures(keyword string, textureType model.TextureType, publicOnly bool, page, pageSize int) ([]*model.Texture, int64, error) {
-	db := database.MustGetDB()
+	db := getDB()
 	var textures []*model.Texture
 	var total int64
 
 	query := db.Model(&model.Texture{}).Where("status = 1")
 
-	// 公开筛选
 	if publicOnly {
 		query = query.Where("is_public = ?", true)
 	}
-
-	// 类型筛选
 	if textureType != "" {
 		query = query.Where("type = ?", textureType)
 	}
-
-	// 关键词搜索
 	if keyword != "" {
 		query = query.Where("name LIKE ? OR description LIKE ?", "%"+keyword+"%", "%"+keyword+"%")
 	}
 
-	// 获取总数
 	if err := query.Count(&total).Error; err != nil {
 		return nil, 0, err
 	}
 
-	// 分页查询
-	offset := (page - 1) * pageSize
-	err := query.Preload("Uploader").
+	err := query.Scopes(Paginate(page, pageSize)).
+		Preload("Uploader").
 		Order("created_at DESC").
-		Offset(offset).
-		Limit(pageSize).
 		Find(&textures).Error
 
 	if err != nil {
@@ -113,86 +85,72 @@ func SearchTextures(keyword string, textureType model.TextureType, publicOnly bo
 
 // UpdateTexture 更新材质
 func UpdateTexture(texture *model.Texture) error {
-	db := database.MustGetDB()
-	return db.Save(texture).Error
+	return getDB().Save(texture).Error
 }
 
 // UpdateTextureFields 更新材质指定字段
 func UpdateTextureFields(id int64, fields map[string]interface{}) error {
-	db := database.MustGetDB()
-	return db.Model(&model.Texture{}).Where("id = ?", id).Updates(fields).Error
+	return getDB().Model(&model.Texture{}).Where("id = ?", id).Updates(fields).Error
 }
 
 // DeleteTexture 删除材质（软删除）
 func DeleteTexture(id int64) error {
-	db := database.MustGetDB()
-	return db.Model(&model.Texture{}).Where("id = ?", id).Update("status", -1).Error
+	return getDB().Model(&model.Texture{}).Where("id = ?", id).Update("status", -1).Error
 }
 
 // IncrementTextureDownloadCount 增加下载次数
 func IncrementTextureDownloadCount(id int64) error {
-	db := database.MustGetDB()
-	return db.Model(&model.Texture{}).Where("id = ?", id).
+	return getDB().Model(&model.Texture{}).Where("id = ?", id).
 		UpdateColumn("download_count", gorm.Expr("download_count + ?", 1)).Error
 }
 
 // IncrementTextureFavoriteCount 增加收藏次数
 func IncrementTextureFavoriteCount(id int64) error {
-	db := database.MustGetDB()
-	return db.Model(&model.Texture{}).Where("id = ?", id).
+	return getDB().Model(&model.Texture{}).Where("id = ?", id).
 		UpdateColumn("favorite_count", gorm.Expr("favorite_count + ?", 1)).Error
 }
 
 // DecrementTextureFavoriteCount 减少收藏次数
 func DecrementTextureFavoriteCount(id int64) error {
-	db := database.MustGetDB()
-	return db.Model(&model.Texture{}).Where("id = ?", id).
+	return getDB().Model(&model.Texture{}).Where("id = ?", id).
 		UpdateColumn("favorite_count", gorm.Expr("favorite_count - ?", 1)).Error
 }
 
 // CreateTextureDownloadLog 创建下载日志
 func CreateTextureDownloadLog(log *model.TextureDownloadLog) error {
-	db := database.MustGetDB()
-	return db.Create(log).Error
+	return getDB().Create(log).Error
 }
 
 // IsTextureFavorited 检查是否已收藏
 func IsTextureFavorited(userID, textureID int64) (bool, error) {
-	db := database.MustGetDB()
 	var count int64
-	err := db.Model(&model.UserTextureFavorite{}).
+	err := getDB().Model(&model.UserTextureFavorite{}).
 		Where("user_id = ? AND texture_id = ?", userID, textureID).
 		Count(&count).Error
-	if err != nil {
-		return false, err
-	}
-	return count > 0, nil
+	return count > 0, err
 }
 
 // AddTextureFavorite 添加收藏
 func AddTextureFavorite(userID, textureID int64) error {
-	db := database.MustGetDB()
 	favorite := &model.UserTextureFavorite{
 		UserID:    userID,
 		TextureID: textureID,
 	}
-	return db.Create(favorite).Error
+	return getDB().Create(favorite).Error
 }
 
 // RemoveTextureFavorite 取消收藏
 func RemoveTextureFavorite(userID, textureID int64) error {
-	db := database.MustGetDB()
-	return db.Where("user_id = ? AND texture_id = ?", userID, textureID).
+	return getDB().Where("user_id = ? AND texture_id = ?", userID, textureID).
 		Delete(&model.UserTextureFavorite{}).Error
 }
 
 // GetUserTextureFavorites 获取用户收藏的材质列表
 func GetUserTextureFavorites(userID int64, page, pageSize int) ([]*model.Texture, int64, error) {
-	db := database.MustGetDB()
+	db := getDB()
 	var textures []*model.Texture
 	var total int64
 
-	// 子查询获取收藏的材质ID
 	subQuery := db.Model(&model.UserTextureFavorite{}).
 		Select("texture_id").
 		Where("user_id = ?", userID)
@@ -200,17 +158,13 @@ func GetUserTextureFavorites(userID int64, page, pageSize int) ([]*model.Texture
 	query := db.Model(&model.Texture{}).
 		Where("id IN (?) AND status = 1", subQuery)
 
-	// 获取总数
 	if err := query.Count(&total).Error; err != nil {
 		return nil, 0, err
 	}
 
-	// 分页查询
-	offset := (page - 1) * pageSize
-	err := query.Preload("Uploader").
+	err := query.Scopes(Paginate(page, pageSize)).
+		Preload("Uploader").
 		Order("created_at DESC").
-		Offset(offset).
-		Limit(pageSize).
 		Find(&textures).Error
 
 	if err != nil {
@@ -222,9 +176,8 @@ func GetUserTextureFavorites(userID int64, page, pageSize int) ([]*model.Texture
 
 // CountTexturesByUploaderID 统计用户上传的材质数量
 func CountTexturesByUploaderID(uploaderID int64) (int64, error) {
-	db := database.MustGetDB()
 	var count int64
-	err := db.Model(&model.Texture{}).
+	err := getDB().Model(&model.Texture{}).
 		Where("uploader_id = ? AND status != -1", uploaderID).
 		Count(&count).Error
 	return count, err

internal/repository/token_repository.go

@@ -2,48 +2,38 @@ package repository
 
 import (
 	"carrotskin/internal/model"
-	"carrotskin/pkg/database"
 )
 
 func CreateToken(token *model.Token) error {
-	db := database.MustGetDB()
-	return db.Create(token).Error
+	return getDB().Create(token).Error
 }
 
 func GetTokensByUserId(userId int64) ([]*model.Token, error) {
-	db := database.MustGetDB()
-	tokens := make([]*model.Token, 0)
-	err := db.Where("user_id = ?", userId).Find(&tokens).Error
-	if err != nil {
-		return nil, err
-	}
-	return tokens, nil
+	var tokens []*model.Token
+	err := getDB().Where("user_id = ?", userId).Find(&tokens).Error
+	return tokens, err
 }
 
 func BatchDeleteTokens(tokensToDelete []string) (int64, error) {
-	db := database.MustGetDB()
 	if len(tokensToDelete) == 0 {
-		return 0, nil // 无需要删除的令牌，直接返回
+		return 0, nil
 	}
-	result := db.Where("access_token IN ?", tokensToDelete).Delete(&model.Token{})
-
+	result := getDB().Where("access_token IN ?", tokensToDelete).Delete(&model.Token{})
 	return result.RowsAffected, result.Error
 }
 
 func FindTokenByID(accessToken string) (*model.Token, error) {
-	db := database.MustGetDB()
-	var tokens []*model.Token
-	err := db.Where("_id = ?", accessToken).Find(&tokens).Error
+	var token model.Token
+	err := getDB().Where("access_token = ?", accessToken).First(&token).Error
 	if err != nil {
 		return nil, err
 	}
-	return tokens[0], nil
+	return &token, nil
 }
 
 func GetUUIDByAccessToken(accessToken string) (string, error) {
-	db := database.MustGetDB()
 	var token model.Token
-	err := db.Where("access_token = ?", accessToken).First(&token).Error
+	err := getDB().Where("access_token = ?", accessToken).First(&token).Error
 	if err != nil {
 		return "", err
 	}
@@ -51,9 +41,8 @@ func GetUUIDByAccessToken(accessToken string) (string, error) {
 }
 
 func GetUserIDByAccessToken(accessToken string) (int64, error) {
-	db := database.MustGetDB()
 	var token model.Token
-	err := db.Where("access_token = ?", accessToken).First(&token).Error
+	err := getDB().Where("access_token = ?", accessToken).First(&token).Error
 	if err != nil {
 		return 0, err
 	}
@@ -61,9 +50,8 @@ func GetUserIDByAccessToken(accessToken string) (int64, error) {
 }
 
 func GetTokenByAccessToken(accessToken string) (*model.Token, error) {
-	db := database.MustGetDB()
 	var token model.Token
-	err := db.Where("access_token = ?", accessToken).First(&token).Error
+	err := getDB().Where("access_token = ?", accessToken).First(&token).Error
 	if err != nil {
 		return nil, err
 	}
@@ -71,19 +59,9 @@ func GetTokenByAccessToken(accessToken string) (*model.Token, error) {
 }
 
 func DeleteTokenByAccessToken(accessToken string) error {
-	db := database.MustGetDB()
-	err := db.Where("access_token = ?", accessToken).Delete(&model.Token{}).Error
-	if err != nil {
-		return err
-	}
-	return nil
+	return getDB().Where("access_token = ?", accessToken).Delete(&model.Token{}).Error
 }
 
 func DeleteTokenByUserId(userId int64) error {
-	db := database.MustGetDB()
-	err := db.Where("user_id = ?", userId).Delete(&model.Token{}).Error
-	if err != nil {
-		return err
-	}
-	return nil
+	return getDB().Where("user_id = ?", userId).Delete(&model.Token{}).Error
 }

internal/repository/user_repository.go

@@ -2,7 +2,6 @@ package repository
 
 import (
 	"carrotskin/internal/model"
-	"carrotskin/pkg/database"
 	"errors"
 
 	"gorm.io/gorm"
@@ -10,87 +9,58 @@ import (
 
 // CreateUser 创建用户
 func CreateUser(user *model.User) error {
-	db := database.MustGetDB()
-	return db.Create(user).Error
+	return getDB().Create(user).Error
 }
 
 // FindUserByID 根据ID查找用户
 func FindUserByID(id int64) (*model.User, error) {
-	db := database.MustGetDB()
 	var user model.User
-	err := db.Where("id = ? AND status != -1", id).First(&user).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &user, nil
+	err := getDB().Where("id = ? AND status != -1", id).First(&user).Error
+	return HandleNotFound(&user, err)
 }
 
 // FindUserByUsername 根据用户名查找用户
 func FindUserByUsername(username string) (*model.User, error) {
-	db := database.MustGetDB()
 	var user model.User
-	err := db.Where("username = ? AND status != -1", username).First(&user).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &user, nil
+	err := getDB().Where("username = ? AND status != -1", username).First(&user).Error
+	return HandleNotFound(&user, err)
 }
 
 // FindUserByEmail 根据邮箱查找用户
 func FindUserByEmail(email string) (*model.User, error) {
-	db := database.MustGetDB()
 	var user model.User
-	err := db.Where("email = ? AND status != -1", email).First(&user).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return &user, nil
+	err := getDB().Where("email = ? AND status != -1", email).First(&user).Error
+	return HandleNotFound(&user, err)
 }
 
 // UpdateUser 更新用户
 func UpdateUser(user *model.User) error {
-	db := database.MustGetDB()
-	return db.Save(user).Error
+	return getDB().Save(user).Error
 }
 
 // UpdateUserFields 更新指定字段
 func UpdateUserFields(id int64, fields map[string]interface{}) error {
-	db := database.MustGetDB()
-	return db.Model(&model.User{}).Where("id = ?", id).Updates(fields).Error
+	return getDB().Model(&model.User{}).Where("id = ?", id).Updates(fields).Error
 }
 
 // DeleteUser 软删除用户
 func DeleteUser(id int64) error {
-	db := database.MustGetDB()
-	return db.Model(&model.User{}).Where("id = ?", id).Update("status", -1).Error
+	return getDB().Model(&model.User{}).Where("id = ?", id).Update("status", -1).Error
 }
 
 // CreateLoginLog 创建登录日志
 func CreateLoginLog(log *model.UserLoginLog) error {
-	db := database.MustGetDB()
-	return db.Create(log).Error
+	return getDB().Create(log).Error
 }
 
 // CreatePointLog 创建积分日志
 func CreatePointLog(log *model.UserPointLog) error {
-	db := database.MustGetDB()
-	return db.Create(log).Error
+	return getDB().Create(log).Error
 }
 
 // UpdateUserPoints 更新用户积分（事务）
 func UpdateUserPoints(userID int64, amount int, changeType, reason string) error {
-	db := database.MustGetDB()
-	return db.Transaction(func(tx *gorm.DB) error {
-		// 获取当前用户积分
+	return getDB().Transaction(func(tx *gorm.DB) error {
 		var user model.User
 		if err := tx.Where("id = ?", userID).First(&user).Error; err != nil {
 			return err
@@ -99,17 +69,14 @@ func UpdateUserPoints(userID int64, amount int, changeType, reason string) error
 		balanceBefore := user.Points
 		balanceAfter := balanceBefore + amount
 
-		// 检查积分是否足够
 		if balanceAfter < 0 {
 			return errors.New("积分不足")
 		}
 
-		// 更新用户积分
 		if err := tx.Model(&user).Update("points", balanceAfter).Error; err != nil {
 			return err
 		}
 
-		// 创建积分日志
 		log := &model.UserPointLog{
 			UserID:        userID,
 			ChangeType:    changeType,
@@ -125,12 +92,10 @@ func UpdateUserPoints(userID int64, amount int, changeType, reason string) error
 
 // UpdateUserAvatar 更新用户头像
 func UpdateUserAvatar(userID int64, avatarURL string) error {
-	db := database.MustGetDB()
-	return db.Model(&model.User{}).Where("id = ?", userID).Update("avatar", avatarURL).Error
+	return getDB().Model(&model.User{}).Where("id = ?", userID).Update("avatar", avatarURL).Error
 }
 
 // UpdateUserEmail 更新用户邮箱
 func UpdateUserEmail(userID int64, email string) error {
-	db := database.MustGetDB()
-	return db.Model(&model.User{}).Where("id = ?", userID).Update("email", email).Error
+	return getDB().Model(&model.User{}).Where("id = ?", userID).Update("email", email).Error
 }

internal/repository/yggdrasil_repository.go

@@ -2,13 +2,11 @@ package repository
 
 import (
 	"carrotskin/internal/model"
-	"carrotskin/pkg/database"
 )
 
-func GetYggdrasilPasswordById(Id int64) (string, error) {
-	db := database.MustGetDB()
+func GetYggdrasilPasswordById(id int64) (string, error) {
 	var yggdrasil model.Yggdrasil
-	err := db.Where("id = ?", Id).First(&yggdrasil).Error
+	err := getDB().Where("id = ?", id).First(&yggdrasil).Error
 	if err != nil {
 		return "", err
 	}
@@ -17,6 +15,5 @@ func GetYggdrasilPasswordById(Id int64) (string, error) {
 
 // ResetYggdrasilPassword 重置Yggdrasil密码
 func ResetYggdrasilPassword(userId int64, newPassword string) error {
-	db := database.MustGetDB()
-	return db.Model(&model.Yggdrasil{}).Where("id = ?", userId).Update("password", newPassword).Error
+	return getDB().Model(&model.Yggdrasil{}).Where("id = ?", userId).Update("password", newPassword).Error
 }