0.3.3

pkg/app/version.go

 package app
 
-const version = "0.3.2"
+const version = "0.3.3"
 
 var (
 	GitCommit string

routers/api/v1/node.go

@@ -12,8 +12,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/33cn/chain33/types"
-	"github.com/gin-gonic/gin"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -22,6 +20,9 @@ import (
 	"reflect"
 	"strings"
 	"time"
+
+	"github.com/33cn/chain33/types"
+	"github.com/gin-gonic/gin"
 )
 
 // @Summary 重置节点钱包
@@ -66,14 +67,26 @@ func UpdateNodeNew(c *gin.Context) {
 	//app.UpdateInfo.Flag = false
 	setting.FreshVersion()
 	var pai pai_service.Pai
-
-	latestVersion, err := pai.GetPaiLatestVersion(int32(1))
-	if err != nil {
-		appG.Response(http.StatusOK, e.NODE_ERROR, "get online version err")
-		app.BityuanFlag.Flag = false
-		//app.UpdateInfo.Flag = true
-		return
+	var latestVersion string
+	//判断当前环境为测试环境还是正式环境
+	if setting.Chain33Pai.Env == "formal" {
+		latestVersion, err = pai.GetPaiLatestVersion(int32(1))
+		if err != nil {
+			appG.Response(http.StatusOK, e.NODE_ERROR, "get online version err")
+			app.BityuanFlag.Flag = false
+			//app.UpdateInfo.Flag = true
+			return
+		}
+	} else if setting.Chain33Pai.Env == "test" {
+		latestVersion, err = pai.GetPaiVersionTest(int32(1))
+		if err != nil {
+			appG.Response(http.StatusOK, e.NODE_ERROR, "get online version err")
+			app.BityuanFlag.Flag = false
+			//app.UpdateInfo.Flag = true
+			return
+		}
 	}
+
 	if latestVersion == setting.BityuanSetting.Version {
 		//app.UpdateInfo.Flag = true
 		app.BityuanFlag.Flag = false
@@ -92,14 +105,14 @@ func UpdateNodeNew(c *gin.Context) {
 	url := setting.Chain33Pai.DownloadUrl + name
 	if pai2.GetArchType() == "x86_64" {
 		name = setting.BityuanSetting.Name + "-linux_" + latestVersion + ".tar.gz"
-		url = setting.Chain33Pai.DownloadUrl+ name
+		url = setting.Chain33Pai.DownloadUrl + name
 	} else if pai2.GetArchType() == "arm" {
-		name = setting.BityuanSetting.Name +"-arm_" + latestVersion + ".tar.gz"
+		name = setting.BityuanSetting.Name + "-arm_" + latestVersion + ".tar.gz"
 		url = setting.Chain33Pai.DownloadUrl + name
 	}
 	tlog.Info("UpdateNode", "dir", setting.BityuanSetting.Name+"_"+latestVersion)
 	tlog.Info("UpdateNode", "path", absPath)
-	tlog.Info("downloadUrl","url",url)
+	tlog.Info("downloadUrl", "url", url)
 	err = app.DownLoadFile(url, name, int32(1))
 	if err != nil {
 		appG.Response(http.StatusOK, e.DOWNLOAD_ERROR, err)
@@ -467,7 +480,7 @@ func EscrowPasswd(c *gin.Context) {
 		return
 	}
 	defer f.Close()
-	pdStr := base64.StdEncoding.EncodeToString([]byte("raspberry"+passwd.Password))
+	pdStr := base64.StdEncoding.EncodeToString([]byte("raspberry" + passwd.Password))
 	f.WriteString(pdStr)
 	appG.Response(http.StatusOK, e.SUCCESS, nil)