Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2024-05-23 08:34:10 +08:00
commit 22a7e45ebf

View file

@ -17,6 +17,8 @@
package util
import (
"errors"
"fmt"
"sync"
"time"
@ -43,11 +45,16 @@ func GetRhyResult(force bool) (map[string]interface{}, error) {
}
request := httpclient.NewCloudRequest30s()
_, err := request.SetSuccessResult(&cachedRhyResult).Get(GetCloudServer() + "/apis/siyuan/version?ver=" + Ver)
resp, err := request.SetSuccessResult(&cachedRhyResult).Get(GetCloudServer() + "/apis/siyuan/version?ver=" + Ver)
if nil != err {
logging.LogErrorf("get version info failed: %s", err)
return nil, err
}
if 200 != resp.StatusCode {
msg := fmt.Sprintf("get rhy result failed: %d", resp.StatusCode)
logging.LogErrorf(msg)
return nil, errors.New(msg)
}
rhyResultCacheTime = now
return cachedRhyResult, nil
}