refactor all service dependency injection

This commit is contained in:
2026-08-10 11:35:48 +08:00
parent 007a7ba38a
commit c883cc52a2
152 changed files with 1030 additions and 223 deletions

View File

@@ -13,8 +13,6 @@ import (
"git.apinb.com/bsm-sdk/core/conf"
)
const ServiceKey = "all"
type SrvConfig struct {
conf.Base `yaml:",inline"`
Databases *conf.DBConf `yaml:"Databases"`
@@ -32,8 +30,8 @@ type SrvConfig struct {
var Spec SrvConfig
func New() {
conf.New(ServiceKey, &Spec)
func New(serviceKey string) {
conf.New(serviceKey, &Spec)
Spec.Port = conf.CheckPort(Spec.Port)
Spec.BindIP = conf.CheckIP(Spec.BindIP)
Spec.Addr = net.JoinHostPort(Spec.BindIP, Spec.Port)

View File

@@ -9,7 +9,7 @@ import (
)
func TestAllDevConfig(t *testing.T) {
data, err := os.ReadFile(filepath.Join("..", "..", "etc", "all_dev.yaml"))
data, err := os.ReadFile(filepath.Join("..", "..", "etc", "default_dev.yaml"))
if err != nil {
t.Fatal(err)
}

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/ec/address/service"
)
func exposeAddress(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/ads/service"
)
func exposeAds(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/cloud/service"
)
func exposeCloud(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/cms/service"
)
func exposeCMS(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/feedback/service"
)
func exposeFeedback(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -2,10 +2,15 @@ package service
import (
"bsm/full/all/internal/config"
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/fts/service"
)
func exposeFTS(srv *server.Server) error {
return moduleService.Expose(srv.HTTP, config.Spec.Fts)
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{Redis: impl.RedisService, Etcd: impl.EtcdService, DB: impl.DBService, Cache: impl.MemoryService},
Engine: srv.HTTP,
Config: config.Spec.Fts,
})
}

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/initial/service"
)
func exposeInitial(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -1,10 +1,14 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/logs/service"
)
func exposeLogs(srv *server.Server) error {
return moduleService.Expose(srv.HTTP)
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{Redis: impl.RedisService, Etcd: impl.EtcdService, DB: impl.DBService, Cache: impl.MemoryService},
Engine: srv.HTTP,
})
}

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/ec/mall/service"
)
func exposeMall(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/ec/market/service"
)
func exposeMarket(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -2,10 +2,15 @@ package service
import (
"bsm/full/all/internal/config"
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/mgt/service"
)
func exposeMgt(srv *server.Server) error {
return moduleService.Expose(srv.HTTP, config.Spec.Mgt)
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{Redis: impl.RedisService, Etcd: impl.EtcdService, DB: impl.DBService, Cache: impl.MemoryService},
Engine: srv.HTTP,
Config: config.Spec.Mgt,
})
}

View File

@@ -1,12 +1,19 @@
package service
import (
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/ec/order/service"
)
func exposeOrder(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
})

View File

@@ -2,12 +2,19 @@ package service
import (
"bsm/full/all/internal/config"
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/passport/service"
)
func exposePassport(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
Config: config.Spec.Passport,

View File

@@ -2,12 +2,19 @@ package service
import (
"bsm/full/all/internal/config"
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/base/sender/service"
)
func exposeSender(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
Config: config.Spec.Sender,

View File

@@ -2,12 +2,19 @@ package service
import (
"bsm/full/all/internal/config"
"bsm/full/all/internal/impl"
"bsm/full/all/internal/server"
moduleService "bsm/full/module/finance/wallet/service"
)
func exposeWallet(srv *server.Server) error {
return moduleService.Expose(moduleService.ExposeOptions{
Dependencies: moduleService.Dependencies{
Redis: impl.RedisService,
Etcd: impl.EtcdService,
DB: impl.DBService,
Cache: impl.MemoryService,
},
GRPC: srv.GRPC,
Gateway: srv.Gateway,
Config: config.Spec.Wallet,