diff --git a/app/app.go b/app/app.go index 1bd16ad..328c104 100644 --- a/app/app.go +++ b/app/app.go @@ -16,21 +16,17 @@ type Program struct { } func (p *Program) Init(_ svc.Environment) error { - base := &ModuleBase{} - if err := base.Init(); err != nil { + if err := config.LoadConfig(); err != nil { return err } - p.moduleList = append(p.moduleList, base) + p.moduleList = append(p.moduleList, (&module.Base{}).Bind(config.Get().Log)) p.moduleList = append(p.moduleList, (&module.DB{}).Bind(config.Get().DB, config.Get().App.Name)) p.moduleList = append(p.moduleList, (&module.Grpc{}).Bind(grpc_server.NewServer(config.Get().Serve.Grpc))) p.moduleList = append(p.moduleList, (&module.Prometheus{}).Bind(config.Get().Metric)) p.moduleList = append(p.moduleList, (&module.Tracer{}).Bind(config.Get().Metric, common.KeyDiscoverServiceNameScene)) p.moduleList = append(p.moduleList, &module.Discover{}) - for i, m := range p.moduleList { - if i == 0 { - continue - } + for _, m := range p.moduleList { if err := m.Init(); err != nil { return err } diff --git a/app/base.go b/app/base.go deleted file mode 100644 index eff6601..0000000 --- a/app/base.go +++ /dev/null @@ -1,27 +0,0 @@ -package app - -import ( - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/module" - "git.hlsq.asia/mmorpg/service-common/utils" - "git.hlsq.asia/mmorpg/service-scene/config" - "math/rand" -) - -// ModuleBase 基础模块,或者一些零散的模块 -type ModuleBase struct { - module.DefaultModule -} - -func (m *ModuleBase) Init() error { - // 配置 - if err := config.LoadConfig(); err != nil { - return err - } - cfg := config.Get() - // 日志 - log.Init(cfg.Log.Debug, cfg.Log.MaxSize, cfg.Log.MaxBackups, cfg.Log.MaxAge, cfg.Log.Level) - // 雪花 - utils.InitSnowflake(int64(rand.Intn(1000))) - return nil -} diff --git a/go.mod b/go.mod index 0e19ef1..321d1e5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.hlsq.asia/mmorpg/service-scene go 1.24.0 require ( - git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed + git.hlsq.asia/mmorpg/service-common v0.0.0-20260206142243-44ebbe444953 github.com/judwhite/go-svc v1.2.1 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.77.0 diff --git a/go.sum b/go.sum index 90db41f..9370fcc 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed h1:O08p0egfekFqQSnc4sfEJUTI5dGiEyiDRNW/VYa/Ce4= -git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260206142243-44ebbe444953 h1:eqGH4SIEgwY7uVIiZrMwitHQEVPetDH9SFzWwIrtWzM= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260206142243-44ebbe444953/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I= github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/IBM/sarama v1.46.3 h1:njRsX6jNlnR+ClJ8XmkO+CM4unbrNr/2vB5KK6UA+IE=