fix: some reviews

cloudwego · Dec 16, 2022 · 48fba4d · 48fba4d
1 parent aa7eb43
commit 48fba4d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/cmd/hz/app/app.go b/cmd/hz/app/app.go
@@ -258,7 +258,7 @@ func Init() *cli.App {
 		},
 		{
 			Name:  meta.CmdClient,
-			Usage: "Generate hertz client based IDL",
+			Usage: "Generate hertz client based on IDL",
 			Flags: []cli.Flag{
 				&idlFlag,
 				&moduleFlag,

diff --git a/cmd/hz/generator/client.go b/cmd/hz/generator/client.go
@@ -54,8 +54,7 @@ func (pkgGen *HttpPackageGenerator) genClient(pkg *HttpPackage, clientDir string
 				return err
 			}
 		}
-		var client ClientFile
-		client = ClientFile{
+		client := ClientFile{
 			FilePath:      filepath.Join(clientDir, util.ToSnakeCase(s.Name)+".go"),
 			ServiceName:   util.ToSnakeCase(s.Name),
 			ClientMethods: s.ClientMethods,

diff --git a/cmd/hz/meta/const.go b/cmd/hz/meta/const.go
@@ -76,3 +76,8 @@ type Backend string
 const (
 	BackendGolang Backend = "golang"
 )
+
+// template const value
+const (
+	SetBodyParam = "setBodyParam(req).\n"
+)
diff --git a/cmd/hz/protobuf/ast.go b/cmd/hz/protobuf/ast.go
@@ -116,16 +116,13 @@ func astToService(ast *descriptorpb.FileDescriptorProto, resolver *Resolver, arg
 			Name: s.GetName(),
 		}
 
-		baseDomain := ""
+		service.BaseDomain = ""
 		domainAnno := checkFirstOption(api.E_BaseDomain, s.GetOptions())
 		if args.CmdType == meta.CmdClient {
 			val, ok := domainAnno.(string)
-			if !ok || len(val) == 0 {
-				baseDomain = ""
-			} else {
-				baseDomain = val
+			if ok && len(val) != 0 {
+				service.BaseDomain = val
 			}
-			service.BaseDomain = baseDomain
 		}
 
 		ms := s.GetMethod()
@@ -275,7 +272,7 @@ func parseAnnotationToClient(clientMethod *generator.ClientMethod, gen *protogen
 			clientMethod.FormFileCode += fmt.Sprintf("%q: req.Get%s(),\n", val, f.GoName)
 		}
 	}
-	clientMethod.BodyParamsCode = "setBodyParam(req).\n"
+	clientMethod.BodyParamsCode = meta.SetBodyParam
 	if hasBodyAnnotation && hasFormAnnotation {
 		clientMethod.FormValueCode = ""
 		clientMethod.FormFileCode = ""

diff --git a/cmd/hz/thrift/ast.go b/cmd/hz/thrift/ast.go
@@ -59,12 +59,11 @@ func astToService(ast *parser.Thrift, resolver *Resolver, args *config.Argument)
 		service := &generator.Service{
 			Name: s.GetName(),
 		}
-		baseDomain := ""
+		service.BaseDomain = ""
 		domainAnno := getAnnotation(s.Annotations, ApiBaseDomain)
 		if len(domainAnno) == 1 {
-			baseDomain = domainAnno[0]
 			if args.CmdType == meta.CmdClient {
-				service.BaseDomain = baseDomain
+				service.BaseDomain = domainAnno[0]
 			}
 		}
 
@@ -98,7 +97,7 @@ func astToService(ast *parser.Thrift, resolver *Resolver, args *config.Argument)
 			var reqName string
 			if len(m.Arguments) >= 1 {
 				if len(m.Arguments) > 1 {
-					return nil, fmt.Errorf("function '%s' has more than one argument, but only the first can be used in hertz now", m.GetName())
+					logs.Warnf("function '%s' has more than one argument, but only the first can be used in hertz now", m.GetName())
 				}
 				rt, err := resolver.ResolveIdentifier(m.Arguments[0].GetType().GetName())
 				if err != nil {
@@ -234,7 +233,7 @@ func parseAnnotationToClient(clientMethod *generator.ClientMethod, p *parser.Typ
 			}
 		}
 	}
-	clientMethod.BodyParamsCode = "setBodyParam(req).\n"
+	clientMethod.BodyParamsCode = meta.SetBodyParam
 	if hasBodyAnnotation && hasFormAnnotation {
 		clientMethod.FormValueCode = ""
 		clientMethod.FormFileCode = ""