|
@@ -347,13 +347,30 @@ func DownloadByGrpc(address string, args *entity.Args, timeout int64) (*pb.Respo
|
|
* @return error 错误信息
|
|
* @return error 错误信息
|
|
*/
|
|
*/
|
|
func GetBidDetailByGrpc(address string, args *entity.Args) (*api.Result, error) {
|
|
func GetBidDetailByGrpc(address string, args *entity.Args) (*api.Result, error) {
|
|
- result, err := DownloadByGrpc(address, args, 0)
|
|
|
|
|
|
+ serviceClient, ctx, cancel, err := GrpcCall(address, 0)
|
|
|
|
+ defer cancel()
|
|
|
|
+ result := &api.Result{}
|
|
if err != nil {
|
|
if err != nil {
|
|
- return &api.Result{}, err
|
|
|
|
|
|
+ return result, err
|
|
|
|
+ }
|
|
|
|
+ resp, err := serviceClient.GetBidDetail(ctx, &pb.DownloadRequest{BucketID: args.BucketID, ObjectName: args.ObjectName})
|
|
|
|
+ if err != nil {
|
|
|
|
+ log.Println(err)
|
|
|
|
+ return nil, err
|
|
|
|
+ }
|
|
|
|
+ b := &bytes.Buffer{}
|
|
|
|
+ for {
|
|
|
|
+ reply, err := resp.Recv()
|
|
|
|
+ if err == io.EOF {
|
|
|
|
+ break
|
|
|
|
+ } else if err != nil {
|
|
|
|
+ log.Println(err)
|
|
|
|
+ return nil, err
|
|
|
|
+ }
|
|
|
|
+ result.Error_msg = reply.ErrorMsg
|
|
|
|
+ result.Error_code = int(reply.ErrorCode)
|
|
|
|
+ b.Write(reply.Data)
|
|
}
|
|
}
|
|
- return &api.Result{
|
|
|
|
- Data: string(result.Data),
|
|
|
|
- Error_code: int(result.ErrorCode),
|
|
|
|
- Error_msg: result.ErrorMsg,
|
|
|
|
- }, nil
|
|
|
|
|
|
+ result.Data = string(b.Bytes())
|
|
|
|
+ return result, nil
|
|
}
|
|
}
|