Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 09:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

♻️ HTTP client 升级跟进

Browse source
This commit is contained in:
Liang Ding 2023-02-17 11:00:04 +08:00
parent 19d6c50535
commit fbddab69eb
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/assets.go
View file

@ -356,7 +356,7 @@ func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) {
requestResult := gulu.Ret.NewResult() requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudFileRequest2m() request := httpclient.NewCloudFileRequest2m()
resp, reqErr := request. resp, reqErr := request.
SetResult(requestResult). SetSuccessResult(requestResult).
SetFile("file[]", absAsset). SetFile("file[]", absAsset).
SetCookies(&http.Cookie{Name: "symphony", Value: uploadToken}). SetCookies(&http.Cookie{Name: "symphony", Value: uploadToken}).
SetHeader("meta-type", metaType). SetHeader("meta-type", metaType).

4
kernel/model/export.go
View file

@ -76,7 +76,7 @@ func Export2Liandi(id string) (err error) {
result := gulu.Ret.NewResult() result := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
resp, getErr := request. resp, getErr := request.
SetResult(result). SetSuccessResult(result).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Get(util.LiandiServer + "/api/v2/article/update/" + articleId) Get(util.LiandiServer + "/api/v2/article/update/" + articleId)
if nil != getErr { if nil != getErr {
@ -115,7 +115,7 @@ func Export2Liandi(id string) (err error) {
result := gulu.Ret.NewResult() result := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
request = request. request = request.
SetResult(result). SetSuccessResult(result).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
SetBody(map[string]interface{}{ SetBody(map[string]interface{}{
"articleTitle": title, "articleTitle": title,

24
kernel/model/liandi.go
View file

@ -44,7 +44,7 @@ func StartFreeTrial() (err error) {
requestResult := gulu.Ret.NewResult() requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
_, err = request. _, err = request.
SetResult(requestResult). SetSuccessResult(requestResult).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/user/startFreeTrial") Post(util.AliyunServer + "/apis/siyuan/user/startFreeTrial")
if nil != err { if nil != err {
@ -61,7 +61,7 @@ func DeactivateUser() (err error) {
requestResult := gulu.Ret.NewResult() requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
resp, err := request. resp, err := request.
SetResult(requestResult). SetSuccessResult(requestResult).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/user/deactivate") Post(util.AliyunServer + "/apis/siyuan/user/deactivate")
if nil != err { 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} payload := map[string]interface{}{"dataId": id, "data": data, "timed": timed}
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
resp, err := request. resp, err := request.
SetResult(requestResult). SetSuccessResult(requestResult).
SetBody(payload). SetBody(payload).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/calendar/setBlockReminder") Post(util.AliyunServer + "/apis/siyuan/calendar/setBlockReminder")
@ -119,7 +119,7 @@ func LoadUploadToken() (err error) {
requestResult := gulu.Ret.NewResult() requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
resp, err := request. resp, err := request.
SetResult(requestResult). SetSuccessResult(requestResult).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/upload/token") Post(util.AliyunServer + "/apis/siyuan/upload/token")
if nil != err { if nil != err {
@ -333,7 +333,7 @@ func RemoveCloudShorthands(ids []string) (err error) {
"ids": ids, "ids": ids,
} }
resp, err := request. resp, err := request.
SetResult(&result). SetSuccessResult(&result).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
SetBody(body). SetBody(body).
Post(util.AliyunServer + "/apis/siyuan/inbox/removeCloudShorthands") 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{}{} result := map[string]interface{}{}
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
resp, err := request. resp, err := request.
SetResult(&result). SetSuccessResult(&result).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/inbox/getCloudShorthand?id=" + id) Post(util.AliyunServer + "/apis/siyuan/inbox/getCloudShorthand?id=" + id)
if nil != err { if nil != err {
@ -392,7 +392,7 @@ func GetCloudShorthands(page int) (result map[string]interface{}, err error) {
result = map[string]interface{}{} result = map[string]interface{}{}
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
resp, err := request. resp, err := request.
SetResult(&result). SetSuccessResult(&result).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/inbox/getCloudShorthands?p=" + strconv.Itoa(page)) Post(util.AliyunServer + "/apis/siyuan/inbox/getCloudShorthands?p=" + strconv.Itoa(page))
if nil != err { if nil != err {
@ -429,7 +429,7 @@ func getUser(token string) (*conf.User, error) {
result := map[string]interface{}{} result := map[string]interface{}{}
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
_, err := request. _, err := request.
SetResult(&result). SetSuccessResult(&result).
SetBody(map[string]string{"token": token}). SetBody(map[string]string{"token": token}).
Post(util.AliyunServer + "/apis/siyuan/user") Post(util.AliyunServer + "/apis/siyuan/user")
if nil != err { if nil != err {
@ -462,7 +462,7 @@ func UseActivationcode(code string) (err error) {
requestResult := gulu.Ret.NewResult() requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
_, err = request. _, err = request.
SetResult(requestResult). SetSuccessResult(requestResult).
SetBody(map[string]string{"data": code}). SetBody(map[string]string{"data": code}).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/useActivationcode") Post(util.AliyunServer + "/apis/siyuan/useActivationcode")
@ -483,7 +483,7 @@ func CheckActivationcode(code string) (retCode int, msg string) {
requestResult := gulu.Ret.NewResult() requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
_, err := request. _, err := request.
SetResult(requestResult). SetSuccessResult(requestResult).
SetBody(map[string]string{"data": code}). SetBody(map[string]string{"data": code}).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}). SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
Post(util.AliyunServer + "/apis/siyuan/checkActivationcode") 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{}{} result := map[string]interface{}{}
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
_, err = request. _, err = request.
SetResult(&result). SetSuccessResult(&result).
SetBody(map[string]string{"userName": userName, "userPassword": password, "captcha": captcha}). SetBody(map[string]string{"userName": userName, "userPassword": password, "captcha": captcha}).
Post(util.AliyunServer + "/apis/siyuan/login") Post(util.AliyunServer + "/apis/siyuan/login")
if nil != err { if nil != err {
@ -529,7 +529,7 @@ func Login2fa(token, code string) (map[string]interface{}, error) {
result := map[string]interface{}{} result := map[string]interface{}{}
request := httpclient.NewCloudRequest30s() request := httpclient.NewCloudRequest30s()
_, err := request. _, err := request.
SetResult(&result). SetSuccessResult(&result).
SetBody(map[string]string{"twofactorAuthCode": code}). SetBody(map[string]string{"twofactorAuthCode": code}).
SetHeader("token", token). SetHeader("token", token).
Post(util.AliyunServer + "/apis/siyuan/login/2fa") Post(util.AliyunServer + "/apis/siyuan/login/2fa")