fixed: 类型和包的解析错误

lazygophers · Jan 2, 2025 · 3eb0e01 · 3eb0e01
1 parent 5474d74
commit 3eb0e01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/codegen/pbparse.go b/codegen/pbparse.go
@@ -328,24 +328,21 @@ func (p *PbRPC) walk() {
 		}
 		if idx := strings.LastIndex(text, "."); idx > 0 {
 			p.requestPackage = text[idx+1:]
-		} else {
-			p.requestPackage = text
+			text = text[:idx]
 		}
 	}
 
 	if strings.Contains(p.rpc.ReturnsType, ".") {
 		text := p.rpc.ReturnsType
 		if idx := strings.LastIndex(text, "."); idx > 0 {
-			p.responsePackage = text[idx+1:]
+			p.returnsType = text[idx+1:]
 			text = text[:idx]
 		}
 		if idx := strings.LastIndex(text, "."); idx > 0 {
 			p.responsePackage = text[idx+1:]
-		} else {
-			p.responsePackage = text
+			text = text[:idx]
 		}
 	}
-
 }
 
 func NewPbRPC(rpc *proto.RPC) *PbRPC {

diff --git a/codegen/template/client.call.gtpl b/codegen/template/client.call.gtpl
@@ -1,5 +1,5 @@
-func {{ .RPC.RpcName }}(ctx *lrpc.Ctx, req *{{ .RequestType }}) (*{{ .ResponseType }}, error) {
-	var rsp {{ .ResponseType }}
+func {{ .RPC.RpcName }}(ctx *lrpc.Ctx, req *{{ .RequestPackage }}.{{ .RequestType }}) (*{{ .ResponsePackage }}.{{ .ResponseType }}, error) {
+	var rsp {{ .ResponsePackage }}.{{ .ResponseType }}
 	return &rsp, lrpc.Call(ctx, &core.ServiceDiscoveryClient{
 		ServiceName: ServerName,
 		ServicePath: RpcPath{{ .RPC.RpcName }},