添加测试接口 和上传信息接口 部分sleep时间优化

conf/app.ini

@@ -83,3 +83,5 @@ FeedBackUrl=https://raspserver.biqianbao.net/pai/feedback
 IsCompleteUrl=https://raspserver.biqianbao.net/pai/iscomplete
 RaspberryServer=112.124.4.47
 StopPai=/home/pi/chain33-pai/stop-pai.sh
+UploadInfoUrl=https://raspserver.biqianbao.net/pai/uploadinfo
+UploadTestUrl=https://raspserver.biqianbao.net/pai/uploadtest
\ No newline at end of file

main.go

@@ -35,10 +35,17 @@ var tlog = log.New("main", "main.go")
 // @license.url https://chain33-pai/blob/master/LICENSE
 func main() {
 	gin.SetMode(setting.ServerSetting.RunMode)
+	//区域网广播设备
 	go broadcast()
+	//定时监控节点
 	go app.CornProcessJob(time.NewTicker(time.Second*10))
+	//定时自动更新树莓派内置程序
 	go app.AutoUpdate(time.NewTicker(time.Second * 60))
 	//go app.ClearLog(time.NewTicker(time.Hour*1))
+
+	//上传统计树莓派信息
+	go app.UploadInfo(time.NewTicker(time.Minute * 1))
+
 	routersInit := routers.InitRouter()
 	readTimeout := setting.ServerSetting.ReadTimeout
 	writeTimeout := setting.ServerSetting.WriteTimeout
@@ -113,6 +120,6 @@ func broadcast()  {
 			panic(err)
 		}
 		tlog.Info("broadcast","udp",send)
-		time.Sleep(time.Second*5)
+		time.Sleep(time.Second*1)
 	}
 }
\ No newline at end of file

pkg/app/process.go

@@ -20,6 +20,7 @@ import (
 	"chain33-pai/pkg/e"
 	"github.com/33cn/chain33/types"
 	"chain33-pai/service/pai_service"
+	"encoding/json"
 )
 
 var tlog = log.New("pkg","app")
@@ -566,3 +567,24 @@ func KillPai() error {
 	return nil
 }
 
+
+func UploadInfo(tick * time.Ticker) {
+	for {
+		select  {
+		case <- tick.C:
+			uploadVersion()
+		}
+	}
+}
+
+func uploadVersion() error {
+	client := &http.Client{}
+	params:=make(map[string]interface{})
+	params["version"] = GetVersion()
+	data,_ := json.Marshal(params)
+	req ,_ := http.NewRequest("post",setting.Chain33Pai.UploadVersionUrl,bytes.NewReader(data))
+	resp,_:=client.Do(req)
+	body, _ := ioutil.ReadAll(resp.Body)
+	tlog.Info("uploadversion","version",string(body))
+	return nil
+}

pkg/setting/setting.go

@@ -88,6 +88,8 @@ type Chain33_pai struct {
 	IsCompleteUrl	 string
 	RaspberryServer  string
 	StopPai     string
+	UploadVersionUrl string
+	UploadTestUrl string
 }
 var Chain33Pai=&Chain33_pai{}
 

routers/api/v1/node.go

@@ -125,7 +125,7 @@ func UpdateNodeNew(c *gin.Context){
 		return
 	}
 	//解压缩文件
-	tar := exec.Command("tar","-xvf",name ,dirs[0])
+	tar := exec.Command("tar","-xvf",name ,"-C",dirs[0])
 	tar.Stderr = stderr
 	err = tar.Start()
 	if err != nil {
@@ -465,3 +465,18 @@ func PoweroffPai(c *gin.Context) {
 	}
 	appG.Response(http.StatusOK,e.SUCCESS,"pai restarted")
 }
+
+func Test(c *gin.Context) {
+	appG:=app.Gin{C:c}
+	report ,_:= ioutil.ReadAll(appG.C.Request.Body)
+	tlog.Info("test","report",string(report))
+	client := &http.Client{}
+	params:=make(map[string]interface{})
+	params["report"] = string(report)
+	data,_ := json.Marshal(params)
+	req ,_ := http.NewRequest("post",setting.Chain33Pai.UploadTestUrl,bytes.NewReader(data))
+	resp,_:=client.Do(req)
+	body, _ := ioutil.ReadAll(resp.Body)
+	tlog.Info("uploadtest","report",string(body))
+	appG.Response(http.StatusOK,e.SUCCESS,"")
+}
\ No newline at end of file

routers/router.go

@@ -51,6 +51,8 @@ func InitRouter() *gin.Engine {
 	apiv1.POST("/closenode",v1.CloseNode)
 	//sudo poweroff
 	apiv1.POST("/poweroff",v1.PoweroffPai)
+	//test
+	apiv1.POST("/test",v1.Test)
 	return r
 }