feat 实现当非default的分组引入到期时间概念

jinjianming · Jul 15, 2024 · 95be7e1 · 95be7e1
1 parent 87e5886
commit 95be7e1
Show file tree

Hide file tree

Showing 2 changed files with 203 additions and 162 deletions.
diff --git a/model/user.go b/model/user.go
@@ -10,6 +10,7 @@ import (
 	"github.com/songquanpeng/one-api/common/random"
 	"gorm.io/gorm"
 	"strings"
+	"time"
 )
 
 const (
@@ -28,24 +29,25 @@ const (
 // User if you add sensitive fields, don't forget to clean them in setupLogin function.
 // Otherwise, the sensitive information will be saved on local storage in plain text!
 type User struct {
-	Id               int    `json:"id"`
-	Username         string `json:"username" gorm:"unique;index" validate:"max=12"`
-	Password         string `json:"password" gorm:"not null;" validate:"min=8,max=20"`
-	DisplayName      string `json:"display_name" gorm:"index" validate:"max=20"`
-	Role             int    `json:"role" gorm:"type:int;default:1"`   // admin, util
-	Status           int    `json:"status" gorm:"type:int;default:1"` // enabled, disabled
-	Email            string `json:"email" gorm:"index" validate:"max=50"`
-	GitHubId         string `json:"github_id" gorm:"column:github_id;index"`
-	WeChatId         string `json:"wechat_id" gorm:"column:wechat_id;index"`
-	LarkId           string `json:"lark_id" gorm:"column:lark_id;index"`
-	VerificationCode string `json:"verification_code" gorm:"-:all"`                                    // this field is only for Email verification, don't save it to database!
-	AccessToken      string `json:"access_token" gorm:"type:char(32);column:access_token;uniqueIndex"` // this token is for system management
-	Quota            int64  `json:"quota" gorm:"bigint;default:0"`
-	UsedQuota        int64  `json:"used_quota" gorm:"bigint;default:0;column:used_quota"` // used quota
-	RequestCount     int    `json:"request_count" gorm:"type:int;default:0;"`             // request number
-	Group            string `json:"group" gorm:"type:varchar(32);default:'default'"`
-	AffCode          string `json:"aff_code" gorm:"type:varchar(32);column:aff_code;uniqueIndex"`
-	InviterId        int    `json:"inviter_id" gorm:"type:int;column:inviter_id;index"`
+	Id               int       `json:"id"`
+	Username         string    `json:"username" gorm:"unique;index" validate:"max=12"`
+	Password         string    `json:"password" gorm:"not null;" validate:"min=8,max=20"`
+	DisplayName      string    `json:"display_name" gorm:"index" validate:"max=20"`
+	Role             int       `json:"role" gorm:"type:int;default:1"`   // admin, util
+	Status           int       `json:"status" gorm:"type:int;default:1"` // enabled, disabled
+	Email            string    `json:"email" gorm:"index" validate:"max=50"`
+	GitHubId         string    `json:"github_id" gorm:"column:github_id;index"`
+	WeChatId         string    `json:"wechat_id" gorm:"column:wechat_id;index"`
+	LarkId           string    `json:"lark_id" gorm:"column:lark_id;index"`
+	VerificationCode string    `json:"verification_code" gorm:"-:all"`                                    // this field is only for Email verification, don't save it to database!
+	AccessToken      string    `json:"access_token" gorm:"type:char(32);column:access_token;uniqueIndex"` // this token is for system management
+	Quota            int64     `json:"quota" gorm:"bigint;default:0"`
+	UsedQuota        int64     `json:"used_quota" gorm:"bigint;default:0;column:used_quota"` // used quota
+	RequestCount     int       `json:"request_count" gorm:"type:int;default:0;"`             // request number
+	Group            string    `json:"group" gorm:"type:varchar(32);default:'default'"`
+	AffCode          string    `json:"aff_code" gorm:"type:varchar(32);column:aff_code;uniqueIndex"`
+	InviterId        int       `json:"inviter_id" gorm:"type:int;column:inviter_id;index"`
+	ExpirationDate   time.Time `json:"expiration_date" gorm:"type:datetime;column:expiration_date"` // Expiration date of the user's subscription or account.
 }
 
 func GetMaxUserId() int {