Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 08:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 调整网络请求超时为 30s Fix https://github.com/siyuan-note/siyuan/issues/6791

Browse source 
设置代理切换时不再需要重启 https://github.com/siyuan-note/siyuan/issues/6787
This commit is contained in:
Liang Ding 2022-12-05 22:59:59 +08:00
parent 9f463fec1e
commit 74453a20bb
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
8 changed files with 40 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

24
kernel/model/liandi.go
View file

@ -42,7 +42,7 @@ func StartFreeTrial() (err error) {
}
requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
_, err = request.
SetResult(requestResult).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
@ -59,7 +59,7 @@ func StartFreeTrial() (err error) {
func DeactivateUser() (err error) {
requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
resp, err := request.
SetResult(requestResult).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
@ -84,7 +84,7 @@ func DeactivateUser() (err error) {
func SetCloudBlockReminder(id, data string, timed int64) (err error) {
requestResult := gulu.Ret.NewResult()
payload := map[string]interface{}{"dataId": id, "data": data, "timed": timed}
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
resp, err := request.
SetResult(requestResult).
SetBody(payload).
@ -117,7 +117,7 @@ func LoadUploadToken() (err error) {
}
requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
resp, err := request.
SetResult(requestResult).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
@ -333,7 +333,7 @@ func loadUserFromConf() *conf.User {
func RemoveCloudShorthands(ids []string) (err error) {
result := map[string]interface{}{}
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
body := map[string]interface{}{
"ids": ids,
}
@ -364,7 +364,7 @@ func RemoveCloudShorthands(ids []string) (err error) {
func GetCloudShorthand(id string) (ret map[string]interface{}, err error) {
result := map[string]interface{}{}
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
resp, err := request.
SetResult(&result).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
@ -395,7 +395,7 @@ func GetCloudShorthand(id string) (ret map[string]interface{}, err error) {
func GetCloudShorthands(page int) (result map[string]interface{}, err error) {
result = map[string]interface{}{}
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
resp, err := request.
SetResult(&result).
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
@ -432,7 +432,7 @@ var errInvalidUser = errors.New("invalid user")
func getUser(token string) (*conf.User, error) {
result := map[string]interface{}{}
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
_, err := request.
SetResult(&result).
SetBody(map[string]string{"token": token}).
@ -465,7 +465,7 @@ func UseActivationcode(code string) (err error) {
code = strings.TrimSpace(code)
code = gulu.Str.RemoveInvisible(code)
requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
_, err = request.
SetResult(requestResult).
SetBody(map[string]string{"data": code}).
@ -486,7 +486,7 @@ func CheckActivationcode(code string) (retCode int, msg string) {
code = gulu.Str.RemoveInvisible(code)
retCode = 1
requestResult := gulu.Ret.NewResult()
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
_, err := request.
SetResult(requestResult).
SetBody(map[string]string{"data": code}).
@ -506,7 +506,7 @@ func CheckActivationcode(code string) (retCode int, msg string) {
func Login(userName, password, captcha string) (ret *gulu.Result, err error) {
result := map[string]interface{}{}
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
_, err = request.
SetResult(&result).
SetBody(map[string]string{"userName": userName, "userPassword": password, "captcha": captcha}).
@ -532,7 +532,7 @@ func Login(userName, password, captcha string) (ret *gulu.Result, err error) {
func Login2fa(token, code string) (map[string]interface{}, error) {
result := map[string]interface{}{}
request := httpclient.NewCloudRequest()
request := httpclient.NewCloudRequest30s()
_, err := request.
SetResult(&result).
SetBody(map[string]string{"twofactorAuthCode": code}).

5
kernel/model/repository.go
View file

@ -39,6 +39,7 @@ import (
"github.com/siyuan-note/dejavu/entity"
"github.com/siyuan-note/encryption"
"github.com/siyuan-note/eventbus"
"github.com/siyuan-note/httpclient"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/cache"
"github.com/siyuan-note/siyuan/kernel/conf"
@ -831,7 +832,7 @@ func newRepository() (ret *dejavu.Repo, err error) {
case conf.ProviderSiYuan:
cloudRepo = cloud.NewSiYuan(&cloud.BaseCloud{Conf: cloudConf})
case conf.ProviderS3:
s3HTTPClient := &http.Client{Transport: util.NewTransport(cloudConf.S3.SkipTlsVerify)}
s3HTTPClient := &http.Client{Transport: httpclient.NewTransport(cloudConf.S3.SkipTlsVerify)}
s3HTTPClient.Timeout = time.Duration(cloudConf.S3.Timeout) * time.Second
cloudRepo = cloud.NewS3(&cloud.BaseCloud{Conf: cloudConf}, s3HTTPClient)
case conf.ProviderWebDAV:
@ -841,7 +842,7 @@ func newRepository() (ret *dejavu.Repo, err error) {
webdavClient.SetHeader("Authorization", auth)
webdavClient.SetHeader("User-Agent", util.UserAgent)
webdavClient.SetTimeout(time.Duration(cloudConf.WebDAV.Timeout) * time.Second)
webdavClient.SetTransport(util.NewTransport(cloudConf.WebDAV.SkipTlsVerify))
webdavClient.SetTransport(httpclient.NewTransport(cloudConf.WebDAV.SkipTlsVerify))
cloudRepo = cloud.NewWebDAV(&cloud.BaseCloud{Conf: cloudConf}, webdavClient)
default:
err = fmt.Errorf("unknown cloud provider [%d]", Conf.Sync.Provider)