diff --git a/consul/consul.go b/consul/consul.go index 699f582..ba019c8 100644 --- a/consul/consul.go +++ b/consul/consul.go @@ -11,11 +11,7 @@ import ( ) func init() { - consulCfg, err := g.Cfg().Get(context.Background(), "consul.address") - if err != nil { - panic(err) - } - consulAddr := consulCfg.String() + consulAddr := g.Cfg().MustGet(context.Background(), "consul.address").String() registry, err := consul.New(consul.WithAddress(consulAddr)) if err != nil { panic(err) diff --git a/jaeger/jaeger.go b/jaeger/jaeger.go index ea8fa94..aeb5041 100644 --- a/jaeger/jaeger.go +++ b/jaeger/jaeger.go @@ -14,18 +14,13 @@ import ( var ShutDown func(ctx context.Context) func init() { - jaegerAgent, err := g.Cfg().Get(context.Background(), "jaeger.addr") - if err != nil { - panic(err) - } - serverName, err := g.Cfg().Get(context.Background(), "server.Name") - if err != nil { - panic(err) - } - ShutDown, err = otlphttp.Init(serverName.String(), jaegerAgent.String(), "/v1/traces") + jaegerAgent := g.Cfg().MustGet(context.Background(), "jaeger.addr").String() + serverName := g.Cfg().MustGet(context.Background(), "server.Name").String() + shutdown, err := otlphttp.Init(serverName, jaegerAgent, "/v1/traces") if err != nil { panic(err) } + ShutDown = shutdown } func NewTracer(r *ghttp.Request) { _, span := gtrace.NewSpan(r.Context(), r.GetServeHandler().GetMetaTag("summary")) diff --git a/middleware/middleware.go b/middleware/middleware.go index 593c25c..2bbf766 100644 --- a/middleware/middleware.go +++ b/middleware/middleware.go @@ -23,9 +23,9 @@ func Logger(r *ghttp.Request) { ) } -var rateLimit, _ = g.Cfg().Get(context.TODO(), "rate.limit") -var rateBurst, _ = g.Cfg().Get(context.TODO(), "rate.burst") -var limiter = rate.NewLimiter(rate.Limit(rateLimit.Int()), rateBurst.Int()) +var rateLimit = g.Cfg().MustGet(context.TODO(), "rate.limit").Int() +var rateBurst = g.Cfg().MustGet(context.TODO(), "rate.burst").Int() +var limiter = rate.NewLimiter(rate.Limit(rateLimit), rateBurst) func Limiter(r *ghttp.Request) { if !limiter.Allow() { diff --git a/mongo/mongo.go b/mongo/mongo.go index f0a8eb2..380fbad 100644 --- a/mongo/mongo.go +++ b/mongo/mongo.go @@ -20,8 +20,7 @@ var db = new(mongo.Database) func init() { ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() - link, _ := g.Cfg().Get(context.Background(), "mongo.address") - mongoAddr := link.String() + mongoAddr := g.Cfg().MustGet(context.Background(), "mongo.address").String() opt := options.Client().ApplyURI(mongoAddr) client, err := mongo.Connect(opt) if err != nil { @@ -95,9 +94,9 @@ func Insert(ctx context.Context, documents []interface{}, collection string, opt return } -// Count 查询总数 +// Count 查询总数 func Count(ctx context.Context, filter bson.M, collection string) (count int64, err error) { // 调用驱动的 CountDocuments,在数据库端执行的 count, err = db.Collection(collection).CountDocuments(ctx, filter) return -} \ No newline at end of file +} diff --git a/swagger/swagger.go b/swagger/swagger.go index e988705..40157da 100644 --- a/swagger/swagger.go +++ b/swagger/swagger.go @@ -75,7 +75,7 @@ func init() { `) http.Httpserver.BindHandler("/swagger", func(r *ghttp.Request) { - services, _ := g.Cfg().Get(r.GetCtx(), "consul.services") + services := g.Cfg().MustGet(r.GetCtx(), "consul.services").Slice() aggregatedDoc := &swaggerDoc{ OpenAPI: "3.0.0", // 假设统一为 3.0.0 版本 Info: map[string]interface{}{ @@ -86,7 +86,7 @@ func init() { Paths: make(map[string]interface{}), Components: make(map[string]interface{}), } - for _, v := range services.Slice() { + for _, v := range services { serviceName := gconv.String(gconv.Map(v)["name"]) instanceAddr, err := consul.GetInstanceAddr(r.GetCtx(), serviceName) if err != nil || instanceAddr == "" {