Commit 763d0a24 authored by YPJ's avatar YPJ

自动更新区分下载

parent 37629af9
...@@ -88,4 +88,5 @@ StopPai=/home/pi/chain33-pai/stop-pai.sh ...@@ -88,4 +88,5 @@ StopPai=/home/pi/chain33-pai/stop-pai.sh
UploadVersionUrl=https://raspserver.biqianbao.net/pai/uploadinfo UploadVersionUrl=https://raspserver.biqianbao.net/pai/uploadinfo
UploadTestUrl=https://raspserver.biqianbao.net/pai/uploadtest UploadTestUrl=https://raspserver.biqianbao.net/pai/uploadtest
VersionTestUrl=https://raspserver.biqianbao.net/pai/versiontest VersionTestUrl=https://raspserver.biqianbao.net/pai/versiontest
Env # 所处环境:测试环境test;正式环境formal
\ No newline at end of file Env = test
\ No newline at end of file
...@@ -544,10 +544,16 @@ func AutoUpdate() { ...@@ -544,10 +544,16 @@ func AutoUpdate() {
} }
func AutoUpdatePai() error { func AutoUpdatePai() error {
var url string
var name string
var p pai_service.Pai
//对比版本号 //对比版本号
version := util.VersionCompare(GetVersion()) version := util.VersionCompare(GetVersion())
//判断当前环境为测试环境还是正式环境
if setting.Chain33Pai.Env == "formal" {
//检查最新版本号online数据库 //检查最新版本号online数据库
var p pai_service.Pai
latest, err := p.GetPaiLatestVersion(int32(2)) latest, err := p.GetPaiLatestVersion(int32(2))
if err != nil { if err != nil {
return err return err
...@@ -558,13 +564,32 @@ func AutoUpdatePai() error { ...@@ -558,13 +564,32 @@ func AutoUpdatePai() error {
return nil return nil
} }
name := setting.Chain33Pai.Name + "_" + latest + ".tar.gz" name = setting.Chain33Pai.Name + "_" + latest + ".tar.gz"
if pai.GetArchType() == "x86_64" { if pai.GetArchType() == "x86_64" {
name = setting.Chain33Pai.Name + "-x86_64_" + latest + ".tar.gz" name = setting.Chain33Pai.Name + "-x86_64_" + latest + ".tar.gz"
} }
url := setting.Chain33Pai.DownloadUrl + name } else if setting.Chain33Pai.Env == "test" {
//检查最新测试版本号数据库
latest, err := p.GetPaiVersionTest(int32(2))
if err != nil {
return err
}
latestversion := util.VersionCompare(latest)
if version >= latestversion {
return nil
}
name = setting.Chain33Pai.Name + "-test_" + latest + ".tar.gz"
if pai.GetArchType() == "x86_64" {
name = setting.Chain33Pai.Name + "-test-x86_64_" + latest + ".tar.gz"
}
}
url = setting.Chain33Pai.DownloadUrl + name
//oss下载更新包 //oss下载更新包
err = DownLoadFile(url, name, int32(2)) err := DownLoadFile(url, name, int32(2))
if err != nil { if err != nil {
return err return err
} }
......
...@@ -49,7 +49,7 @@ func GetPaiVersion(c *gin.Context) { ...@@ -49,7 +49,7 @@ func GetPaiVersion(c *gin.Context) {
appG.Response(http.StatusOK, e.NETWORK_ERROR, nil) appG.Response(http.StatusOK, e.NETWORK_ERROR, nil)
return return
} }
test, err := pai.GetPaiVersionTest(int32(1)) test, err := pai.GetPaiVersionTest(int32(2))
if err != nil { if err != nil {
appG.Response(http.StatusOK, e.NETWORK_ERROR, nil) appG.Response(http.StatusOK, e.NETWORK_ERROR, nil)
return return
......
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