From 1c569be46fb42020e75b1217155a7b1436f7b196 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 27 Oct 2022 22:37:37 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E8=AE=A2=E9=98=85=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BB=8E=2030=20=E5=A4=A9=E7=BC=A9=E7=9F=AD=E4=B8=BA=207=20?= =?UTF-8?q?=E5=A4=A9=20https://github.com/siyuan-note/siyuan/issues/6375?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/conf/user.go | 2 +- kernel/model/liandi.go | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel/conf/user.go b/kernel/conf/user.go index ad38d7a79..8a6eb6ed0 100644 --- a/kernel/conf/user.go +++ b/kernel/conf/user.go @@ -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 月付 } diff --git a/kernel/model/liandi.go b/kernel/model/liandi.go index 6b703a121..3d385cd25 100644 --- a/kernel/model/liandi.go +++ b/kernel/model/liandi.go @@ -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