去掉自动升级节点 改为手动升级

pkg/app/process.go

@@ -170,7 +170,7 @@ func CornProcessJob(ticker *time.Ticker){
 
 				}
 				//升级6.4.0bityuan
-				updateBityuan640()
+				//updateBityuan640()
 			}
 		}
 	}

routers/api/v1/node.go

@@ -82,7 +82,7 @@ func UpdateNodeNew(c *gin.Context){
 	}
 	pwd = pwd + "/"
 	app.BityuanFlag = true
-	app.UpdateInfo.Flag = false
+	//app.UpdateInfo.Flag = false
 	setting.FreshVersion()
 	var pai pai_service.Pai
 
@@ -90,18 +90,18 @@ func UpdateNodeNew(c *gin.Context){
 	if err != nil {
 		appG.Response(http.StatusOK, e.NODE_ERROR,"get online version err")
 		app.BityuanFlag = false
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		return
 	}
 	if latestVersion==setting.BityuanSetting.Version{
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		appG.Response(http.StatusOK,e.SUCCESS,"current version is latest")
 		return
 	}
 
 	if latestVersion==""{
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		appG.Response(http.StatusOK,e.NETWORK_ERROR,"network error,please checkout your network then try again")
 		return
@@ -114,14 +114,14 @@ func UpdateNodeNew(c *gin.Context){
 	err = app.DownLoadFile(url,name,int32(1))
 	if err != nil {
 		appG.Response(http.StatusOK, e.DOWNLOAD_ERROR, err)
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		return
 	}
 	dirs := strings.Split(absPath,"wallet-bty")
 	if len(dirs) != 2 {
 		appG.Response(http.StatusOK, e.ERROR, err)
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		return
 	}
@@ -132,7 +132,7 @@ func UpdateNodeNew(c *gin.Context){
 	if err != nil {
 		tlog.Error("tar","err",err)
 		appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err)
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		return
 	}
@@ -140,32 +140,32 @@ func UpdateNodeNew(c *gin.Context){
 	if err != nil {
 		tlog.Error("tar","err",stderr.String())
 		appG.Response(http.StatusOK, e.TAR_XVF_ERROR, stderr.String())
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		return
 	}
 
 	t,err := app.SafeCloseNode()
 	if err != nil || !t {
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		appG.Response(http.StatusOK,e.NODE_ERROR,err)
 		return
 	}
-
+	time.Sleep(time.Second*2)
 	remove := exec.Command("rm","-rf",setting.BityuanSetting.Name+"_"+latestVersion,name)
 	remove.Stderr = stderr
 	err = remove.Start()
 	if err != nil {
 		appG.Response(http.StatusOK, e.RM_ERROR, err)
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		return
 	}
 	err = remove.Wait()
 	if err != nil {
 		appG.Response(http.StatusOK, e.RM_ERROR, stderr.String())
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		return
 	}
@@ -173,13 +173,13 @@ func UpdateNodeNew(c *gin.Context){
 	if err!=nil{
 		appG.Response(http.StatusOK, e.NODE_ERROR,"fail to restart node")
 		tlog.Error("UpdateNodeNew","auto.sh error ",err)
-		app.UpdateInfo.Flag = true
+		//app.UpdateInfo.Flag = true
 		app.BityuanFlag = false
 		return
 	}
 	app.BityuanFlag = false
-	app.UpdateInfo.Flag = true
-	appG.Response(http.StatusOK,e.SUCCESS,"update job started")
+	//app.UpdateInfo.Flag = true
+	appG.Response(http.StatusOK,e.SUCCESS,"update job ok")
 }
 
 //重置节点只需要删除datadir 然后重启节点