Commit f98712df authored by szh's avatar szh

uploadinfo 增加其他信息

parent 385cf171
...@@ -640,18 +640,41 @@ func UploadInfo(tick * time.Ticker) { ...@@ -640,18 +640,41 @@ func UploadInfo(tick * time.Ticker) {
for { for {
select { select {
case <- tick.C: case <- tick.C:
uploadVersion() uploadInfo()
} }
} }
} }
//上传基本信息 //上传基本信息
func uploadInfo() error { func uploadInfo() error {
params:=make(map[string]interface{})
params["version"] = GetVersion()
var pai pai_service.Pai var pai pai_service.Pai
err := pai.SetPai() err := pai.SetPai()
if err != nil { if err != nil {
tlog.Error("SetPai","err",err) tlog.Error("SetPai","err",err)
return err return err
} }
params["addr"] = pai.Serial
params["info"] = pai
data,err := json.Marshal(params)
client := &http.Client{}
req ,err := http.NewRequest("POST",setting.Chain33Pai.UploadVersionUrl,bytes.NewReader(data))
if err != nil {
tlog.Error("uploadInfo","NewRequest",err)
return err
}
resp,err:=client.Do(req)
if err != nil {
tlog.Error("uploadInfo","NewRequest do",err)
return err
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
tlog.Error("uploadInfo","read",err)
return err
}
tlog.Info("uploadInfo","result",string(body))
return nil return nil
} }
......
...@@ -30,6 +30,7 @@ type Pai struct { ...@@ -30,6 +30,7 @@ type Pai struct {
IsNtpSync bool `json:"is_ntp_sync"` IsNtpSync bool `json:"is_ntp_sync"`
WalletStatus *types.WalletStatus `json:"wallet_status"` WalletStatus *types.WalletStatus `json:"wallet_status"`
NetInfo *types.NodeNetInfo `json:"net_info"` NetInfo *types.NodeNetInfo `json:"net_info"`
BtyVersion *types.VersionInfo `json:"bty_version"`
} }
type ReqUpdatePai struct { type ReqUpdatePai struct {
...@@ -37,10 +38,21 @@ type ReqUpdatePai struct { ...@@ -37,10 +38,21 @@ type ReqUpdatePai struct {
} }
func (p *Pai) SetPai() error { func (p *Pai) SetPai() error {
p.GetConfig()
p.GetDevstatus()
p.GetBtyVersion()
return nil return nil
} }
func (p *Pai) GetBtyVersion() error {
client := &chain33.PaiClient{}
v,err := client.Version()
if err != nil {
return err
}
p.BtyVersion = v
return nil
}
func (p *Pai) GetConfig() bool { func (p *Pai) GetConfig() bool {
if pai_serial != "" { if pai_serial != "" {
......
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