Merge branch 'master' of https://github.com/infraboard/mcube

infraboard · Nov 21, 2023 · 78716cb · 78716cb
2 parents 074ed44 + c4fe6e7
commit 78716cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/ioc/config/application/application.go b/ioc/config/application/application.go
@@ -91,7 +91,7 @@ func (a *Application) SwagerDocs(swo *spec.Swagger) {
 
 func (a *Application) Start(ctx context.Context) error {
 	a.log.Info().Msgf("loaded configs: %s", ioc.Config().List())
-	a.log.Info().Msgf("loaded controllers: %s", ioc.Config().List())
+	a.log.Info().Msgf("loaded controllers: %s", ioc.Controller().List())
 	a.log.Info().Msgf("loaded apis: %s", ioc.Api().List())
 
 	if *a.HTTP.Enable {

diff --git a/ioc/config/application/grpc.go b/ioc/config/application/grpc.go
@@ -42,9 +42,9 @@ type Grpc struct {
 	log          *zerolog.Logger
 
 	// 启动后执行
-	PostStart func(context.Context) error
+	PostStart func(context.Context) error `json:"-" yaml:"-" toml:"-" env:"-"`
 	// 关闭前执行
-	PreStop func(context.Context) error
+	PreStop func(context.Context) error `json:"-" yaml:"-" toml:"-" env:"-"`
 }
 
 func (g *Grpc) setEnable(v bool) {

diff --git a/ioc/config/application/http.go b/ioc/config/application/http.go
@@ -72,7 +72,7 @@ type Http struct {
 	maxHeaderBytes    uint64
 	log               *zerolog.Logger
 	server            *http.Server
-	routerBuilders    map[WEB_FRAMEWORK]RouterBuilder
+	routerBuilders    map[WEB_FRAMEWORK]RouterBuilder `json:"-" yaml:"-" toml:"-" env:"-"`
 	RouterBuildConfig *BuildConfig
 }
 
@@ -92,9 +92,9 @@ type BuildHook func(http.Handler)
 
 type BuildConfig struct {
 	// 装载Ioc路由之前
-	BeforeLoad BuildHook
+	BeforeLoad BuildHook `json:"-" yaml:"-" toml:"-" env:"-"`
 	// 装载Ioc路由之后
-	AfterLoad BuildHook
+	AfterLoad BuildHook `json:"-" yaml:"-" toml:"-" env:"-"`
 }
 
 func (h *Http) setEnable(v bool) {

diff --git a/ioc/store.go b/ioc/store.go
@@ -465,6 +465,8 @@ func (i *NamespaceStore) LoadFromFile(filename string) error {
 		err = file.ReadYamlFile(filename, &cfg)
 	case ".json":
 		err = file.ReadJsonFile(filename, &cfg)
+	default:
+		err = fmt.Errorf("unspport format: %s", fileType)
 	}
 	if err != nil {
 		return err