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

🎨 Update av export

Browse source
This commit is contained in:
Daniel 2023-09-26 10:30:08 +08:00
parent c3adbe6b52
commit 10ac5e557d
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/model/cloud_service.go
View file

@ -323,28 +323,30 @@ func refreshAnnouncement() {
}
}
func RefreshUser(token string) error {
func RefreshUser(token string) {
threeDaysAfter := util.CurrentTimeMillis() + 1000*60*60*24*3
if "" == token {
if "" != Conf.UserData {
Conf.User = loadUserFromConf()
}
if nil == Conf.User {
return errors.New(Conf.Language(19))
util.PushErrMsg(Conf.Language(19), 5000)
return
}
var tokenExpireTime int64
tokenExpireTime, err := strconv.ParseInt(Conf.User.UserTokenExpireTime+"000", 10, 64)
if nil != err {
logging.LogErrorf("convert token expire time [%s] failed: %s", Conf.User.UserTokenExpireTime, err)
return errors.New(Conf.Language(19))
util.PushErrMsg(Conf.Language(19), 5000)
return
}
if threeDaysAfter > tokenExpireTime {
token = Conf.User.UserToken
goto Net
}
return nil
return
}
Net:
@ -352,20 +354,23 @@ Net:
user, err := getUser(token)
if err != nil {
if nil == Conf.User || errInvalidUser == err {
return errors.New(Conf.Language(19))
util.PushErrMsg(Conf.Language(19), 5000)
return
}
var tokenExpireTime int64
tokenExpireTime, err = strconv.ParseInt(Conf.User.UserTokenExpireTime+"000", 10, 64)
if nil != err {
logging.LogErrorf("convert token expire time [%s] failed: %s", Conf.User.UserTokenExpireTime, err)
return errors.New(Conf.Language(19))
util.PushErrMsg(Conf.Language(19), 5000)
return
}
if threeDaysAfter > tokenExpireTime {
return errors.New(Conf.Language(19))
util.PushErrMsg(Conf.Language(19), 5000)
return
}
return nil
return
}
Conf.User = user
@ -376,7 +381,7 @@ Net:
if elapsed := time.Now().Sub(start).Milliseconds(); 3000 < elapsed {
logging.LogInfof("get cloud user elapsed [%dms]", elapsed)
}
return nil
return
}
func loadUserFromConf() *conf.User {