diff --git a/scalib/main.go b/scalib/main.go index ada0061..e0fba80 100644 --- a/scalib/main.go +++ b/scalib/main.go @@ -4,6 +4,7 @@ import ( "flag" "fmt" "net/rpc" + "net/rpc/jsonrpc" "os" "scalib/util" @@ -51,17 +52,18 @@ func main() { } defer client.rpcClient.Close() // 调用 transferFile - err = transferFile(client, *curPath, *uploadPath) - if err != nil { - logger.Error("TransferFile failed", zap.Error(err)) - fmt.Printf("TransferFile failed: %v\n", err) - } - fmt.Printf("TransferFile success\n") + // err = transferFile(client, *curPath, *uploadPath) + // if err != nil { + // logger.Error("TransferFile failed", zap.Error(err)) + // fmt.Printf("TransferFile failed: %v\n", err) + // } + // fmt.Printf("TransferFile success\n") + transferFile(client, *curPath, *uploadPath) } // 创建新的客户端 func NewUpFileClient(addr string) (*UpFileClient, error) { - client, err := rpc.Dial("tcp", addr) + client, err := jsonrpc.Dial("tcp", addr) if err != nil { return nil, err } @@ -92,16 +94,16 @@ func transferFile(c *UpFileClient, curPath string, uploadPath string) error { // fmt.Printf("file size: %d\n", fileInfo.Size()) // 异步 - go func() { - // 发送文件信息 - var reply string - c.rpcClient.Call("UpFileService.SendFileInfo", FileInfo{ - FileName: uploadPath, - FileSize: fileInfo.Size(), - }, &reply) - // 输出执行的结果 - fmt.Printf("SendFileInfo result: %v\n", reply) - }() + // go func() { + // 发送文件信息 + var reply string + c.rpcClient.Call("UpFileService.SendFileInfo", FileInfo{ + FileName: uploadPath, + FileSize: fileInfo.Size(), + }, &reply) + // 输出执行的结果 + fmt.Printf("SendFileInfo result: %v\n", reply) + // }() return nil }