Commit 2e63e418 authored by linj's avatar linj

fix query output

parent a9e3ca0e
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
package commands package commands
import ( import (
"bytes"
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"fmt" "fmt"
...@@ -270,12 +271,8 @@ func queryWithdraw(cmd *cobra.Command, args []string) { ...@@ -270,12 +271,8 @@ func queryWithdraw(cmd *cobra.Command, args []string) {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
return return
} }
data, err := json.MarshalIndent(resp, "", " ")
if err != nil { jsonOutput(&resp)
fmt.Fprintln(os.Stderr, err)
return
}
fmt.Println(string(data))
} }
func show(cmd *cobra.Command, args []string) { func show(cmd *cobra.Command, args []string) {
...@@ -300,12 +297,7 @@ func show(cmd *cobra.Command, args []string) { ...@@ -300,12 +297,7 @@ func show(cmd *cobra.Command, args []string) {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
return return
} }
data, err := json.MarshalIndent(resp, "", " ") jsonOutput(&resp)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
fmt.Println(string(data))
} }
func getRealExecName(paraName string, name string) string { func getRealExecName(paraName string, name string) string {
...@@ -314,3 +306,18 @@ func getRealExecName(paraName string, name string) string { ...@@ -314,3 +306,18 @@ func getRealExecName(paraName string, name string) string {
} }
return paraName + name return paraName + name
} }
func jsonOutput(resp types.Message) {
data, err := types.PBToJSON(resp)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
var buf bytes.Buffer
err = json.Indent(&buf, data, "", " ")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
fmt.Println(string(buf.Bytes()))
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment