From 46a17563671042854d4b706b1470123e27a9c886 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 1 Feb 2023 12:15:27 +0800 Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E6=9B=B4=E6=96=B0=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/bazaar/icon.go | 2 +- kernel/bazaar/package.go | 4 ++-- kernel/bazaar/template.go | 2 +- kernel/bazaar/theme.go | 2 +- kernel/bazaar/widget.go | 2 +- kernel/util/rhy.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go index 8dec8f65f..a7d204639 100644 --- a/kernel/bazaar/icon.go +++ b/kernel/bazaar/icon.go @@ -54,7 +54,7 @@ func Icons() (icons []*Icon) { icon := &Icon{} innerU := util.BazaarOSSServer + "/package/" + repoURL + "/icon.json" - innerResp, innerErr := httpclient.NewBrowserRequest().SetResult(icon).Get(innerU) + innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(icon).Get(innerU) if nil != innerErr { logging.LogErrorf("get bazaar package [%s] failed: %s", repoURL, innerErr) return diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index 616d1c644..4b214ba3a 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -164,7 +164,7 @@ func getPkgIndex(pkgType string) (ret map[string]interface{}, err error) { ret = map[string]interface{}{} request := httpclient.NewBrowserRequest() u := util.BazaarOSSServer + "/bazaar@" + bazaarHash + "/stage/" + pkgType + ".json" - resp, reqErr := request.SetResult(&ret).Get(u) + resp, reqErr := request.SetSuccessResult(&ret).Get(u) if nil != reqErr { logging.LogErrorf("get community stage index [%s] failed: %s", u, reqErr) return @@ -409,7 +409,7 @@ func getBazaarIndex() map[string]*bazaarPackage { request := httpclient.NewBrowserRequest() u := util.BazaarStatServer + "/bazaar/index.json" - resp, reqErr := request.SetResult(&cachedBazaarIndex).Get(u) + resp, reqErr := request.SetSuccessResult(&cachedBazaarIndex).Get(u) if nil != reqErr { logging.LogErrorf("get bazaar index [%s] failed: %s", u, reqErr) return cachedBazaarIndex diff --git a/kernel/bazaar/template.go b/kernel/bazaar/template.go index a19fdae17..53b72f281 100644 --- a/kernel/bazaar/template.go +++ b/kernel/bazaar/template.go @@ -55,7 +55,7 @@ func Templates() (templates []*Template) { template := &Template{} innerU := util.BazaarOSSServer + "/package/" + repoURL + "/template.json" - innerResp, innerErr := httpclient.NewBrowserRequest().SetResult(template).Get(innerU) + innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(template).Get(innerU) if nil != innerErr { logging.LogErrorf("get community template [%s] failed: %s", repoURL, innerErr) return diff --git a/kernel/bazaar/theme.go b/kernel/bazaar/theme.go index 658287a79..c6aeca0c5 100644 --- a/kernel/bazaar/theme.go +++ b/kernel/bazaar/theme.go @@ -56,7 +56,7 @@ func Themes() (ret []*Theme) { theme := &Theme{} innerU := util.BazaarOSSServer + "/package/" + repoURL + "/theme.json" - innerResp, innerErr := httpclient.NewBrowserRequest().SetResult(theme).Get(innerU) + innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(theme).Get(innerU) if nil != innerErr { logging.LogErrorf("get bazaar package [%s] failed: %s", innerU, innerErr) return diff --git a/kernel/bazaar/widget.go b/kernel/bazaar/widget.go index 643cd8180..b90cf200f 100644 --- a/kernel/bazaar/widget.go +++ b/kernel/bazaar/widget.go @@ -55,7 +55,7 @@ func Widgets() (widgets []*Widget) { widget := &Widget{} innerU := util.BazaarOSSServer + "/package/" + repoURL + "/widget.json" - innerResp, innerErr := httpclient.NewBrowserRequest().SetResult(widget).Get(innerU) + innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(widget).Get(innerU) if nil != innerErr { logging.LogErrorf("get bazaar package [%s] failed: %s", repoURL, innerErr) return diff --git a/kernel/util/rhy.go b/kernel/util/rhy.go index 3d33cc7a5..bd306d150 100644 --- a/kernel/util/rhy.go +++ b/kernel/util/rhy.go @@ -38,7 +38,7 @@ func GetRhyResult(force bool) (map[string]interface{}, error) { } request := httpclient.NewCloudRequest30s() - _, err := request.SetResult(&cachedRhyResult).Get(AliyunServer + "/apis/siyuan/version?ver=" + Ver) + _, err := request.SetSuccessResult(&cachedRhyResult).Get(AliyunServer + "/apis/siyuan/version?ver=" + Ver) if nil != err { logging.LogErrorf("get version info failed: %s", err) return nil, err