diff --git a/kernel/model/cloud_service.go b/kernel/model/cloud_service.go index 6e4c7e8b2..8b502e03e 100644 --- a/kernel/model/cloud_service.go +++ b/kernel/model/cloud_service.go @@ -360,11 +360,16 @@ Net: start := time.Now() user, err := getUser(token) if err != nil { - if nil == Conf.GetUser() || errInvalidUser == err { + if nil == Conf.GetUser() || errors.Is(err, errInvalidUser) { util.PushErrMsg(Conf.Language(19), 5000) return } + if errors.Is(err, errRequestUserFailed) { + util.PushErrMsg(Conf.Language(18), 5000) + return + } + var tokenExpireTime int64 tokenExpireTime, err = strconv.ParseInt(Conf.GetUser().UserTokenExpireTime+"000", 10, 64) if err != nil { @@ -532,7 +537,10 @@ func GetCloudShorthands(page int) (result map[string]interface{}, err error) { return } -var errInvalidUser = errors.New("invalid user") +var ( + errInvalidUser = errors.New("invalid user") + errRequestUserFailed = errors.New("request user failed") +) func getUser(token string) (*conf.User, error) { result := map[string]interface{}{} @@ -543,11 +551,11 @@ func getUser(token string) (*conf.User, error) { Post(util.GetCloudServer() + "/apis/siyuan/user") if err != nil { logging.LogErrorf("get community user failed: %s", err) - return nil, errors.New(Conf.Language(18)) + return nil, errRequestUserFailed } if http.StatusOK != resp.StatusCode { logging.LogErrorf("get community user failed: %d", resp.StatusCode) - return nil, errors.New(Conf.Language(18)) + return nil, errRequestUserFailed } code := result["code"].(float64) @@ -556,7 +564,7 @@ func getUser(token string) (*conf.User, error) { return nil, errInvalidUser } logging.LogErrorf("get community user failed: %s", result["msg"]) - return nil, errors.New(Conf.Language(18)) + return nil, errRequestUserFailed } dataStr := result["data"].(string) @@ -564,7 +572,7 @@ func getUser(token string) (*conf.User, error) { user := &conf.User{} if err = gulu.JSON.UnmarshalJSON(data, &user); err != nil { logging.LogErrorf("get community user failed: %s", err) - return nil, errors.New(Conf.Language(18)) + return nil, errRequestUserFailed } return user, nil }