github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-19 02:21:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2022-10-27 22:41:32 +08:00
commit 3c407bdf7c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/conf/user.go
View File

@ -34,7 +34,7 @@ type User struct {
UserTrafficUpload float64 `json:"userTrafficUpload"`
UserTrafficDownload float64 `json:"userTrafficDownload"`
UserTrafficTime float64 `json:"userTrafficTime"`
UserSiYuanSubscriptionPlan float64 `json:"userSiYuanSubscriptionPlan"` // -2：未订阅，-1：试用，0：标准订阅，1：教育订阅
UserSiYuanSubscriptionPlan float64 `json:"userSiYuanSubscriptionPlan"` // -1：未订阅，0：标准订阅，1：教育订阅，2：试用
UserSiYuanSubscriptionStatus float64 `json:"userSiYuanSubscriptionStatus"` // -1：未订阅，0：订阅可用，1：订阅封禁，2：订阅过期
UserSiYuanSubscriptionType float64 `json:"userSiYuanSubscriptionType"` // 0 年付；1 终生；2 月付
}

9
kernel/model/liandi.go
View File

@ -177,8 +177,13 @@ func refreshSubscriptionExpirationRemind() {
util.PushErrMsg(Conf.Language(128), 0)
return
}
remains := (expired - time.Now().UnixMilli()) / 1000 / 60 / 60 / 24
if 0 < remains && 15 > remains { // 15 后过期
remains := int((expired - time.Now().UnixMilli()) / 1000 / 60 / 60 / 24)
expireDay := 15 // 付费订阅提前 15 天提醒
if 2 == Conf.User.UserSiYuanSubscriptionPlan {
expireDay = 2 // 试用订阅提前 2 天提醒
}
if 0 < remains && expireDay > remains {
time.Sleep(3 * time.Minute)
util.PushErrMsg(fmt.Sprintf(Conf.Language(127), remains), 0)
return