mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-02-17 04:28:07 +01:00
♻️ 日志组件单独抽取项目 https://github.com/siyuan-note/siyuan/issues/5439
This commit is contained in:
Liang Ding
parent
c8ea858976
commit
505b973c2d
70 changed files with 671 additions and 942 deletions
|
|
@ -29,6 +29,7 @@ import (
|
|||
|
||||
"github.com/88250/gulu"
|
||||
"github.com/siyuan-note/httpclient"
|
||||
"github.com/siyuan-note/logging"
|
||||
"github.com/siyuan-note/siyuan/kernel/conf"
|
||||
"github.com/siyuan-note/siyuan/kernel/util"
|
||||
)
|
||||
|
|
@ -47,7 +48,7 @@ func StartFreeTrial() (err error) {
|
|||
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/user/startFreeTrial")
|
||||
if nil != err {
|
||||
util.LogErrorf("start free trial failed: %s", err)
|
||||
logging.LogErrorf("start free trial failed: %s", err)
|
||||
return ErrFailedToConnectCloudServer
|
||||
}
|
||||
if 0 != requestResult.Code {
|
||||
|
|
@ -64,7 +65,7 @@ func DeactivateUser() (err error) {
|
|||
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/user/deactivate")
|
||||
if nil != err {
|
||||
util.LogErrorf("deactivate user failed: %s", err)
|
||||
logging.LogErrorf("deactivate user failed: %s", err)
|
||||
return ErrFailedToConnectCloudServer
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +75,7 @@ func DeactivateUser() (err error) {
|
|||
}
|
||||
|
||||
if 0 != requestResult.Code {
|
||||
util.LogErrorf("deactivate user failed: %s", requestResult.Msg)
|
||||
logging.LogErrorf("deactivate user failed: %s", requestResult.Msg)
|
||||
return errors.New(requestResult.Msg)
|
||||
}
|
||||
return
|
||||
|
|
@ -90,7 +91,7 @@ func SetCloudBlockReminder(id, data string, timed int64) (err error) {
|
|||
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/calendar/setBlockReminder")
|
||||
if nil != err {
|
||||
util.LogErrorf("set block reminder failed: %s", err)
|
||||
logging.LogErrorf("set block reminder failed: %s", err)
|
||||
return ErrFailedToConnectCloudServer
|
||||
}
|
||||
|
||||
|
|
@ -100,7 +101,7 @@ func SetCloudBlockReminder(id, data string, timed int64) (err error) {
|
|||
}
|
||||
|
||||
if 0 != requestResult.Code {
|
||||
util.LogErrorf("set block reminder failed: %s", requestResult.Msg)
|
||||
logging.LogErrorf("set block reminder failed: %s", requestResult.Msg)
|
||||
return errors.New(requestResult.Msg)
|
||||
}
|
||||
return
|
||||
|
|
@ -122,7 +123,7 @@ func LoadUploadToken() (err error) {
|
|||
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/upload/token")
|
||||
if nil != err {
|
||||
util.LogErrorf("get upload token failed: %s", err)
|
||||
logging.LogErrorf("get upload token failed: %s", err)
|
||||
return ErrFailedToConnectCloudServer
|
||||
}
|
||||
|
||||
|
|
@ -132,7 +133,7 @@ func LoadUploadToken() (err error) {
|
|||
}
|
||||
|
||||
if 0 != requestResult.Code {
|
||||
util.LogErrorf("get upload token failed: %s", requestResult.Msg)
|
||||
logging.LogErrorf("get upload token failed: %s", requestResult.Msg)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -152,7 +153,7 @@ func AutoRefreshUser() {
|
|||
if !subscriptionExpirationReminded {
|
||||
subscriptionExpirationReminded = true
|
||||
go func() {
|
||||
defer util.Recover()
|
||||
defer logging.Recover()
|
||||
|
||||
if "ios" == util.Container {
|
||||
return
|
||||
|
|
@ -175,7 +176,7 @@ func AutoRefreshUser() {
|
|||
}
|
||||
|
||||
go func() {
|
||||
defer util.Recover()
|
||||
defer logging.Recover()
|
||||
|
||||
if nil != Conf.User {
|
||||
time.Sleep(2 * time.Minute)
|
||||
|
|
@ -187,7 +188,7 @@ func AutoRefreshUser() {
|
|||
}()
|
||||
|
||||
go func() {
|
||||
defer util.Recover()
|
||||
defer logging.Recover()
|
||||
|
||||
time.Sleep(1 * time.Minute)
|
||||
announcementConf := filepath.Join(util.HomeDir, ".config", "siyuan", "announcement.json")
|
||||
|
|
@ -195,11 +196,11 @@ func AutoRefreshUser() {
|
|||
if gulu.File.IsExist(announcementConf) {
|
||||
data, err := os.ReadFile(announcementConf)
|
||||
if nil != err {
|
||||
util.LogErrorf("read announcement conf failed: %s", err)
|
||||
logging.LogErrorf("read announcement conf failed: %s", err)
|
||||
return
|
||||
}
|
||||
if err = gulu.JSON.UnmarshalJSON(data, &existingAnnouncements); nil != err {
|
||||
util.LogErrorf("unmarshal announcement conf failed: %s", err)
|
||||
logging.LogErrorf("unmarshal announcement conf failed: %s", err)
|
||||
os.Remove(announcementConf)
|
||||
return
|
||||
}
|
||||
|
|
@ -221,11 +222,11 @@ func AutoRefreshUser() {
|
|||
|
||||
data, err := gulu.JSON.MarshalJSON(existingAnnouncements)
|
||||
if nil != err {
|
||||
util.LogErrorf("marshal announcement conf failed: %s", err)
|
||||
logging.LogErrorf("marshal announcement conf failed: %s", err)
|
||||
return
|
||||
}
|
||||
if err = os.WriteFile(announcementConf, data, 0644); nil != err {
|
||||
util.LogErrorf("write announcement conf failed: %s", err)
|
||||
logging.LogErrorf("write announcement conf failed: %s", err)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -251,7 +252,7 @@ func RefreshUser(token string) error {
|
|||
var tokenExpireTime int64
|
||||
tokenExpireTime, err := strconv.ParseInt(Conf.User.UserTokenExpireTime+"000", 10, 64)
|
||||
if nil != err {
|
||||
util.LogErrorf("convert token expire time [%s] failed: %s", Conf.User.UserTokenExpireTime, err)
|
||||
logging.LogErrorf("convert token expire time [%s] failed: %s", Conf.User.UserTokenExpireTime, err)
|
||||
return errors.New(Conf.Language(19))
|
||||
}
|
||||
|
||||
|
|
@ -273,7 +274,7 @@ Net:
|
|||
var tokenExpireTime int64
|
||||
tokenExpireTime, err = strconv.ParseInt(Conf.User.UserTokenExpireTime+"000", 10, 64)
|
||||
if nil != err {
|
||||
util.LogErrorf("convert token expire time [%s] failed: %s", Conf.User.UserTokenExpireTime, err)
|
||||
logging.LogErrorf("convert token expire time [%s] failed: %s", Conf.User.UserTokenExpireTime, err)
|
||||
return errors.New(Conf.Language(19))
|
||||
}
|
||||
|
||||
|
|
@ -289,7 +290,7 @@ Net:
|
|||
Conf.Save()
|
||||
|
||||
if elapsed := time.Now().Sub(start).Milliseconds(); 3000 < elapsed {
|
||||
util.LogInfof("get cloud user elapsed [%dms]", elapsed)
|
||||
logging.LogInfof("get cloud user elapsed [%dms]", elapsed)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -320,7 +321,7 @@ func RemoveCloudShorthands(ids []string) (err error) {
|
|||
SetBody(body).
|
||||
Post(util.AliyunServer + "/apis/siyuan/inbox/removeCloudShorthands")
|
||||
if nil != err {
|
||||
util.LogErrorf("remove cloud shorthands failed: %s", err)
|
||||
logging.LogErrorf("remove cloud shorthands failed: %s", err)
|
||||
err = ErrFailedToConnectCloudServer
|
||||
return
|
||||
}
|
||||
|
|
@ -332,7 +333,7 @@ func RemoveCloudShorthands(ids []string) (err error) {
|
|||
|
||||
code := result["code"].(float64)
|
||||
if 0 != code {
|
||||
util.LogErrorf("remove cloud shorthands failed: %s", result["msg"])
|
||||
logging.LogErrorf("remove cloud shorthands failed: %s", result["msg"])
|
||||
err = errors.New(result["msg"].(string))
|
||||
return
|
||||
}
|
||||
|
|
@ -347,7 +348,7 @@ func GetCloudShorthands(page int) (result map[string]interface{}, err error) {
|
|||
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/inbox/getCloudShorthands?p=" + strconv.Itoa(page))
|
||||
if nil != err {
|
||||
util.LogErrorf("get cloud shorthands failed: %s", err)
|
||||
logging.LogErrorf("get cloud shorthands failed: %s", err)
|
||||
err = ErrFailedToConnectCloudServer
|
||||
return
|
||||
}
|
||||
|
|
@ -359,7 +360,7 @@ func GetCloudShorthands(page int) (result map[string]interface{}, err error) {
|
|||
|
||||
code := result["code"].(float64)
|
||||
if 0 != code {
|
||||
util.LogErrorf("get cloud shorthands failed: %s", result["msg"])
|
||||
logging.LogErrorf("get cloud shorthands failed: %s", result["msg"])
|
||||
err = errors.New(result["msg"].(string))
|
||||
return
|
||||
}
|
||||
|
|
@ -384,7 +385,7 @@ func getUser(token string) (*conf.User, error) {
|
|||
SetBody(map[string]string{"token": token}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/user")
|
||||
if nil != err {
|
||||
util.LogErrorf("get community user failed: %s", err)
|
||||
logging.LogErrorf("get community user failed: %s", err)
|
||||
return nil, errors.New(Conf.Language(18))
|
||||
}
|
||||
|
||||
|
|
@ -393,7 +394,7 @@ func getUser(token string) (*conf.User, error) {
|
|||
if 255 == code {
|
||||
return nil, errInvalidUser
|
||||
}
|
||||
util.LogErrorf("get community user failed: %s", result["msg"])
|
||||
logging.LogErrorf("get community user failed: %s", result["msg"])
|
||||
return nil, errors.New(Conf.Language(18))
|
||||
}
|
||||
|
||||
|
|
@ -401,7 +402,7 @@ func getUser(token string) (*conf.User, error) {
|
|||
data := util.AESDecrypt(dataStr)
|
||||
user := &conf.User{}
|
||||
if err = gulu.JSON.UnmarshalJSON(data, &user); nil != err {
|
||||
util.LogErrorf("get community user failed: %s", err)
|
||||
logging.LogErrorf("get community user failed: %s", err)
|
||||
return nil, errors.New(Conf.Language(18))
|
||||
}
|
||||
return user, nil
|
||||
|
|
@ -418,7 +419,7 @@ func UseActivationcode(code string) (err error) {
|
|||
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/useActivationcode")
|
||||
if nil != err {
|
||||
util.LogErrorf("check activation code failed: %s", err)
|
||||
logging.LogErrorf("check activation code failed: %s", err)
|
||||
return ErrFailedToConnectCloudServer
|
||||
}
|
||||
if 0 != requestResult.Code {
|
||||
|
|
@ -439,7 +440,7 @@ func CheckActivationcode(code string) (retCode int, msg string) {
|
|||
SetCookies(&http.Cookie{Name: "symphony", Value: Conf.User.UserToken}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/checkActivationcode")
|
||||
if nil != err {
|
||||
util.LogErrorf("check activation code failed: %s", err)
|
||||
logging.LogErrorf("check activation code failed: %s", err)
|
||||
msg = ErrFailedToConnectCloudServer.Error()
|
||||
return
|
||||
}
|
||||
|
|
@ -458,7 +459,7 @@ func Login(userName, password, captcha string) (ret *gulu.Result, err error) {
|
|||
SetBody(map[string]string{"userName": userName, "userPassword": password, "captcha": captcha}).
|
||||
Post(util.AliyunServer + "/apis/siyuan/login")
|
||||
if nil != err {
|
||||
util.LogErrorf("login failed: %s", err)
|
||||
logging.LogErrorf("login failed: %s", err)
|
||||
return nil, errors.New(Conf.Language(18))
|
||||
}
|
||||
ret = &gulu.Result{
|
||||
|
|
@ -485,7 +486,7 @@ func Login2fa(token, code string) (map[string]interface{}, error) {
|
|||
SetHeader("token", token).
|
||||
Post(util.AliyunServer + "/apis/siyuan/login/2fa")
|
||||
if nil != err {
|
||||
util.LogErrorf("login 2fa failed: %s", err)
|
||||
logging.LogErrorf("login 2fa failed: %s", err)
|
||||
return nil, errors.New(Conf.Language(18))
|
||||
}
|
||||
return result, nil
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue