From fbddab69ebe3754e9472e40fd4c77951e800d35b Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 11:00:04 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20HTTP=20client=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E8=B7=9F=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/assets.go | 2 +- kernel/model/export.go | 4 ++-- kernel/model/liandi.go | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/kernel/model/assets.go b/kernel/model/assets.go index 1591d374c..cc415cc57 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -356,7 +356,7 @@ func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) { requestResult := gulu.Ret.NewResult() request := httpclient.NewCloudFileRequest2m() resp, reqErr := request. - SetResult(requestResult). + SetSuccessResult(requestResult). SetFile("file[]", absAsset). SetCookies(&http.Cookie{Name: "symphony", Value: uploadToken}). SetHeader("meta-type", metaType). diff --git a/kernel/model/export.go b/kernel/model/export.go index dfe1ddb36..aa71bf140 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -76,7 +76,7 @@ func Export2Liandi(id string) (err error) { result := gulu.Ret.NewResult() request := httpclient.NewCloudRequest30s() resp, getErr := request. - SetResult(result). + SetSuccessResult(result). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Get(util.LiandiServer + "/api/v2/article/update/" + articleId) if nil != getErr { @@ -115,7 +115,7 @@ func Export2Liandi(id string) (err error) { result := gulu.Ret.NewResult() request := httpclient.NewCloudRequest30s() request = request. - SetResult(result). + SetSuccessResult(result). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetBody(map[string]interface{}{ "articleTitle": title, diff --git a/kernel/model/liandi.go b/kernel/model/liandi.go index 28b9b1a61..1b471e9b3 100644 --- a/kernel/model/liandi.go +++ b/kernel/model/liandi.go @@ -44,7 +44,7 @@ func StartFreeTrial() (err error) { requestResult := gulu.Ret.NewResult() request := httpclient.NewCloudRequest30s() _, err = request. - SetResult(requestResult). + SetSuccessResult(requestResult). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Post(util.AliyunServer + "/apis/siyuan/user/startFreeTrial") if nil != err { @@ -61,7 +61,7 @@ func DeactivateUser() (err error) { requestResult := gulu.Ret.NewResult() request := httpclient.NewCloudRequest30s() resp, err := request. - SetResult(requestResult). + SetSuccessResult(requestResult). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Post(util.AliyunServer + "/apis/siyuan/user/deactivate") if nil != err { @@ -86,7 +86,7 @@ func SetCloudBlockReminder(id, data string, timed int64) (err error) { payload := map[string]interface{}{"dataId": id, "data": data, "timed": timed} request := httpclient.NewCloudRequest30s() resp, err := request. - SetResult(requestResult). + SetSuccessResult(requestResult). SetBody(payload). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Post(util.AliyunServer + "/apis/siyuan/calendar/setBlockReminder") @@ -119,7 +119,7 @@ func LoadUploadToken() (err error) { requestResult := gulu.Ret.NewResult() request := httpclient.NewCloudRequest30s() resp, err := request. - SetResult(requestResult). + SetSuccessResult(requestResult). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Post(util.AliyunServer + "/apis/siyuan/upload/token") if nil != err { @@ -333,7 +333,7 @@ func RemoveCloudShorthands(ids []string) (err error) { "ids": ids, } resp, err := request. - SetResult(&result). + SetSuccessResult(&result). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetBody(body). Post(util.AliyunServer + "/apis/siyuan/inbox/removeCloudShorthands") @@ -361,7 +361,7 @@ func GetCloudShorthand(id string) (ret map[string]interface{}, err error) { result := map[string]interface{}{} request := httpclient.NewCloudRequest30s() resp, err := request. - SetResult(&result). + SetSuccessResult(&result). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Post(util.AliyunServer + "/apis/siyuan/inbox/getCloudShorthand?id=" + id) if nil != err { @@ -392,7 +392,7 @@ func GetCloudShorthands(page int) (result map[string]interface{}, err error) { result = map[string]interface{}{} request := httpclient.NewCloudRequest30s() resp, err := request. - SetResult(&result). + SetSuccessResult(&result). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Post(util.AliyunServer + "/apis/siyuan/inbox/getCloudShorthands?p=" + strconv.Itoa(page)) if nil != err { @@ -429,7 +429,7 @@ func getUser(token string) (*conf.User, error) { result := map[string]interface{}{} request := httpclient.NewCloudRequest30s() _, err := request. - SetResult(&result). + SetSuccessResult(&result). SetBody(map[string]string{"token": token}). Post(util.AliyunServer + "/apis/siyuan/user") if nil != err { @@ -462,7 +462,7 @@ func UseActivationcode(code string) (err error) { requestResult := gulu.Ret.NewResult() request := httpclient.NewCloudRequest30s() _, err = request. - SetResult(requestResult). + SetSuccessResult(requestResult). SetBody(map[string]string{"data": code}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Post(util.AliyunServer + "/apis/siyuan/useActivationcode") @@ -483,7 +483,7 @@ func CheckActivationcode(code string) (retCode int, msg string) { requestResult := gulu.Ret.NewResult() request := httpclient.NewCloudRequest30s() _, err := request. - SetResult(requestResult). + SetSuccessResult(requestResult). SetBody(map[string]string{"data": code}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). Post(util.AliyunServer + "/apis/siyuan/checkActivationcode") @@ -503,7 +503,7 @@ func Login(userName, password, captcha string) (ret *gulu.Result, err error) { result := map[string]interface{}{} request := httpclient.NewCloudRequest30s() _, err = request. - SetResult(&result). + SetSuccessResult(&result). SetBody(map[string]string{"userName": userName, "userPassword": password, "captcha": captcha}). Post(util.AliyunServer + "/apis/siyuan/login") if nil != err { @@ -529,7 +529,7 @@ func Login2fa(token, code string) (map[string]interface{}, error) { result := map[string]interface{}{} request := httpclient.NewCloudRequest30s() _, err := request. - SetResult(&result). + SetSuccessResult(&result). SetBody(map[string]string{"twofactorAuthCode": code}). SetHeader("token", token). Post(util.AliyunServer + "/apis/siyuan/login/2fa")