Clone/aliyunpan
1
0
Fork 0
mirror of https://github.com/tickstep/aliyunpan.git synced 2025-01-23 22:42:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix update check error

Browse Source
This commit is contained in:
tickstep 2022-10-15 16:49:17 +08:00
parent 41fd68411e
commit ae077101f1
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
internal/panupdate/panupdate.go
View File

@ -17,10 +17,12 @@ import (
"archive/zip" "archive/zip"
"bytes" "bytes"
"fmt" "fmt"
jsoniter "github.com/json-iterator/go"
"github.com/tickstep/aliyunpan/cmder/cmdliner" "github.com/tickstep/aliyunpan/cmder/cmdliner"
"github.com/tickstep/aliyunpan/cmder/cmdutil" "github.com/tickstep/aliyunpan/cmder/cmdutil"
"github.com/tickstep/aliyunpan/internal/config" "github.com/tickstep/aliyunpan/internal/config"
"github.com/tickstep/aliyunpan/internal/utils" "github.com/tickstep/aliyunpan/internal/utils"
"github.com/tickstep/aliyunpan/library/requester/transfer"
"github.com/tickstep/library-go/cachepool" "github.com/tickstep/library-go/cachepool"
"github.com/tickstep/library-go/checkaccess" "github.com/tickstep/library-go/checkaccess"
"github.com/tickstep/library-go/converter" "github.com/tickstep/library-go/converter"
@ -28,7 +30,7 @@ import (
"github.com/tickstep/library-go/jsonhelper" "github.com/tickstep/library-go/jsonhelper"
"github.com/tickstep/library-go/logger" "github.com/tickstep/library-go/logger"
"github.com/tickstep/library-go/requester" "github.com/tickstep/library-go/requester"
"github.com/tickstep/aliyunpan/library/requester/transfer" "io/ioutil"
"net/http" "net/http"
"path/filepath" "path/filepath"
"regexp" "regexp"
@ -57,7 +59,7 @@ type tsResp struct {
func getReleaseFromTicstep(client *requester.HTTPClient, showPrompt bool) *ReleaseInfo { func getReleaseFromTicstep(client *requester.HTTPClient, showPrompt bool) *ReleaseInfo {
tsReleaseInfo := &ReleaseInfo{} tsReleaseInfo := &ReleaseInfo{}
tsResp := &tsResp{Data: tsReleaseInfo} tsRespObj := &tsResp{Data: tsReleaseInfo}
fullUrl := strings.Builder{} fullUrl := strings.Builder{}
ipAddr, err := getip.IPInfoFromTechainBaidu() ipAddr, err := getip.IPInfoFromTechainBaidu()
if err != nil { if err != nil {
@ -75,16 +77,33 @@ func getReleaseFromTicstep(client *requester.HTTPClient, showPrompt bool) *Relea
} }
return nil return nil
} }
err = jsonhelper.UnmarshalData(resp.Body, tsResp) respBytes, _ := ioutil.ReadAll(resp.Body)
// 解析响应返回
tsRespEntity := &tsResp{}
if err = jsoniter.Unmarshal(respBytes, tsRespEntity); err == nil {
if tsRespEntity.Code != 0 {
if showPrompt {
fmt.Printf("错误: %s\n", tsRespEntity.Msg)
}
logger.Verboseln(string(respBytes))
return nil
}
}
// 解析可用版本返回
err = jsoniter.Unmarshal(respBytes, tsRespObj)
if err != nil { if err != nil {
if showPrompt { if showPrompt {
fmt.Printf("json数据解析失败: %s\n", err) fmt.Printf("json数据解析失败: %s\n", err)
} }
return nil return nil
} }
if tsResp.Code == 0 { if tsRespObj.Code == 0 {
if tsReleaseInfo != nil && len(tsReleaseInfo.Assets) > 0 {
return tsReleaseInfo return tsReleaseInfo
} }
}
return nil return nil
} }