From ce559d5218485561dd09508f8f8873b8516685c2 Mon Sep 17 00:00:00 2001 From: zxr <271055687@qq.com> Date: Mon, 20 Jul 2026 17:32:27 +0800 Subject: [PATCH] fix: stop logging connection credentials --- internal/impl/connections.go | 29 +++++++++++++++++ internal/impl/impl.go | 63 ++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 32 deletions(-) create mode 100644 internal/impl/connections.go diff --git a/internal/impl/connections.go b/internal/impl/connections.go new file mode 100644 index 0000000..4385253 --- /dev/null +++ b/internal/impl/connections.go @@ -0,0 +1,29 @@ +package impl + +import ( + "fmt" + + "git.apinb.com/bsm-sdk/core/cache/redis" + "git.apinb.com/bsm-sdk/core/conf" + "git.apinb.com/bsm-sdk/core/database" + "git.apinb.com/bsm-sdk/core/vars" + "gorm.io/gorm" +) + +func newDatabase(cfg *conf.DBConf) *gorm.DB { + if cfg == nil || len(cfg.Source) == 0 { + panic("database source is required") + } + db, err := database.NewDatabase(cfg.Driver, cfg.Source, nil) + if err != nil { + panic(fmt.Sprintf("database init failed: %v", err)) + } + return db +} + +func newRedisCache(dsn string) *redis.RedisClient { + if dsn == "" { + return nil + } + return redis.New(dsn, vars.ServiceKey) +} diff --git a/internal/impl/impl.go b/internal/impl/impl.go index ad1fa1d..a3a3336 100644 --- a/internal/impl/impl.go +++ b/internal/impl/impl.go @@ -1,32 +1,31 @@ -package impl - -import ( - "fmt" - - "git.apinb.com/bsm-sdk/core/cache/redis" - "git.apinb.com/bsm-sdk/core/logger" - "git.apinb.com/bsm-sdk/core/with" - "git.apinb.com/ops/logs/internal/config" - "git.apinb.com/ops/logs/internal/models" - "gorm.io/gorm" -) - -var ( - RedisService *redis.RedisClient - DBService *gorm.DB -) - -func NewImpl() { - RedisService = with.RedisCache(config.Spec.Cache) - DBService = with.Databases(config.Spec.Databases, nil) - logger.New(nil) - - if DBService != nil { - if err := DBService.AutoMigrate(models.GetAllModels()...); err != nil { - panic(fmt.Sprintf("logs migrate: %v", err)) - } - if err := models.InitData(DBService); err != nil { - panic(fmt.Sprintf("logs init data: %v", err)) - } - } -} +package impl + +import ( + "fmt" + + "git.apinb.com/bsm-sdk/core/cache/redis" + "git.apinb.com/bsm-sdk/core/logger" + "git.apinb.com/ops/logs/internal/config" + "git.apinb.com/ops/logs/internal/models" + "gorm.io/gorm" +) + +var ( + RedisService *redis.RedisClient + DBService *gorm.DB +) + +func NewImpl() { + RedisService = newRedisCache(config.Spec.Cache) + DBService = newDatabase(config.Spec.Databases) + logger.New(nil) + + if DBService != nil { + if err := DBService.AutoMigrate(models.GetAllModels()...); err != nil { + panic(fmt.Sprintf("logs migrate: %v", err)) + } + if err := models.InitData(DBService); err != nil { + panic(fmt.Sprintf("logs init data: %v", err)) + } + } +}