Update node.go

routers/api/v1/node.go

@@ -19,40 +19,41 @@ var flag bool//判断是否正在更新
 func ResetWallet(c *gin.Context) {
 	appG := app.Gin{C: c}
 	if app.NodeError!=nil{
-		appG.Response(http.StatusOK, e.ERROR, 	app.NodeError.Error())
+		log.Println(app.NodeError.Error())
+		appG.Response(http.StatusOK, e.NODE_ERROR,"node internal error,could not start node")
 		return
 	}
 	cmd:=exec.Command("kill","-9",app.Bityuan.Pid)
 	err:=cmd.Start()
 	if err!=nil{
-		appG.Response(http.StatusOK, e.ERROR, 	"fail to reset wallet")
+		appG.Response(http.StatusOK, e.ENV_ERROR, 	"fail to reset wallet")
 		log.Fatalln(err)
 		return
 	}
 	err=os.RemoveAll(fmt.Sprintf("%s/wallet",path.Dir(app.Bityuan.Path)))
 	if err!=nil{
-		appG.Response(http.StatusOK, e.ERROR, 	"fail to reset wallet")
+		appG.Response(http.StatusOK, e.NODE_ERROR, 	"fail to reset wallet")
 		log.Fatalln(err)
 		return
 	}
 
 	err=app.StartProcess(setting.Chain33Pai.Auto)
 	if err!=nil{
-		appG.Response(http.StatusOK, e.ERROR,"fail to restart node")
+		appG.Response(http.StatusOK, e.NODE_ERROR,"fail to restart node")
 		log.Fatalln(err)
 		return
 	}
-	appG.Response(http.StatusOK, e.SUCCESS,nil)
+	appG.Response(http.StatusOK, e.SUCCESS,"reset complete")
 
 }
 
 func UpdateNode(c *gin.Context){
 	appG := app.Gin{C: c}
 	if flag{
-		appG.Response(http.StatusOK,e.SUCCESS,"node is updating")
+		appG.Response(http.StatusOK,e.SUCCESS_RUNNING,"node is updating")
 	}
 	if app.NodeError!=nil{
-		appG.Response(http.StatusOK, e.ERROR, 	app.NodeError.Error())
+		appG.Response(http.StatusOK, e.NODE_ERROR,"node internal error,could not start node")
 		return
 	}
 	setting.FreshVersion()
@@ -66,13 +67,13 @@ func UpdateNode(c *gin.Context){
 
 	if flag{
 		app.UpdateInfo.Info="Updating..."
-		appG.Response(http.StatusOK,e.SUCCESS,"node is updating")
+		appG.Response(http.StatusOK,e.SUCCESS_RUNNING,"node is updating")
 		return
 	}
 	if latestVersion==""{
 		flag=false
 		app.UpdateInfo.Info="network error"
-		appG.Response(http.StatusOK,e.ERROR,"network error")
+		appG.Response(http.StatusOK,e.NETWORK_ERROR,"network error,please checkout your network then try again")
 		return
 	}
 	appG.Response(http.StatusOK,e.SUCCESS,"update job started")
@@ -113,7 +114,7 @@ func ResetNode(c* gin.Context){
 	app.UpdateInfo.Status=false
 	app.UpdateInfo.Info="updating..."
 	if flag{
-		appG.Response(http.StatusOK,e.SUCCESS,"node is resetting")
+		appG.Response(http.StatusOK,e.SUCCESS_RUNNING,"node is resetting")
 		return
 	}
 	appG.Response(http.StatusOK,e.SUCCESS,"reset job started")
@@ -137,6 +138,7 @@ func ResetNode(c* gin.Context){
 		//start := exec.Command(path.Dir(app.Wallet.Path) + "/" + app.Wallet.PName)
 		err=kill.Start()
 		if err != nil {
+
 			app.UpdateInfo.Info = fmt.Sprintf("fail to reset node:%s",err.Error())
 			return
 		}
@@ -163,6 +165,10 @@ func ResetNode(c* gin.Context){
 
 func UpdateDetail(c* gin.Context){
 	appG := app.Gin{C: c}
+	if flag{
+		appG.Response(http.StatusOK,e.SUCCESS_RUNNING,app.UpdateInfo)
+		return
+	}
 	appG.Response(http.StatusOK,e.SUCCESS,app.UpdateInfo)
 }
 
@@ -172,7 +178,7 @@ func Version(c* gin.Context){
 	setting.FreshVersion()
 	latestVersion:=app.GetLatestVersion()
 	if latestVersion==""{
-		appG.Response(http.StatusOK,e.ERROR,"network error,please try again")
+		appG.Response(http.StatusOK,e.NETWORK_ERROR,"network error,please try again")
 		return
 	}
 	appG.Response(http.StatusOK,e.SUCCESS,gin.H{
@@ -181,11 +187,10 @@ func Version(c* gin.Context){
 	})
 }
 
-
 func NodeInfo(c *gin.Context){
 	appG:=app.Gin{C:c}
 	if app.NodeError!=nil{
-		appG.Response(http.StatusOK,e.ERROR,app.NodeError.Error())
+		appG.Response(http.StatusOK,e.NODE_ERROR,"node down")
 		return
 	}
 	appG.Response(http.StatusOK,e.SUCCESS,"node is running")