feature ✨ 优化setup

This commit is contained in:
linwenxiang committed 2021-06-10 17:15:13 +08:00
1 parent 0e3e733745
commit 3aa64d107b
3 files changed
+17 -64

No files matched your search

+5 -14
View File
@@ -13,7 +13,6 @@ import (
"github.com/spf13/cobra"
"github.com/go-admin-team/go-admin-core/sdk/config"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"go-admin/cmd/migrate/migration"
_ "go-admin/cmd/migrate/migration/version"
_ "go-admin/cmd/migrate/migration/version-local"
@@ -49,17 +48,10 @@ func run() {
if !generate {
fmt.Println(`start init`)
//1. 读取配置
config.Setup(file.NewSource(file.WithPath(configYml)))
//2. 设置日志
sdk.Runtime.SetLogger(
logger.SetupLogger(
logger.WithType(config.LoggerConfig.Type),
logger.WithPath(config.LoggerConfig.Path),
logger.WithLevel(config.LoggerConfig.Level),
logger.WithStdout(config.LoggerConfig.Stdout),
logger.WithCap(config.LoggerConfig.Cap),
))
_ = initDB()
config.Setup(
file.NewSource(file.WithPath(configYml)),
initDB,
)
} else {
fmt.Println(`generate migration file`)
_ = genFile()
@@ -83,14 +75,13 @@ func migrateModel() error {
migration.Migrate.Migrate()
return err
}
func initDB() error {
func initDB() {
//3. 初始化数据库链接
database.Setup()
//4. 数据库迁移
fmt.Println("数据库迁移开始")
_ = migrateModel()
fmt.Println(`数据库基础数据初始化成功`)
return nil
}
func genFile() error {