diff --git a/cmd/api/server.go b/cmd/api/server.go index cf6a8bca..6d405474 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -14,8 +14,6 @@ import ( "github.com/go-admin-team/go-admin-core/sdk" "github.com/go-admin-team/go-admin-core/sdk/config" "github.com/go-admin-team/go-admin-core/sdk/pkg" - "github.com/go-admin-team/go-admin-core/sdk/pkg/captcha" - "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "github.com/go-admin-team/go-admin-core/sdk/runtime" "github.com/spf13/cobra" @@ -23,6 +21,7 @@ import ( "go-admin/app/admin/router" "go-admin/common/database" "go-admin/common/global" + "go-admin/common/storage" ext "go-admin/config" ) @@ -57,57 +56,20 @@ func setup() { // 注入配置扩展项 config.ExtendConfig = &ext.ExtConfig //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), - )) - //3. 初始化数据库链接 - database.Setup() - - //4. 设置缓存 - cacheAdapter, err := config.CacheConfig.Setup() - if err != nil { - log.Fatalf("cache setup error, %s\n", err.Error()) - } - sdk.Runtime.SetCacheAdapter(cacheAdapter) - //5. 设置验证码store - captcha.SetStore(captcha.NewCacheStore(cacheAdapter, 600)) - - //6. 设置队列 - if !config.QueueConfig.Empty() { - queueAdapter, err := config.QueueConfig.Setup() - if err != nil { - log.Fatalf("queue setup error, %s\n", err.Error()) - } - sdk.Runtime.SetQueueAdapter(queueAdapter) - defer func() { - go queueAdapter.Run() - }() - } - - //7. 设置分布式锁 - if !config.LockerConfig.Empty() { - lockerAdapter, err := config.LockerConfig.Setup() - if err != nil { - log.Fatalf("locker setup error, %s\n", err.Error()) - } - sdk.Runtime.SetLockerAdapter(lockerAdapter) - } - - usageStr := `starting api server...` - log.Println(usageStr) + config.Setup( + file.NewSource(file.WithPath(configYml)), + database.Setup, + storage.Setup, + ) //注册监听函数 queue := sdk.Runtime.GetMemoryQueue("") queue.Register(global.LoginLog, models.SaveLoginLog) queue.Register(global.OperateLog, models.SaveOperaLog) queue.Register(global.ApiCheck, models.SaveSysApi) go queue.Run() + + usageStr := `starting api server...` + log.Println(usageStr) } func run() error { diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go index 9d1a224a..fa25741d 100644 --- a/cmd/migrate/server.go +++ b/cmd/migrate/server.go @@ -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 { diff --git a/go.mod b/go.mod index 2d4817f1..51c01e81 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/bytedance/go-tagexpr/v2 v2.7.10 github.com/casbin/casbin/v2 v2.25.1 github.com/gin-gonic/gin v1.7.1 - github.com/go-admin-team/go-admin-core v1.3.5-rc.5 - github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.5 + github.com/go-admin-team/go-admin-core v1.3.5-rc.5.0.20210610090758-13967b971b9f + github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.5.0.20210610090758-13967b971b9f github.com/google/uuid v1.2.0 github.com/mssola/user_agent v0.5.2 github.com/opentracing/opentracing-go v1.1.0 @@ -29,4 +29,4 @@ require ( gorm.io/driver/postgres v1.0.6-0.20201208020313-1ed927cfab53 gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba gorm.io/gorm v1.21.10 -) \ No newline at end of file +)