feat: refactor.

bootstrap.go

@@ -24,6 +24,7 @@ var (
 	)
 )
 
+// NewApp 创建应用程序
 func NewApp(ll log.Logger, rr kratosRegistry.Registrar, srv ...transport.Server) *kratos.App {
 	return kratos.New(
 		kratos.ID(Service.GetInstanceId()),
@@ -38,8 +39,8 @@ func NewApp(ll log.Logger, rr kratosRegistry.Registrar, srv ...transport.Server)
 	)
 }
 
-// doBootstrap 应用引导启动
-func doBootstrap(serviceInfo *config.ServiceInfo) (*conf.Bootstrap, log.Logger, kratosRegistry.Registrar) {
+// DoBootstrap 执行引导
+func DoBootstrap(serviceInfo *config.ServiceInfo) (*conf.Bootstrap, log.Logger, kratosRegistry.Registrar) {
 	// inject command flags
 	Flags := config.NewCommandFlags()
 	Flags.Init()
@@ -67,16 +68,26 @@ func doBootstrap(serviceInfo *config.ServiceInfo) (*conf.Bootstrap, log.Logger,
 
 type InitApp func(logger log.Logger, registrar kratosRegistry.Registrar, bootstrap *conf.Bootstrap) (*kratos.App, func(), error)
 
-func Bootstrap(initApp InitApp) {
-	// bootstrap
-	cfg, ll, reg := doBootstrap(Service)
+// Bootstrap 应用引导启动
+func Bootstrap(initApp InitApp, serviceName, version *string) {
+	if serviceName != nil && len(*serviceName) != 0 {
+		Service.Name = *serviceName
+	}
+	if version != nil && len(*version) != 0 {
+		Service.Version = *version
+	}
 
+	// bootstrap
+	cfg, ll, reg := DoBootstrap(Service)
+
+	// init app
 	app, cleanup, err := initApp(ll, reg, cfg)
 	if err != nil {
 		panic(err)
 	}
 	defer cleanup()
 
+	// run the app.
 	if err = app.Run(); err != nil {
 		panic(err)
 	}

bootstrap_test.go

@@ -1,19 +1,57 @@
 package bootstrap
 
 import (
+	"testing"
+
 	"github.com/go-kratos/kratos/v2"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/go-kratos/kratos/v2/registry"
+
 	v1 "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1"
-	"testing"
+	"github.com/tx7do/kratos-bootstrap/config"
 )
 
-func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *v1.Bootstrap) (*kratos.App, func(), error) {
+func initApp(logger log.Logger, registrar registry.Registrar, _ *v1.Bootstrap) (*kratos.App, func(), error) {
 	app := NewApp(logger, registrar)
 	return app, func() {
 	}, nil
 }
 
 func TestBootstrap(t *testing.T) {
-	Bootstrap(initApp)
+	serviceName := "test"
+	version := "v0.0.1"
+	Bootstrap(initApp, &serviceName, &version)
+}
+
+type CustomConfig struct {
+	Cfg string `protobuf:"bytes,1,opt,name=cfg,proto3" json:"cfg,omitempty"`
+}
+
+func initAppEx(logger log.Logger, registrar registry.Registrar, _ *v1.Bootstrap, _ *CustomConfig) (*kratos.App, func(), error) {
+	app := NewApp(logger, registrar)
+	return app, func() {
+	}, nil
+}
+
+func TestCustomBootstrap(t *testing.T) {
+	customCfg := &CustomConfig{}
+	config.RegisterConfig(customCfg)
+
+	Service.SetName("test")
+	Service.SetVersion("v0.0.1")
+
+	// bootstrap
+	cfg, ll, reg := DoBootstrap(Service)
+
+	// init app
+	app, cleanup, err := initAppEx(ll, reg, cfg, customCfg)
+	if err != nil {
+		panic(err)
+	}
+	defer cleanup()
+
+	// run the app.
+	if err = app.Run(); err != nil {
+		panic(err)
+	}
 }

config/service_info.go

@@ -21,6 +21,14 @@ func NewServiceInfo(name, version, id string) *ServiceInfo {
 	}
 }
 
+func (s *ServiceInfo) SetName(name string) {
+	s.Name = name
+}
+
+func (s *ServiceInfo) SetVersion(version string) {
+	s.Version = version
+}
+
 func (s *ServiceInfo) GetInstanceId() string {
 	return s.Id + "." + s.Name
 }

tag.bat

@@ -1,4 +1,4 @@
-git tag v0.3.6
+git tag v0.3.9
 
 git tag api/v0.0.2 --force