diff --git a/internal/biz/biz.go b/internal/biz/biz.go index ad9111b..df9cd3b 100644 --- a/internal/biz/biz.go +++ b/internal/biz/biz.go @@ -1,9 +1,10 @@ package biz import ( - "github.com/google/wire" "kra/internal/biz/system" + + "github.com/google/wire" ) // ProviderSet is biz providers. -var ProviderSet = wire.NewSet(system.NewUserUsecase) +var ProviderSet = wire.NewSet(system.NewUserUsecase, system.NewApiUsecase) diff --git a/internal/data/data.go b/internal/data/data.go index c898756..b8db616 100644 --- a/internal/data/data.go +++ b/internal/data/data.go @@ -3,7 +3,7 @@ package data import ( "fmt" "kra/internal/conf" - "kra/internal/data/query" + datasystem "kra/internal/data/system" _ "github.com/go-sql-driver/mysql" "github.com/google/wire" @@ -13,11 +13,28 @@ import ( ) // ProviderSet is data providers. -var ProviderSet = wire.NewSet(NewDB, NewData) +var ProviderSet = wire.NewSet( + NewDB, + NewData, + datasystem.NewUserRepo, + datasystem.NewApiRepo, +) -// Data 数据层 +// Data 数据层包装器 type Data struct { - DB *gorm.DB + db *gorm.DB +} + +// NewData 创建数据层包装器 +func NewData(db *gorm.DB) (*Data, func(), error) { + cleanup := func() { + // 关闭数据库连接 + sqlDB, err := db.DB() + if err == nil { + sqlDB.Close() + } + } + return &Data{db: db}, cleanup, nil } // NewDB 创建数据库连接 @@ -30,18 +47,5 @@ func NewDB(c *conf.Mysql) (*gorm.DB, error) { if err != nil { return nil, err } - // 初始化 gen query - query.SetDefault(db) return db, nil } - -// NewData 创建 Data 实例 -func NewData(db *gorm.DB) (*Data, func(), error) { - cleanup := func() { - sqlDB, _ := db.DB() - if sqlDB != nil { - sqlDB.Close() - } - } - return &Data{DB: db}, cleanup, nil -}