Merge pull request #420 from TarsCloud/fix/pb2tarsrpc

lbbniu · web-flow · commit c5c4fe8e2231 · 2023-02-14T12:24:49.000+08:00
fix(tools/protoc-gen-go-tarsrpc): protoc-gen-go-tarsrpc compatible with old version pb2tarsgo
diff --git a/tars/tools/protoc-gen-go-tarsrpc/tarsrpc.go b/tars/tools/protoc-gen-go-tarsrpc/tarsrpc.go
@@ -263,7 +263,7 @@ func (t *tarsrpc) generateClientCode(service *protogen.Service, method *protogen
 			}
 			return output, nil
 		}
-	`, methodName, serviceName, methodName, inType, outType, method.GoName))
+	`, methodName, serviceName, methodName, inType, outType, method.Desc.Name()))
 }
 func (t *tarsrpc) generateDispatch(service *protogen.Service) {
 	serviceName := upperFirstLatter(service.GoName)
@@ -298,7 +298,7 @@ func (t *tarsrpc) generateDispatch(service *protogen.Service) {
 			if err != nil {
 				return err
 			}
-		`, method.GoName, t.gen.QualifiedGoIdent(method.Input.GoIdent), t.gen.QualifiedGoIdent(method.Output.GoIdent), serviceName, upperFirstLatter(method.GoName), serviceName, upperFirstLatter(method.GoName)))
+		`, method.Desc.Name(), t.gen.QualifiedGoIdent(method.Input.GoIdent), t.gen.QualifiedGoIdent(method.Output.GoIdent), serviceName, upperFirstLatter(method.GoName), serviceName, upperFirstLatter(method.GoName)))
 	}
 	t.P(`default:
 			return fmt.Errorf("func mismatch")

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ func (t tarsrpc) generateClientCode(service protogen.Service, method *protogen`
`263`	`263`	`}`
`264`	`264`	`return output, nil`
`265`	`265`	`}`
`266`		- `, methodName, serviceName, methodName, inType, outType, method.GoName))
	`266`	+ `, methodName, serviceName, methodName, inType, outType, method.Desc.Name()))
`267`	`267`	`}`
`268`	`268`	`func (t tarsrpc) generateDispatch(service protogen.Service) {`
`269`	`269`	`serviceName := upperFirstLatter(service.GoName)`
`@@ -298,7 +298,7 @@ func (t tarsrpc) generateDispatch(service protogen.Service) {`
`298`	`298`	`if err != nil {`
`299`	`299`	`return err`
`300`	`300`	`}`
`301`		- `, method.GoName, t.gen.QualifiedGoIdent(method.Input.GoIdent), t.gen.QualifiedGoIdent(method.Output.GoIdent), serviceName, upperFirstLatter(method.GoName), serviceName, upperFirstLatter(method.GoName)))
	`301`	+ `, method.Desc.Name(), t.gen.QualifiedGoIdent(method.Input.GoIdent), t.gen.QualifiedGoIdent(method.Output.GoIdent), serviceName, upperFirstLatter(method.GoName), serviceName, upperFirstLatter(method.GoName)))
`302`	`302`	`}`
`303`	`303`	t.P(`default:
`304`	`304`	`return fmt.Errorf("func mismatch")`