补充cors

Author: yumaojun03

examples/project/apps/helloworld/impl/collector.go

@@ -0,0 +1,35 @@
+package impl
+
+import "github.com/prometheus/client_golang/prometheus"
+
+func NewEventCollect() *EventCollect {
+	return &EventCollect{
+		errCountDesc: prometheus.NewDesc(
+			"save_event_error_count",
+			"事件入库失败个数统计",
+			[]string{},
+			prometheus.Labels{"service": "maudit"},
+		),
+	}
+}
+
+// 收集事件指标的采集器
+type EventCollect struct {
+	errCountDesc *prometheus.Desc
+	// 需要自己根据实践情况来维护这个变量
+	errCount int
+}
+
+func (c *EventCollect) Inc() {
+	c.errCount++
+}
+
+// 指标元数据注册
+func (c *EventCollect) Describe(ch chan<- *prometheus.Desc) {
+	ch <- c.errCountDesc
+}
+
+// 指标的值的采集
+func (c *EventCollect) Collect(ch chan<- prometheus.Metric) {
+	ch <- prometheus.MustNewConstMetric(c.errCountDesc, prometheus.GaugeValue, float64(c.errCount))
+}

examples/project/apps/helloworld/impl/impl.go

@@ -1,8 +1,11 @@
 package impl
 
 import (
+	"errors"
+
 	"github.com/infraboard/mcube/v2/ioc"
 	"github.com/infraboard/mcube/v2/ioc/config/datasource"
+	"github.com/prometheus/client_golang/prometheus"
 	"gorm.io/gorm"
 )
 
@@ -12,7 +15,8 @@ func init() {
 
 // 业务逻辑实现类
 type HelloServiceImpl struct {
-	db *gorm.DB
+	db       *gorm.DB
+	colector *EventCollect
 
 	ioc.ObjectImpl
 }
@@ -22,10 +26,21 @@ func (i *HelloServiceImpl) Init() error {
 	// 从Ioc总获取GORM DB对象, GORM相关配置已经托管给Ioc
 	// Ioc会负责GORM的配置读取和为你初始化DB对象实例,以及关闭
 	i.db = datasource.DB()
+
+	// 将采集器注册到默认注册表
+	i.colector = NewEventCollect()
+	prometheus.MustRegister(i.colector)
 	return nil
 }
 
 // 具体业务逻辑
 func (i *HelloServiceImpl) Hello() string {
+
+	// 模拟存储失败报错, 然后调用采集器纪录状态
+	err := errors.New("save event error")
+	if err != nil {
+		i.colector.Inc()
+	}
+
 	return "hello world"
 }

examples/project/main.go

@@ -2,10 +2,16 @@ package main
 
 import (
 	"context"
+	"fmt"
+	"net/http"
 
+	"github.com/emicklei/go-restful/v3"
+	"github.com/gin-gonic/gin"
+	"github.com/infraboard/mcube/v2/ioc/config/grpc"
+	ioc_http "github.com/infraboard/mcube/v2/ioc/config/http"
 	"github.com/infraboard/mcube/v2/ioc/server"
 
-	// 注入Metric模块
+	// metric 模块
 	_ "github.com/infraboard/mcube/v2/ioc/apps/metric/gin"
 
 	// 加载业务模块
@@ -15,8 +21,55 @@ import (
 
 func main() {
 	server.DefaultConfig.ConfigFile.Enabled = true
-	err := server.Run(context.Background())
-	if err != nil {
-		panic(err)
-	}
+	server.DefaultConfig.ConfigFile.Path = "etc/application.toml"
+
+	// 直接启动
+	// err := server.Run(context.Background())
+	// if err != nil {
+	// 	panic(err)
+	// }
+
+	// 启动前 设置
+	server.SetUp(func() {
+		// 开启GRPC服务注册与注销
+		grpc.Get().PostStart = func(ctx context.Context) error {
+			return nil
+		}
+		grpc.Get().PreStop = func(ctx context.Context) error {
+			return nil
+		}
+
+		// HTTP业务路由加载之前
+		rb := ioc_http.Get().GetRouterBuilder()
+		rb.BeforeLoadHooks(func(r http.Handler) {
+			// Gin框架
+			if router, ok := r.(*restful.Container); ok {
+				// GoRestful Router对象
+				fmt.Println(router)
+			}
+
+			// GoRestful 框架
+			if router, ok := r.(*gin.Engine); ok {
+				// Gin Engine对象
+				fmt.Println(router)
+			}
+		})
+		// HTTP业务路由加载之后
+		rb.AfterLoadHooks(func(r http.Handler) {
+			// Gin框架
+			if router, ok := r.(*restful.Container); ok {
+				// GoRestful Router对象
+				fmt.Println(router)
+			}
+
+			// GoRestful 框架
+			if router, ok := r.(*gin.Engine); ok {
+				// Gin Engine对象
+				fmt.Println(router)
+			}
+		})
+
+		// 补充Grpc 中间件
+		grpc.Get().AddInterceptors()
+	}).Run(context.Background())
 }

ioc/apps/apidoc/restful/swagger.go

@@ -52,7 +52,7 @@ func (h *SwaggerApiDoc) Registry(ws *restful.WebService) {
 	ws.Route(ws.GET("/").To(func(r *restful.Request, w *restful.Response) {
 		w.WriteAsJson(swagger)
 	}))
-	h.log.Info().Msgf("Get the Health using http://%s%s", http.Get().Addr(), h.Path)
+	h.log.Info().Msgf("Get the API Doc using http://%s%s", http.Get().Addr(), h.Path)
 }
 
 // API Doc

ioc/config/cors/cors.go

@@ -0,0 +1,57 @@
+package cors
+
+import (
+	"net/http"
+
+	"github.com/emicklei/go-restful/v3"
+	"github.com/infraboard/mcube/v2/ioc"
+	ioc_http "github.com/infraboard/mcube/v2/ioc/config/http"
+)
+
+func init() {
+	ioc.Config().Registry(&CORS{
+		Enabled:        true,
+		AllowedHeaders: []string{"*"},
+		AllowedDomains: []string{"*"},
+		AllowedMethods: []string{"HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE"},
+	})
+}
+
+type CORS struct {
+	ioc.ObjectImpl
+
+	Enabled        bool     `toml:"enabled" json:"enabled" yaml:"enabled"  env:"CORS_ENABLED"`
+	AllowedHeaders []string `json:"cors_allowed_headers" yaml:"cors_allowed_headers" toml:"cors_allowed_headers" env:"CORS_ALLOWED_HEADERS" envSeparator:","`
+	AllowedDomains []string `json:"cors_allowed_domains" yaml:"cors_allowed_domains" toml:"cors_allowed_domains" env:"CORS_ALLOWED_DOMAINS" envSeparator:","`
+	AllowedMethods []string `json:"cors_allowed_methods" yaml:"cors_allowed_methods" toml:"cors_allowed_methods" env:"CORS_ALLOWED_METHODS" envSeparator:","`
+}
+
+func (m *CORS) Name() string {
+	return AppName
+}
+
+func (m *CORS) Init() error {
+	rb := ioc_http.Get().GetRouterBuilder()
+
+	// 将中间件添加到Router中
+	if m.Enabled {
+		rb.BeforeLoadHooks(func(h http.Handler) {
+			switch r := h.(type) {
+			case *restful.Container:
+				cors := restful.CrossOriginResourceSharing{
+					AllowedHeaders: m.AllowedHeaders,
+					AllowedDomains: m.AllowedDomains,
+					AllowedMethods: m.AllowedMethods,
+					CookiesAllowed: false,
+					Container:      r,
+				}
+				r.Filter(cors.Filter)
+			}
+		})
+	}
+	return nil
+}
+
+func (i *CORS) Priority() int {
+	return -10
+}

ioc/config/cors/interface.go

@@ -0,0 +1,11 @@
+package cors
+
+import "github.com/infraboard/mcube/v2/ioc"
+
+const (
+	AppName = "cors"
+)
+
+func Get() *CORS {
+	return ioc.Config().Get(AppName).(*CORS)
+}

ioc/config/http/gin.go

@@ -9,32 +9,28 @@ import (
 
 func NewGinRouterBuilder() *GinRouterBuilder {
 	return &GinRouterBuilder{
-		conf: &BuildConfig{},
+		RouterBuilderHooks: NewRouterBuilderHooks(),
 	}
 }
 
 type GinRouterBuilder struct {
-	conf *BuildConfig
-}
-
-func (b *GinRouterBuilder) Config(c *BuildConfig) {
-	b.conf = c
+	*RouterBuilderHooks
 }
 
 func (b *GinRouterBuilder) Build() (http.Handler, error) {
 	r := gin.Default()
 
 	// 装载Ioc路由之前
-	if b.conf.BeforeLoad != nil {
-		b.conf.BeforeLoad(r)
+	for _, fn := range b.Before {
+		fn(r)
 	}
 
 	// 装置子服务路由
 	ioc.LoadGinApi(Get().PathPrefix, r)
 
 	// 装载Ioc路由之后
-	if b.conf.AfterLoad != nil {
-		b.conf.AfterLoad(r)
+	for _, fn := range b.After {
+		fn(r)
 	}
 
 	return r, nil

ioc/config/http/http.go

@@ -26,13 +26,7 @@ func init() {
 		IdleTimeoutSecond:       300,
 		MaxHeaderSize:           "16kb",
 		EnableTrace:             true,
-		Cors: CORS{
-			Enabled:        false,
-			AllowedHeaders: []string{"*"},
-			AllowedDomains: []string{"*"},
-			AllowedMethods: []string{"HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE"},
-		},
-		WEB_FRAMEWORK: WEB_FRAMEWORK_AUTO,
+		WEB_FRAMEWORK:           WEB_FRAMEWORK_AUTO,
 		routerBuilders: map[WEB_FRAMEWORK]RouterBuilder{
 			WEB_FRAMEWORK_GO_RESTFUL: NewGoRestfulRouterBuilder(),
 			WEB_FRAMEWORK_GIN:        NewGinRouterBuilder(),
@@ -41,7 +35,6 @@ func init() {
 			WEB_FRAMEWORK_GO_RESTFUL: 0,
 			WEB_FRAMEWORK_GIN:        0,
 		},
-		RouterBuildConfig: &BuildConfig{},
 	})
 }
 
@@ -72,23 +65,15 @@ type Http struct {
 	// header最大大小
 	MaxHeaderSize string `json:"max_header_size" yaml:"max_header_size" toml:"max_header_size" env:"MAX_HEADER_SIZE"`
 
-	// SSL启用参数
-	EnableSSL bool   `json:"enable_ssl" yaml:"enable_ssl" toml:"enable_ssl" env:"ENABLE_SSL"`
-	CertFile  string `json:"cert_file" yaml:"cert_file" toml:"cert_file" env:"CERT_FILE"`
-	KeyFile   string `json:"key_file" yaml:"key_file" toml:"key_file" env:"KEY_FILE"`
-
 	// 开启Trace
 	EnableTrace bool `toml:"enable_trace" json:"enable_trace" yaml:"enable_trace" env:"ENABLE_TRACE"`
-	// cors配置
-	Cors CORS `toml:"cors" json:"cors" yaml:"cors" envPrefix:"CORS_"`
 
 	// 解析后的数据
-	maxHeaderBytes    uint64
-	log               *zerolog.Logger
-	server            *http.Server
-	routerBuilders    map[WEB_FRAMEWORK]RouterBuilder `json:"-" yaml:"-" toml:"-" env:"-"`
-	handlerCount      map[WEB_FRAMEWORK]int           `json:"-" yaml:"-" toml:"-" env:"-"`
-	RouterBuildConfig *BuildConfig                    `json:"-" yaml:"-" toml:"-" env:"-"`
+	maxHeaderBytes uint64
+	log            *zerolog.Logger
+	server         *http.Server
+	routerBuilders map[WEB_FRAMEWORK]RouterBuilder `json:"-" yaml:"-" toml:"-" env:"-"`
+	handlerCount   map[WEB_FRAMEWORK]int           `json:"-" yaml:"-" toml:"-" env:"-"`
 }
 
 func (h *Http) HTTPPrefix() string {
@@ -99,17 +84,6 @@ func (h *Http) HTTPPrefix() string {
 	return u
 }
 
-type HealthCheck struct {
-	Enabled bool `toml:"enabled" json:"enabled" yaml:"enabled"  env:"ENABLED"`
-}
-
-type CORS struct {
-	Enabled        bool     `toml:"enabled" json:"enabled" yaml:"enabled"  env:"ENABLED"`
-	AllowedHeaders []string `json:"cors_allowed_headers" yaml:"cors_allowed_headers" toml:"cors_allowed_headers" env:"ALLOWED_HEADERS" envSeparator:","`
-	AllowedDomains []string `json:"cors_allowed_domains" yaml:"cors_allowed_domains" toml:"cors_allowed_domains" env:"ALLOWED_DOMAINS" envSeparator:","`
-	AllowedMethods []string `json:"cors_allowed_methods" yaml:"cors_allowed_methods" toml:"cors_allowed_methods" env:"ALLOWED_METHODS" envSeparator:","`
-}
-
 type WEB_FRAMEWORK string
 
 const (
@@ -119,20 +93,6 @@ const (
 	WEB_FRAMEWORK_GIN        WEB_FRAMEWORK = "gin"
 )
 
-type RouterBuilder interface {
-	Config(*BuildConfig)
-	Build() (http.Handler, error)
-}
-
-type BuildHook func(http.Handler)
-
-type BuildConfig struct {
-	// 装载Ioc路由之前
-	BeforeLoad BuildHook `json:"-" yaml:"-" toml:"-" env:"-"`
-	// 装载Ioc路由之后
-	AfterLoad BuildHook `json:"-" yaml:"-" toml:"-" env:"-"`
-}
-
 func (h *Http) setEnable(v bool) {
 	h.Enable = &v
 }
@@ -213,9 +173,6 @@ func (h *Http) BuildRouter() error {
 		return fmt.Errorf("router builder for web framework %s not found", h.WEB_FRAMEWORK)
 	}
 
-	// 传递配置
-	rb.Config(h.RouterBuildConfig)
-
 	r, err := rb.Build()
 	if err != nil {
 		return err