Merge pull request #200 from wubin1989/main

optimize code gen
unionj-cloud · May 5, 2024 · 24e1972 · 24e1972
2 parents 208178f + 2f18177
commit 24e1972
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/cmd/internal/svc/codegen/init.go b/cmd/internal/svc/codegen/init.go
@@ -72,7 +72,7 @@ type Parameter struct {
 	Sort    string
 	Order   string
 	Fields  string
-	Filters []interface{}
+	Filters string
 }
 
 func (receiver Parameter) GetPage() int64 {

diff --git a/cmd/internal/templates/mainmain.go b/cmd/internal/templates/mainmain.go
@@ -40,15 +40,18 @@ func main() {
 		)),
 	)
 	lis, dialCtx := pipeconn.NewPipeListener()
-	for _, v := range plugin.GetServicePlugins() {
-		v.Initialize(srv, grpcServer, dialCtx)
+	plugins := plugin.GetServicePlugins()
+	for _, key := range plugins.Keys() {
+		value, _ := plugins.Get(key)
+		value.Initialize(srv, grpcServer, dialCtx)
 	}
 	defer func() {
 		if r := recover(); r != nil {
 			zlogger.Info().Msgf("Recovered. Error: %v\n", r)
 		}
-		for _, v := range plugin.GetServicePlugins() {
-			v.Close()
+		for _, key := range plugins.Keys() {
+			value, _ := plugins.Get(key)
+			value.Close()
 		}
 	}()
 	go func() {

diff --git a/cmd/internal/templates/mainmodule.go b/cmd/internal/templates/mainmodule.go
@@ -13,15 +13,18 @@ import (
 func main() {
 	srv := rest.NewRestServer()
 	grpcServer := grpcx.NewEmptyGrpcServer()
-	for _, v := range plugin.GetServicePlugins() {
-		v.Initialize(srv, grpcServer, nil)
+	plugins := plugin.GetServicePlugins()
+	for _, key := range plugins.Keys() {
+		value, _ := plugins.Get(key)
+		value.Initialize(srv, grpcServer, nil)
 	}
 	defer func() {
 		if r := recover(); r != nil {
 			zlogger.Info().Msgf("Recovered. Error: %v\n", r)
 		}
-		for _, v := range plugin.GetServicePlugins() {
-			v.Close()
+		for _, key := range plugins.Keys() {
+			value, _ := plugins.Get(key)
+			value.Close()
 		}
 	}()
 	go func() {

diff --git a/cmd/internal/templates/plugin.go b/cmd/internal/templates/plugin.go
@@ -29,6 +29,11 @@ var _ plugin.ServicePlugin = (*{{.SvcName}}Plugin)(nil)
 
 type {{.SvcName}}Plugin struct {
 	grpcConns []*grpc.ClientConn
+	serviceInstance service.{{.SvcName}}
+}
+
+func (receiver *{{.SvcName}}Plugin) GetServiceInstance() interface{} {
+	return receiver.serviceInstance
 }
 
 func (receiver *{{.SvcName}}Plugin) Close() {
@@ -52,6 +57,7 @@ func (receiver *{{.SvcName}}Plugin) GetName() string {
 func (receiver *{{.SvcName}}Plugin) Initialize(restServer *rest.RestServer, grpcServer *grpcx.GrpcServer, dialCtx pipeconn.DialContextFunc) {
 	conf := config.LoadFromEnv()
 	svc := {{.ServiceAlias}}.New{{.SvcName}}(conf)
+	receiver.serviceInstance = svc
 	restServer.AddRoute(httpsrv.Routes(httpsrv.New{{.SvcName}}Handler(svc))...)
 	if grpcServer.Server == nil {
 		grpcServer.Server = grpc.NewServer(