fix: update version and build

kooksee · kooksee · commit 2c4a91550488 · 2022-07-04T16:47:28.000+08:00
diff --git a/cmd/cmds/migratecmd/cmd.go b/cmd/cmds/migratecmd/cmd.go
@@ -1,4 +1,4 @@
-package migrate
+package migratecmd
 
 import (
 	"fmt"
@@ -17,10 +17,10 @@ import (
 type params struct {
 	Log        *logging.Logger
 	Db         *orm.Client
-	Migrations []migrates.Migration
+	Migrations []migrates.Migrate
 }
 
-func migrate(m []migrates.Migration) []*gormigrate.Migration {
+func migrate(m []migrates.Migrate) []*gormigrate.Migration {
 	var migrations []*gormigrate.Migration
 	for i := range m {
 		migrations = append(migrations, m[i]())
diff --git a/cmd/cmds/running/running.go b/cmd/cmds/running/running.go
@@ -9,7 +9,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"github.com/pubgo/lava/cmd/cmds/healthcmd"
-	"github.com/pubgo/lava/cmd/cmds/migrate"
+	"github.com/pubgo/lava/cmd/cmds/migratecmd"
 	"github.com/pubgo/lava/cmd/cmds/vercmd"
 	"github.com/pubgo/lava/core/runmode"
 	"github.com/pubgo/lava/core/signal"
@@ -48,7 +48,7 @@ func Run(services ...service.Command) {
 			return nil
 		}
 
-		cmd.Subcommands = append(cmd.Subcommands, migrate.Cmd())
+		cmd.Subcommands = append(cmd.Subcommands, migratecmd.Cmd())
 		cliApp.Commands = append(cliApp.Commands, cmd)
 	}
 
diff --git a/config/config.go b/config/config.go
@@ -74,7 +74,7 @@ type configImpl struct {
 
 func (t *configImpl) loadCustomCfg() {
 	var path = filepath.Dir(t.v.ConfigFileUsed())
-	funk.MustMsg(filepath.Walk(path, func(path string, info fs.FileInfo, err error) error {
+	funk.MustF(filepath.Walk(path, func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -220,7 +220,7 @@ func (t *configImpl) initWithDir(v *viper.Viper) bool {
 
 	funk.Assert(pathutil.IsNotExist(CfgDir), "config dir not found, path:%s", CfgPath)
 	v.AddConfigPath(filepath.Join(CfgDir, CfgName))
-	funk.MustMsg(v.ReadInConfig(), "config load error, dir:%s", CfgDir)
+	funk.MustF(v.ReadInConfig(), "config load error, dir:%s", CfgDir)
 
 	return true
 }
diff --git a/example/configs/config/config.yaml b/example/configs/config/config.yaml
@@ -73,7 +73,7 @@ orm:
   - name: default
     driver: "sqlite3"
     driver_config:
-      dsn: "db1.sqlite3"
+      dsn: "db.sqlite3"
 grpcc:
   - name: test-grpc
     registry: "mdns"
diff --git a/example/go.mod b/example/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.3
 	github.com/mattheath/kala v0.0.0-20171219141654-d6276794bf0e
 	github.com/mwitkow/go-proto-validators v0.3.2
-	github.com/pubgo/dix v0.3.0
+	github.com/pubgo/dix v0.3.1
 	github.com/pubgo/lava v0.1.25
 	github.com/pubgo/protobuild v0.0.7
 	github.com/pubgo/xerror v0.4.32
@@ -109,7 +109,7 @@ require (
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.26.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/pubgo/funk v0.5.0 // indirect
+	github.com/pubgo/funk v0.5.2 // indirect
 	github.com/pubgo/x v0.3.37 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/reugn/go-quartz v0.3.7 // indirect
diff --git a/example/go.sum b/example/go.sum
@@ -810,10 +810,10 @@ github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3x
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/pubgo/dix v0.3.0 h1:b3PAP0+NN2Gq+42XnoLkInPURfBI++YF2TZ6GBNCdkM=
-github.com/pubgo/dix v0.3.0/go.mod h1:dP3N4/MjdbJTFmcy1xWB2wK9HJQ5oYWoMGB6mHkuSaM=
-github.com/pubgo/funk v0.5.0 h1:4bmS8NfwY2qMJXCvxWANLRyor++Z8cf4+cAgjZCDTn0=
-github.com/pubgo/funk v0.5.0/go.mod h1:k2cyDFWT/QknMvwpRa0VU85g8XRuR3G22DCasFqpoNU=
+github.com/pubgo/dix v0.3.1 h1:0+uMDWYKCY6KI8aIhjESXhFdn6pC/fffWYs4RuQHQwo=
+github.com/pubgo/dix v0.3.1/go.mod h1:D58toBOxAF9yJRrjVUH+Rgs+ZvFrChu+1vIrY+W1wE4=
+github.com/pubgo/funk v0.5.2 h1:lMxN8LekEfwqdkXt/9uYN0vCE7hJsFeLpnauPoLn+Jk=
+github.com/pubgo/funk v0.5.2/go.mod h1:VG8eSUsgJ/SqZqVMnqW1xOGZZeq42R/Fi7/OOKIO0yE=
 github.com/pubgo/protobuild v0.0.7 h1:xLKYUbrLavfcWnWPHUDT/5QoH3+Xrt680UueKCqYNIg=
 github.com/pubgo/protobuild v0.0.7/go.mod h1:DsSlplrGAF4CewJ7ULoBnBbpV40ej/lAuB8EWKQqlQ0=
 github.com/pubgo/x v0.3.37 h1:hOj+yqTc2XqpP4Ap5V7FnDYh7gOQ09/sPm6TbiMgCNE=
@@ -868,7 +868,6 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8=
 github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs=
diff --git a/example/migrates/migrate.go b/example/migrates/migrate.go
@@ -1,18 +1,17 @@
 package migrates
 
 import (
-	"github.com/go-gormigrate/gormigrate/v2"
 	"github.com/pubgo/lava/core/migrates"
 	"gorm.io/gorm"
 )
 
-func Migrations() []migrates.Migration {
-	return []migrates.Migration{
+func Migrations() []migrates.Migrate {
+	return []migrates.Migrate{
 		m0001,
 	}
 }
 
-func m0001() *gormigrate.Migration {
+func m0001() *migrates.Migration {
 	type Action struct {
 		Code string `gorm:"size:64;primaryKey"`
 		Type string `gorm:"size:8;not null"`
@@ -40,7 +39,7 @@ func m0001() *gormigrate.Migration {
 		DisplayName string `gorm:"size:32"`
 	}
 
-	return &gormigrate.Migration{
+	return &migrates.Migration{
 		ID: "0001_action",
 		Migrate: func(tx *gorm.DB) error {
 			return tx.AutoMigrate(&Action{}, &MenuItem{}, &Endpoint{}, &Role{})
diff --git a/go.mod b/go.mod
@@ -92,9 +92,8 @@ require (
 	github.com/gofiber/adaptor/v2 v2.1.20
 	github.com/gofiber/template v1.6.25
 	github.com/gofiber/utils v0.1.2
-	github.com/pubgo/dix v0.3.0
-	github.com/pubgo/funk v0.5.0
-	github.com/smartystreets/assertions v1.0.0
+	github.com/pubgo/dix v0.3.1
+	github.com/pubgo/funk v0.5.2
 	github.com/stretchr/testify v1.7.2
 	github.com/valyala/fasthttp v1.37.0
 	github.com/valyala/fasttemplate v1.2.1
diff --git a/go.sum b/go.sum
@@ -1042,10 +1042,10 @@ github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3x
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/pubgo/dix v0.3.0 h1:b3PAP0+NN2Gq+42XnoLkInPURfBI++YF2TZ6GBNCdkM=
-github.com/pubgo/dix v0.3.0/go.mod h1:dP3N4/MjdbJTFmcy1xWB2wK9HJQ5oYWoMGB6mHkuSaM=
-github.com/pubgo/funk v0.5.0 h1:4bmS8NfwY2qMJXCvxWANLRyor++Z8cf4+cAgjZCDTn0=
-github.com/pubgo/funk v0.5.0/go.mod h1:k2cyDFWT/QknMvwpRa0VU85g8XRuR3G22DCasFqpoNU=
+github.com/pubgo/dix v0.3.1 h1:0+uMDWYKCY6KI8aIhjESXhFdn6pC/fffWYs4RuQHQwo=
+github.com/pubgo/dix v0.3.1/go.mod h1:D58toBOxAF9yJRrjVUH+Rgs+ZvFrChu+1vIrY+W1wE4=
+github.com/pubgo/funk v0.5.2 h1:lMxN8LekEfwqdkXt/9uYN0vCE7hJsFeLpnauPoLn+Jk=
+github.com/pubgo/funk v0.5.2/go.mod h1:VG8eSUsgJ/SqZqVMnqW1xOGZZeq42R/Fi7/OOKIO0yE=
 github.com/pubgo/x v0.3.37 h1:hOj+yqTc2XqpP4Ap5V7FnDYh7gOQ09/sPm6TbiMgCNE=
 github.com/pubgo/x v0.3.37/go.mod h1:6EQsDssieDejOCOw+jnq3/60XQGaLjL6LNPVaUGDNt8=
 github.com/pubgo/xerror v0.4.20/go.mod h1:oII+ykbOChXWPDP55anP3C+ORCc/hn70lBRu5zcqEeE=
@@ -1098,7 +1098,6 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8=
 github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
diff --git a/internal/service/grpcs/middleware.go b/internal/service/grpcs/middleware.go
@@ -2,7 +2,6 @@ package grpcs
 
 import (
 	"context"
-	"github.com/pubgo/lava/service"
 	"strings"
 	"time"
 
@@ -15,6 +14,7 @@ import (
 
 	"github.com/pubgo/lava/internal/pkg/utils"
 	"github.com/pubgo/lava/internal/service/grpcutil"
+	"github.com/pubgo/lava/service"
 )
 
 func (t *serviceImpl) handlerHttpMiddle(middlewares []service.Middleware) func(fbCtx *fiber.Ctx) error {
diff --git a/internal/service/grpcs/service.go b/internal/service/grpcs/service.go
@@ -50,7 +50,7 @@ func newService(name string, desc ...string) *serviceImpl {
 				})
 
 				if runmode.Project == "" {
-					runmode.Project = strings.Split(name, " ")[0]
+					runmode.Project = strings.TrimSpace(strings.Split(name, " ")[0])
 				}
 				xerror.Assert(runmode.Project == "", "project is null")
 
@@ -64,7 +64,6 @@ func newService(name string, desc ...string) *serviceImpl {
 		httpSrv:  fiber_builder2.New(),
 		handlers: grpchan.HandlerMap{},
 	}
-
 	return g
 }
 
@@ -121,14 +120,22 @@ func (t *serviceImpl) init() (gErr error) {
 	defer xerror.RecoverErr(&gErr)
 
 	dix.Inject(t.dixInject)
-	t.handlers.ForEach(func(_ *grpc.ServiceDesc, svr interface{}) { dix.Inject(svr) })
+	t.handlers.ForEach(func(_ *grpc.ServiceDesc, svc interface{}) { dix.Inject(svc) })
 
 	// 网关初始化
 	xerror.Panic(t.httpSrv.Build(t.cfg.Api))
 	t.httpSrv.Get().Use(t.httpMiddle)
 	t.httpSrv.Get().Mount("/", t.app.App)
 
 	httpgrpc.HandleServices(func(pattern string, handler func(http.ResponseWriter, *http.Request)) {
+		t.httpSrv.Get().Options(pattern, func(ctx *fiber2.Ctx) error {
+			ctx.Response().Header.Set("Access-Control-Allow-Origin", "*")
+			ctx.Response().Header.Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE")
+			ctx.Response().Header.Set("Access-Control-Allow-Headers", "Origin, X-Requested-With, X-Extra-Header, Content-Type, Accept, Authorization")
+			ctx.Response().Header.Set("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Cache-Control, Content-Language, Content-Type")
+			return ctx.SendStatus(http.StatusOK)
+		})
+
 		t.httpSrv.Get().Post(pattern, func(ctx *fiber2.Ctx) error {
 			ctx.Response().Header.Set("Access-Control-Allow-Origin", "*")
 			ctx.Response().Header.Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE")
diff --git a/internal/service/web/service.go b/internal/service/web/service.go
@@ -3,13 +3,15 @@ package rests
 import (
 	"errors"
 	"fmt"
+
 	"net"
 	"net/http"
 	"strings"
 
 	fiber2 "github.com/gofiber/fiber/v2"
 	"github.com/pubgo/dix"
 	"github.com/pubgo/funk"
+	"github.com/pubgo/funk/xerr"
 	"github.com/pubgo/x/stack"
 	"github.com/pubgo/xerror"
 	"github.com/urfave/cli/v2"
@@ -41,7 +43,7 @@ func newService(name string, desc ...string) *serviceImpl {
 			Usage: utils.FirstNotEmpty(append(desc, fmt.Sprintf("%s service", name))...),
 			Flags: flags.GetFlags(),
 			Before: func(context *cli.Context) (gErr error) {
-				defer funk.RecoverErr(&gErr, func(err funk.XErr) funk.XErr {
+				defer funk.RecoverErr(&gErr, func(err xerr.XErr) xerr.XErr {
 					fmt.Println(dix.Graph())
 					return err
 				})
@@ -159,7 +161,7 @@ func (t *serviceImpl) start() (gErr error) {
 	logutil.OkOrPanic(t.log, "service before-start", func() error {
 		for _, run := range t.getLifecycle.GetBeforeStarts() {
 			t.log.Sugar().Infof("before-start running %s", stack.Func(run))
-			funk.MustMsg(xerror.Try(run), stack.Func(run))
+			funk.MustF(xerror.Try(run), stack.Func(run))
 		}
 		return nil
 	})

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/urfave/cli/v2"`
`10`	`10`
`11`	`11`	`"github.com/pubgo/lava/cmd/cmds/healthcmd"`
`12`		`- "github.com/pubgo/lava/cmd/cmds/migrate"`
	`12`	`+ "github.com/pubgo/lava/cmd/cmds/migratecmd"`
`13`	`13`	`"github.com/pubgo/lava/cmd/cmds/vercmd"`
`14`	`14`	`"github.com/pubgo/lava/core/runmode"`
`15`	`15`	`"github.com/pubgo/lava/core/signal"`
`@@ -48,7 +48,7 @@ func Run(services ...service.Command) {`
`48`	`48`	`return nil`
`49`	`49`	`}`
`50`	`50`
`51`		`- cmd.Subcommands = append(cmd.Subcommands, migrate.Cmd())`
	`51`	`+ cmd.Subcommands = append(cmd.Subcommands, migratecmd.Cmd())`
`52`	`52`	`cliApp.Commands = append(cliApp.Commands, cmd)`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ type configImpl struct {`
`74`	`74`
`75`	`75`	`func (t *configImpl) loadCustomCfg() {`
`76`	`76`	`var path = filepath.Dir(t.v.ConfigFileUsed())`
`77`		`- funk.MustMsg(filepath.Walk(path, func(path string, info fs.FileInfo, err error) error {`
	`77`	`+ funk.MustF(filepath.Walk(path, func(path string, info fs.FileInfo, err error) error {`
`78`	`78`	`if err != nil {`
`79`	`79`	`return err`
`80`	`80`	`}`
`@@ -220,7 +220,7 @@ func (t configImpl) initWithDir(v viper.Viper) bool {`
`220`	`220`
`221`	`221`	`funk.Assert(pathutil.IsNotExist(CfgDir), "config dir not found, path:%s", CfgPath)`
`222`	`222`	`v.AddConfigPath(filepath.Join(CfgDir, CfgName))`
`223`		`- funk.MustMsg(v.ReadInConfig(), "config load error, dir:%s", CfgDir)`
	`223`	`+ funk.MustF(v.ReadInConfig(), "config load error, dir:%s", CfgDir)`
`224`	`224`
`225`	`225`	`return true`
`226`	`226`	`}`