Develop (#64)

* fix(database): correct name entry for SingBox in initialization script

* fix(purchase): update gift amount deduction logic and handle zero-amount order status

* feat: add type and default fields to rule group requests and update related logic

* feat(rule): implement logic to set a default rule group during creation and update

* fix(rule): add type and default fields to rule group model and update related logic

* feat(proxy): enhance proxy group handling and sorting logic

* refactor(proxy): replace hardcoded group names with constants for better maintainability

* fix(proxy): update group selection logic to skip empty and default names

* feat(proxy): enhance proxy and group handling with new configuration options

* feat(surge): add Surge adapter support and enhance subscription URL handling

* feat(traffic): implement traffic reset logic for subscription cycles

* feat(auth): improve email and mobile config unmarshalling with default values

* fix(auth) upbind email not update

* fix(order) discount set default 1

* fix(order) discount set default 1

* fix: refactor surfboard proxy handling and enhance configuration template

* fix(renewal) discount set default 1

* feat(loon): add Loon configuration template and enhance proxy handling

* feat(subscription): update user subscription status based on expiration time

* fix(renewal): update subscription retrieval method to use token instead of order ID

* feat(order): enhance order processing logic with improved error handling and user subscription management

* fix(order): improve code quality and fix critical bugs in order processing logic

- Fix inconsistent logging calls across all order logic files
- Fix critical gift amount deduction logic bug in renewal process
- Fix variable shadowing errors in database transactions
- Add comprehensive Go-standard documentation comments
- Improve log prefix consistency for better debugging
- Remove redundant discount validation code

* fix(docker): add build argument for version in Docker image build process

* feat(version): add endpoint to retrieve application version information

* fix(auth): improve user authentication method logic and update user cache

* feat(user): add ordering functionality to user list retrieval

* fix(RevenueStatistics) fill list

* fix(UserStatistics) fill list

* fix(user): implement user cache clearing after auth method operations

* fix(auth): enhance OAuth login logic with improved request handling and user registration flow

* fix(user): implement sorting for authentication methods based on priority

* fix(user): correct ordering clause for user retrieval based on filter

* refactor(user): streamline cache management and enhance cache clearing logic

* feat(logs) set logs volume in develop

* fix(handler): implement browser interception to deny access for specific user agents

* fix(resetTraffic) reset daily server

* refactor(trojan): remove unused parameter and clean up logging in slice

* fix(middleware): add domain length check and improve user-agent handling

* fix(middleware): reorder domain processing and enhance user-agent handling

* fix(resetTraffic): update subscription reset logic to use expire_time for monthly and yearly checks

* fix(scheduler): update reset traffic task schedule to run daily at 00:30

* fix(traffic): enhance traffic reset logic for subscriptions and adjust status checks

* fix(activateOrder): update traffic reset logic to include reset day check

* feat(marketing): add batch email task management API and logic

* feat(application): implement CRUD operations for subscribe applications

* feat(types): add user agent limit and list to subscription configuration

* feat(application): update subscription application requests to include structured download links

* feat(application): add scheme field and download link handling to subscribe application

* feat(application): add endpoint to retrieve client information

* feat(application): move DownloadLink and SubscribeApplication types to types.api

* feat(application): add DownloadLink and SubscribeClient types, update client response structure

* feat(application): remove ProxyTemplate field from application API

* feat(application): implement adapter for client configuration and add preview template functionality

* feat(application): move DownloadLink type to types.api and remove from common.api

* feat(application): update PreviewSubscribeTemplate to return structured response

* feat(application): remove ProxyTemplate field from application API

* feat(application): enhance cache key generation for user list and server data

* feat(subscribe): add ClearCache method to manage subscription cache invalidation

* feat(payment): add Description field to PaymentMethodDetail response

* feat(subscribe): update next reset time calculation to use ExpireTime

* feat(purchase): include handling fee in total amount calculation

* feat(subscribe): add V2SubscribeHandler and logic for enhanced subscription management

* feat(subscribe): add output format configuration to subscription adapter

* feat(application): default data

---------

Co-authored-by: Chang lue Tsen <tension@ppanel.dev>
Co-authored-by: NoWay <Bob455668@hotmail.com>

internal/model/client/application.go

@@ -0,0 +1,75 @@
+package client
+
+import (
+	"encoding/json"
+	"time"
+)
+
+type SubscribeApplication struct {
+	Id                int64     `gorm:"primary_key"`
+	Name              string    `gorm:"type:varchar(255);default:'';not null;comment:Application Name"`
+	Icon              string    `gorm:"type:MEDIUMTEXT;default:null;comment:Application Icon"`
+	Description       string    `gorm:"type:varchar(255);default:null;comment:Application Description"`
+	Scheme            string    `gorm:"type:varchar(255);default:'';not null;comment:Scheme"`
+	UserAgent         string    `gorm:"type:varchar(255);default:'';not null;comment:User Agent"`
+	IsDefault         bool      `gorm:"type:tinyint(1);not null;default:0;comment:Is Default Application"`
+	SubscribeTemplate string    `gorm:"type:MEDIUMTEXT;default:null;comment:Subscribe Template"`
+	OutputFormat      string    `gorm:"type:varchar(50);default:'yaml';not null;comment:Output Format"`
+	DownloadLink      string    `gorm:"type:text;not null;comment:Download Link"`
+	CreatedAt         time.Time `gorm:"<-:create;comment:Create Time"`
+	UpdatedAt         time.Time `gorm:"comment:Update Time"`
+}
+
+func (SubscribeApplication) TableName() string {
+	return "subscribe_application"
+}
+
+type DownloadLink struct {
+	IOS     string `json:"ios,omitempty"`
+	Android string `json:"android,omitempty"`
+	Windows string `json:"windows,omitempty"`
+	Mac     string `json:"mac,omitempty"`
+	Linux   string `json:"linux,omitempty"`
+	Harmony string `json:"harmony,omitempty"`
+}
+
+// GetDownloadLink returns the download link for the specified platform.
+func (d *DownloadLink) GetDownloadLink(platform string) string {
+	if d == nil {
+		return ""
+	}
+	switch platform {
+	case "ios":
+		return d.IOS
+	case "android":
+		return d.Android
+	case "windows":
+		return d.Windows
+	case "mac":
+		return d.Mac
+	case "linux":
+		return d.Linux
+	case "harmony":
+		return d.Harmony
+	default:
+		return ""
+	}
+}
+
+// Marshal serializes the DownloadLink to JSON format.
+func (d *DownloadLink) Marshal() ([]byte, error) {
+	if d == nil {
+		var empty DownloadLink
+		return json.Marshal(empty)
+	}
+	return json.Marshal(d)
+}
+
+// Unmarshal parses the JSON-encoded data and stores the result in the DownloadLink.
+func (d *DownloadLink) Unmarshal(data []byte) error {
+	if data == nil || len(data) == 0 {
+		*d = DownloadLink{}
+		return nil
+	}
+	return json.Unmarshal(data, d)
+}

internal/model/client/default.go

@@ -0,0 +1,81 @@
+package client
+
+import (
+	"context"
+
+	"gorm.io/gorm"
+)
+
+type (
+	Model interface {
+		subscribeApplicationModel
+	}
+	subscribeApplicationModel interface {
+		Insert(ctx context.Context, data *SubscribeApplication) error
+		FindOne(ctx context.Context, id int64) (*SubscribeApplication, error)
+		Update(ctx context.Context, data *SubscribeApplication) error
+		Delete(ctx context.Context, id int64) error
+		List(ctx context.Context) ([]*SubscribeApplication, error)
+		Transaction(ctx context.Context, fn func(db *gorm.DB) error) error
+	}
+	DefaultSubscribeApplicationModel struct {
+		*gorm.DB
+	}
+)
+
+func NewSubscribeApplicationModel(db *gorm.DB) Model {
+	return &DefaultSubscribeApplicationModel{
+		DB: db.Model(&SubscribeApplication{}),
+	}
+}
+
+func (m *DefaultSubscribeApplicationModel) Insert(ctx context.Context, data *SubscribeApplication) error {
+	if err := m.WithContext(ctx).Create(data).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
+func (m *DefaultSubscribeApplicationModel) FindOne(ctx context.Context, id int64) (*SubscribeApplication, error) {
+	var resp SubscribeApplication
+	if err := m.WithContext(ctx).Where("id = ?", id).First(&resp).Error; err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}
+
+func (m *DefaultSubscribeApplicationModel) Update(ctx context.Context, data *SubscribeApplication) error {
+	if _, err := m.FindOne(ctx, data.Id); err != nil {
+		return err
+	}
+	if err := m.WithContext(ctx).Save(data).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
+func (m *DefaultSubscribeApplicationModel) Delete(ctx context.Context, id int64) error {
+	if err := m.WithContext(ctx).Delete(&SubscribeApplication{}, id).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
+func (m *DefaultSubscribeApplicationModel) Transaction(ctx context.Context, fn func(db *gorm.DB) error) error {
+	tx := m.WithContext(ctx).Begin()
+	if err := fn(tx); err != nil {
+		if rbErr := tx.Rollback().Error; rbErr != nil {
+			return rbErr
+		}
+		return err
+	}
+	return tx.Commit().Error
+}
+
+func (m *DefaultSubscribeApplicationModel) List(ctx context.Context) ([]*SubscribeApplication, error) {
+	var resp []*SubscribeApplication
+	if err := m.WithContext(ctx).Find(&resp).Error; err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

internal/model/order/model.go

@@ -40,6 +40,13 @@ type Details struct {
 	UpdatedAt      time.Time            `gorm:"comment:Update Time"`
 }
 
+type OrdersTotalWithDate struct {
+	Date               string
+	AmountTotal        int64
+	NewOrderAmount     int64
+	RenewalOrderAmount int64
+}
+
 type customOrderLogicModel interface {
 	UpdateOrderStatus(ctx context.Context, orderNo string, status uint8, tx ...*gorm.DB) error
 	QueryOrderListByPage(ctx context.Context, page, size int, status uint8, user, subscribe int64, search string) (int64, []*Details, error)
@@ -52,6 +59,8 @@ type customOrderLogicModel interface {
 	QueryDateUserCounts(ctx context.Context, date time.Time) (int64, int64, error)
 	QueryTotalUserCounts(ctx context.Context) (int64, int64, error)
 	IsUserEligibleForNewOrder(ctx context.Context, userID int64) (bool, error)
+	QueryDailyOrdersList(ctx context.Context, date time.Time) ([]OrdersTotalWithDate, error)
+	QueryMonthlyOrdersList(ctx context.Context, date time.Time) ([]OrdersTotalWithDate, error)
 }
 
 // NewModel returns a model for the database table.
@@ -226,3 +235,43 @@ func (m *customOrderModel) IsUserEligibleForNewOrder(ctx context.Context, userID
 	})
 	return count == 0, err
 }
+
+// QueryDailyOrdersList Query daily orders list for the current month (from 1st to current date)
+func (m *customOrderModel) QueryDailyOrdersList(ctx context.Context, date time.Time) ([]OrdersTotalWithDate, error) {
+	var results []OrdersTotalWithDate
+	err := m.QueryNoCacheCtx(ctx, &results, func(conn *gorm.DB, v interface{}) error {
+		firstDay := time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location())
+		return conn.Model(&Order{}).
+			Where("status IN ? AND created_at BETWEEN ? AND ? AND method != ?", []int64{2, 5}, firstDay, date, "balance").
+			Select(
+				"DATE(created_at) as date, " +
+					"SUM(amount) as amount_total, " +
+					"SUM(CASE WHEN is_new = 1 THEN amount ELSE 0 END) as new_order_amount, " +
+					"SUM(CASE WHEN is_new = 0 THEN amount ELSE 0 END) as renewal_order_amount",
+			).
+			Group("DATE(created_at)").
+			Order("date ASC").
+			Scan(v).Error
+	})
+	return results, err
+}
+
+// QueryMonthlyOrdersList Query monthly orders list for the past 6 months
+func (m *customOrderModel) QueryMonthlyOrdersList(ctx context.Context, date time.Time) ([]OrdersTotalWithDate, error) {
+	var results []OrdersTotalWithDate
+	err := m.QueryNoCacheCtx(ctx, &results, func(conn *gorm.DB, v interface{}) error {
+		sixMonthsAgo := date.AddDate(0, -5, 0)
+		return conn.Model(&Order{}).
+			Where("status IN ? AND created_at >= ? AND method != ?", []int64{2, 5}, sixMonthsAgo, "balance").
+			Select(
+				"DATE_FORMAT(created_at, '%Y-%m') as date, " +
+					"SUM(amount) as amount_total, " +
+					"SUM(CASE WHEN is_new = 1 THEN amount ELSE 0 END) as new_order_amount, " +
+					"SUM(CASE WHEN is_new = 0 THEN amount ELSE 0 END) as renewal_order_amount",
+			).
+			Group("DATE_FORMAT(created_at, '%Y-%m')").
+			Order("date ASC").
+			Scan(v).Error
+	})
+	return results, err
+}

internal/model/server/default.go

@@ -69,10 +69,13 @@ func (m *defaultServerModel) getCacheKeys(data *Server) []string {
 	detailsKey := fmt.Sprintf("%s%v", CacheServerDetailPrefix, data.Id)
 	ServerIdKey := fmt.Sprintf("%s%v", cacheServerIdPrefix, data.Id)
 	configIdKey := fmt.Sprintf("%s%v", config.ServerConfigCacheKey, data.Id)
+	userIDKey := fmt.Sprintf("%s%d", config.ServerUserListCacheKey, data.Id)
+
 	cacheKeys := []string{
 		ServerIdKey,
 		detailsKey,
 		configIdKey,
+		userIDKey,
 	}
 	return cacheKeys
 }

internal/model/server/server.go

@@ -138,6 +138,15 @@ type Hysteria2 struct {
 }
 
 type Tuic struct {
+	Port                 int            `json:"port"`
+	DisableSNI           bool           `json:"disable_sni"`
+	ReduceRtt            bool           `json:"reduce_rtt"`
+	UDPRelayMode         string         `json:"udp_relay_mode"`
+	CongestionController string         `json:"congestion_controller"`
+	SecurityConfig       SecurityConfig `json:"security_config"`
+}
+
+type AnyTLS struct {
 	Port           int            `json:"port"`
 	SecurityConfig SecurityConfig `json:"security_config"`
 }

internal/model/subscribe/default.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 
+	"github.com/perfect-panel/server/internal/config"
 	"github.com/perfect-panel/server/pkg/cache"
 	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
@@ -58,8 +60,18 @@ func (m *defaultSubscribeModel) getCacheKeys(data *Subscribe) []string {
 		return []string{}
 	}
 	SubscribeIdKey := fmt.Sprintf("%s%v", cacheSubscribeIdPrefix, data.Id)
-	cacheKeys := []string{
-		SubscribeIdKey,
+	serverKey := make([]string, 0)
+	if data.Server != "" {
+		cacheKey := strings.Split(data.Server, ",")
+		for _, v := range cacheKey {
+			if v != "" {
+				serverKey = append(serverKey, fmt.Sprintf("%s%v", config.ServerUserListCacheKey, v))
+			}
+		}
+	}
+	cacheKeys := []string{SubscribeIdKey}
+	if len(serverKey) > 0 {
+		cacheKeys = append(cacheKeys, serverKey...)
 	}
 	return cacheKeys
 }

internal/model/subscribe/model.go

@@ -35,6 +35,7 @@ type customSubscribeLogicModel interface {
 	QuerySubscribeIdsByServerIdAndServerGroupId(ctx context.Context, serverId, serverGroupId int64) ([]*Subscribe, error)
 	QuerySubscribeMinSortByIds(ctx context.Context, ids []int64) (int64, error)
 	QuerySubscribeListByIds(ctx context.Context, ids []int64) ([]*Subscribe, error)
+	ClearCache(ctx context.Context, id int64) error
 }
 
 // NewModel returns a model for the database table.
@@ -107,3 +108,24 @@ func (m *customSubscribeModel) QuerySubscribeListByIds(ctx context.Context, ids
 	})
 	return list, err
 }
+
+func (m *customSubscribeModel) ClearCache(ctx context.Context, id int64) error {
+	if id <= 0 {
+		return nil
+	}
+	data, err := m.FindOne(ctx, id)
+	if err != nil {
+		return err
+	}
+
+	cacheKeys := m.getCacheKeys(data)
+
+	cacheKeys = append(cacheKeys, m.getCacheKeys(&Subscribe{Id: id})...)
+
+	for _, key := range cacheKeys {
+		if err := m.CachedConn.DelCacheCtx(ctx, key); err != nil {
+			return err
+		}
+	}
+	return nil
+}

internal/model/task/task.go

@@ -0,0 +1,27 @@
+package task
+
+import "time"
+
+type EmailTask struct {
+	Id                int64     `gorm:"column:id;primaryKey;autoIncrement;comment:ID"`
+	Subject           string    `gorm:"column:subject;type:varchar(255);not null;comment:Email Subject"`
+	Content           string    `gorm:"column:content;type:text;not null;comment:Email Content"`
+	Recipients        string    `gorm:"column:recipient;type:text;not null;comment:Email Recipient"`
+	Scope             string    `gorm:"column:scope;type:varchar(50);not null;comment:Email Scope"`
+	RegisterStartTime time.Time `gorm:"column:register_start_time;default:null;comment:Register Start Time"`
+	RegisterEndTime   time.Time `gorm:"column:register_end_time;default:null;comment:Register End Time"`
+	Additional        string    `gorm:"column:additional;type:text;default:null;comment:Additional Information"`
+	Scheduled         time.Time `gorm:"column:scheduled;not null;comment:Scheduled Time"`
+	Interval          uint8     `gorm:"column:interval;not null;comment:Interval in Seconds"`
+	Limit             uint64    `gorm:"column:limit;not null;comment:Daily send limit"`
+	Status            uint8     `gorm:"column:status;not null;comment:Daily Status"`
+	Errors            string    `gorm:"column:errors;type:text;not null;comment:Errors"`
+	Total             uint64    `gorm:"column:total;not null;default:0;comment:Total Number"`
+	Current           uint64    `gorm:"column:current;not null;default:0;comment:Current Number"`
+	CreatedAt         time.Time `gorm:"<-:create;comment:Creation Time"`
+	UpdatedAt         time.Time `gorm:"comment:Update Time"`
+}
+
+func (EmailTask) TableName() string {
+	return "email_task"
+}

internal/model/user/authMethod.go

@@ -3,6 +3,7 @@ package user
 import (
 	"context"
 
+	"github.com/perfect-panel/server/pkg/logger"
 	"gorm.io/gorm"
 )
 
@@ -31,24 +32,50 @@ func (m *defaultUserModel) FindUserAuthMethodByPlatform(ctx context.Context, use
 }
 
 func (m *defaultUserModel) InsertUserAuthMethods(ctx context.Context, data *AuthMethods, tx ...*gorm.DB) error {
+	u, err := m.FindOne(ctx, data.UserId)
+	if err != nil {
+		return err
+	}
+
 	return m.ExecNoCacheCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
-		return conn.Model(&AuthMethods{}).Create(data).Error
+		if err = conn.Model(&AuthMethods{}).Create(data).Error; err != nil {
+			return err
+		}
+		return m.ClearUserCache(ctx, u)
 	})
 }
 
 func (m *defaultUserModel) UpdateUserAuthMethods(ctx context.Context, data *AuthMethods, tx ...*gorm.DB) error {
+	u, err := m.FindOne(ctx, data.UserId)
+	if err != nil {
+		return err
+	}
+
 	return m.ExecNoCacheCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
-		return conn.Model(&AuthMethods{}).Where("user_id = ? AND auth_type = ?", data.UserId, data.AuthType).Save(data).Error
+		err = conn.Model(&AuthMethods{}).Where("user_id = ? AND auth_type = ?", data.UserId, data.AuthType).Save(data).Error
+		if err != nil {
+			return err
+		}
+		return m.ClearUserCache(ctx, u)
 	})
 }
 
 func (m *defaultUserModel) DeleteUserAuthMethods(ctx context.Context, userId int64, platform string, tx ...*gorm.DB) error {
+	u, err := m.FindOne(ctx, userId)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err = m.ClearUserCache(context.Background(), u); err != nil {
+			logger.Errorf("[UserModel] clear user cache failed: %v", err.Error())
+		}
+	}()
 	return m.ExecNoCacheCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]

internal/model/user/cache.go

@@ -0,0 +1,285 @@
+package user
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/perfect-panel/server/pkg/logger"
+)
+
+type CacheKeyGenerator interface {
+	GetCacheKeys() []string
+}
+
+type CacheManager interface {
+	ClearCache(ctx context.Context, keys ...string) error
+	ClearModelCache(ctx context.Context, models ...CacheKeyGenerator) error
+}
+
+type UserCacheManager struct {
+	model *defaultUserModel
+}
+
+func NewUserCacheManager(model *defaultUserModel) *UserCacheManager {
+	return &UserCacheManager{
+		model: model,
+	}
+}
+
+func (c *UserCacheManager) ClearCache(ctx context.Context, keys ...string) error {
+	if len(keys) == 0 {
+		return nil
+	}
+	return c.model.CachedConn.DelCacheCtx(ctx, keys...)
+}
+
+func (c *UserCacheManager) ClearModelCache(ctx context.Context, models ...CacheKeyGenerator) error {
+	var allKeys []string
+	for _, model := range models {
+		if model != nil {
+			allKeys = append(allKeys, model.GetCacheKeys()...)
+		}
+	}
+	return c.ClearCache(ctx, allKeys...)
+}
+
+func (u *User) GetCacheKeys() []string {
+	if u == nil {
+		return []string{}
+	}
+	keys := []string{
+		fmt.Sprintf("%s%d", cacheUserIdPrefix, u.Id),
+	}
+
+	for _, auth := range u.AuthMethods {
+		if auth.AuthType == "email" {
+			keys = append(keys, fmt.Sprintf("%s%s", cacheUserEmailPrefix, auth.AuthIdentifier))
+			break
+		}
+	}
+	return keys
+}
+
+func (s *Subscribe) GetCacheKeys() []string {
+	if s == nil {
+		return []string{}
+	}
+	keys := []string{}
+
+	if s.Token != "" {
+		keys = append(keys, fmt.Sprintf("%s%s", cacheUserSubscribeTokenPrefix, s.Token))
+	}
+	if s.UserId != 0 {
+		keys = append(keys, fmt.Sprintf("%s%d", cacheUserSubscribeUserPrefix, s.UserId))
+	}
+	if s.Id != 0 {
+		keys = append(keys, fmt.Sprintf("%s%d", cacheUserSubscribeIdPrefix, s.Id))
+	}
+	return keys
+}
+
+func (s *Subscribe) GetExtendedCacheKeys(model *defaultUserModel) []string {
+	keys := s.GetCacheKeys()
+
+	if s.SubscribeId != 0 && model != nil {
+		serverKeys := model.getServerRelatedCacheKeys(s.SubscribeId)
+		keys = append(keys, serverKeys...)
+	}
+
+	return keys
+}
+
+func (d *Device) GetCacheKeys() []string {
+	if d == nil {
+		return []string{}
+	}
+	keys := []string{}
+
+	if d.Id != 0 {
+		keys = append(keys, fmt.Sprintf("%s%d", cacheUserDeviceIdPrefix, d.Id))
+	}
+	if d.Identifier != "" {
+		keys = append(keys, fmt.Sprintf("%s%s", cacheUserDeviceNumberPrefix, d.Identifier))
+	}
+	return keys
+}
+
+func (a *AuthMethods) GetCacheKeys() []string {
+	if a == nil {
+		return []string{}
+	}
+	keys := []string{}
+
+	if a.UserId != 0 {
+		keys = append(keys, fmt.Sprintf("%s%d", cacheUserIdPrefix, a.UserId))
+	}
+	if a.AuthType == "email" && a.AuthIdentifier != "" {
+		keys = append(keys, fmt.Sprintf("%s%s", cacheUserEmailPrefix, a.AuthIdentifier))
+	}
+	return keys
+}
+
+func (m *defaultUserModel) GetCacheManager() *UserCacheManager {
+	return NewUserCacheManager(m)
+}
+
+func (m *defaultUserModel) getServerRelatedCacheKeys(subscribeId int64) []string {
+	// 这里复用了 model.go 中的逻辑，但简化了实现
+	keys := []string{}
+
+	if subscribeId == 0 {
+		return keys
+	}
+
+	// 这里需要从 getSubscribeCacheKey 方法中提取服务器相关的逻辑
+	// 为了避免重复查询，我们可以在需要时才获取
+	// 或者可以将这个逻辑移到一个统一的地方
+
+	return keys
+}
+
+func (m *defaultUserModel) ClearUserCache(ctx context.Context, users ...*User) error {
+	cacheManager := m.GetCacheManager()
+	models := make([]CacheKeyGenerator, len(users))
+	for i, user := range users {
+		models[i] = user
+	}
+	return cacheManager.ClearModelCache(ctx, models...)
+}
+
+func (m *defaultUserModel) ClearSubscribeCacheByModels(ctx context.Context, subscribes ...*Subscribe) error {
+	cacheManager := m.GetCacheManager()
+	models := make([]CacheKeyGenerator, len(subscribes))
+	for i, subscribe := range subscribes {
+		models[i] = subscribe
+	}
+	return cacheManager.ClearModelCache(ctx, models...)
+}
+
+func (m *defaultUserModel) ClearDeviceCache(ctx context.Context, devices ...*Device) error {
+	cacheManager := m.GetCacheManager()
+	models := make([]CacheKeyGenerator, len(devices))
+	for i, device := range devices {
+		models[i] = device
+	}
+	return cacheManager.ClearModelCache(ctx, models...)
+}
+
+func (m *defaultUserModel) ClearAuthMethodCache(ctx context.Context, authMethods ...*AuthMethods) error {
+	cacheManager := m.GetCacheManager()
+	models := make([]CacheKeyGenerator, len(authMethods))
+	for i, auth := range authMethods {
+		models[i] = auth
+	}
+	return cacheManager.ClearModelCache(ctx, models...)
+}
+
+func (m *defaultUserModel) BatchClearRelatedCache(ctx context.Context, user *User) error {
+	if user == nil {
+		return nil
+	}
+
+	cacheManager := m.GetCacheManager()
+
+	var allModels []CacheKeyGenerator
+	allModels = append(allModels, user)
+
+	for _, auth := range user.AuthMethods {
+		allModels = append(allModels, &auth)
+	}
+
+	for _, device := range user.UserDevices {
+		allModels = append(allModels, &device)
+	}
+
+	subscribes, err := m.QueryUserSubscribe(ctx, user.Id)
+	if err != nil {
+		logger.Errorf("failed to query user subscribes for cache clearing: %v", err)
+	} else {
+		for _, sub := range subscribes {
+			subModel := &Subscribe{
+				Id:          sub.Id,
+				UserId:      sub.UserId,
+				Token:       sub.Token,
+				SubscribeId: sub.SubscribeId,
+			}
+			allModels = append(allModels, subModel)
+		}
+	}
+
+	return cacheManager.ClearModelCache(ctx, allModels...)
+}
+
+func (m *defaultUserModel) CacheInvalidationHandler(ctx context.Context, operation string, modelType string, model interface{}) error {
+	switch operation {
+	case "create", "update", "delete":
+		switch modelType {
+		case "user":
+			if user, ok := model.(*User); ok {
+				return m.BatchClearRelatedCache(ctx, user)
+			}
+		case "subscribe":
+			if subscribe, ok := model.(*Subscribe); ok {
+				return m.ClearSubscribeCacheByModels(ctx, subscribe)
+			}
+		case "device":
+			if device, ok := model.(*Device); ok {
+				return m.ClearDeviceCache(ctx, device)
+			}
+		case "authmethod":
+			if authMethod, ok := model.(*AuthMethods); ok {
+				return m.ClearAuthMethodCache(ctx, authMethod)
+			}
+		}
+	}
+	return nil
+}
+
+func (m *customUserModel) GetRelatedCacheKeys(ctx context.Context, modelType string, modelId int64) ([]string, error) {
+	var keys []string
+
+	switch modelType {
+	case "user":
+		user, err := m.FindOne(ctx, modelId)
+		if err != nil {
+			return nil, err
+		}
+		keys = append(keys, user.GetCacheKeys()...)
+
+		auths, err := m.FindUserAuthMethods(ctx, modelId)
+		if err == nil {
+			for _, auth := range auths {
+				keys = append(keys, auth.GetCacheKeys()...)
+			}
+		}
+
+		subscribes, err := m.QueryUserSubscribe(ctx, modelId)
+		if err == nil {
+			for _, sub := range subscribes {
+				subModel := &Subscribe{
+					Id:          sub.Id,
+					UserId:      sub.UserId,
+					Token:       sub.Token,
+					SubscribeId: sub.SubscribeId,
+				}
+				keys = append(keys, subModel.GetCacheKeys()...)
+			}
+		}
+
+	case "subscribe":
+		subscribe, err := m.FindOneSubscribe(ctx, modelId)
+		if err != nil {
+			return nil, err
+		}
+		keys = append(keys, subscribe.GetCacheKeys()...)
+
+	case "device":
+		device, err := m.FindOneDevice(ctx, modelId)
+		if err != nil {
+			return nil, err
+		}
+		keys = append(keys, device.GetCacheKeys()...)
+	}
+
+	return keys, nil
+}

internal/model/user/default.go

@@ -48,29 +48,20 @@ func newUserModel(db *gorm.DB, c *redis.Client) *defaultUserModel {
 func (m *defaultUserModel) batchGetCacheKeys(users ...*User) []string {
 	var keys []string
 	for _, user := range users {
-		keys = append(keys, m.getCacheKeys(user)...)
+		keys = append(keys, user.GetCacheKeys()...)
 	}
 	return keys
-
 }
+
 func (m *defaultUserModel) getCacheKeys(data *User) []string {
 	if data == nil {
 		return []string{}
 	}
-	userIdKey := fmt.Sprintf("%s%v", cacheUserIdPrefix, data.Id)
-	cacheKeys := []string{
-		userIdKey,
-	}
-	// email key
-	if len(data.AuthMethods) > 0 {
-		for _, auth := range data.AuthMethods {
-			if auth.AuthType == "email" {
-				cacheKeys = append(cacheKeys, fmt.Sprintf("%s%v", cacheUserEmailPrefix, auth.AuthIdentifier))
-				break
-			}
-		}
-	}
-	return cacheKeys
+	return data.GetCacheKeys()
+}
+
+func (m *defaultUserModel) clearUserCache(ctx context.Context, data ...*User) error {
+	return m.ClearUserCache(ctx, data...)
 }
 
 func (m *defaultUserModel) FindOneByEmail(ctx context.Context, email string) (*User, error) {
@@ -127,53 +118,58 @@ func (m *defaultUserModel) Delete(ctx context.Context, id int64, tx ...*gorm.DB)
 		}
 		return err
 	}
-	err = m.ExecCtx(ctx, func(conn *gorm.DB) error {
-		if len(tx) > 0 {
-			conn = tx[0]
+
+	// 使用批量相关缓存清理，包含所有相关数据的缓存
+	defer func() {
+		if clearErr := m.BatchClearRelatedCache(ctx, data); clearErr != nil {
+			// 记录清理缓存错误，但不阻断删除操作
 		}
-		return conn.Transaction(func(db *gorm.DB) error {
-			if err := db.Model(&User{}).Where("`id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
-			if err := db.Model(&AuthMethods{}).Where("`user_id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
-			if err := db.Model(&Subscribe{}).Where("`user_id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
-			if err := db.Model(&BalanceLog{}).Where("`user_id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
-			if err := db.Model(&GiftAmountLog{}).Where("`user_id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
-			if err := db.Model(&LoginLog{}).Where("`user_id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
-			if err := db.Model(&SubscribeLog{}).Where("`user_id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
-			if err := db.Model(&Device{}).Where("`user_id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
+	}()
 
-			subs, err := m.QueryUserSubscribe(ctx, id)
-			if err != nil {
-				return err
-			}
-			for _, sub := range subs {
-				if err := m.DeleteSubscribeById(ctx, sub.Id, db); err != nil {
-					return err
-				}
-			}
+	return m.TransactCtx(ctx, func(db *gorm.DB) error {
+		if len(tx) > 0 {
+			db = tx[0]
+		}
 
-			if err := db.Model(&CommissionLog{}).Where("`user_id` = ?", id).Delete(&User{}).Error; err != nil {
-				return err
-			}
-			return nil
-		})
-	}, m.getCacheKeys(data)...)
-	return err
+		// 删除用户相关的所有数据
+		if err := db.Model(&User{}).Where("`id` = ?", id).Delete(&User{}).Error; err != nil {
+			return err
+		}
+
+		if err := db.Model(&AuthMethods{}).Where("`user_id` = ?", id).Delete(&AuthMethods{}).Error; err != nil {
+			return err
+		}
+
+		if err := db.Model(&Subscribe{}).Where("`user_id` = ?", id).Delete(&Subscribe{}).Error; err != nil {
+			return err
+		}
+
+		if err := db.Model(&BalanceLog{}).Where("`user_id` = ?", id).Delete(&BalanceLog{}).Error; err != nil {
+			return err
+		}
+
+		if err := db.Model(&GiftAmountLog{}).Where("`user_id` = ?", id).Delete(&GiftAmountLog{}).Error; err != nil {
+			return err
+		}
+
+		if err := db.Model(&LoginLog{}).Where("`user_id` = ?", id).Delete(&LoginLog{}).Error; err != nil {
+			return err
+		}
+
+		if err := db.Model(&SubscribeLog{}).Where("`user_id` = ?", id).Delete(&SubscribeLog{}).Error; err != nil {
+			return err
+		}
+
+		if err := db.Model(&Device{}).Where("`user_id` = ?", id).Delete(&Device{}).Error; err != nil {
+			return err
+		}
+
+		if err := db.Model(&CommissionLog{}).Where("`user_id` = ?", id).Delete(&CommissionLog{}).Error; err != nil {
+			return err
+		}
+
+		return nil
+	})
 }
 
 func (m *defaultUserModel) Transaction(ctx context.Context, fn func(db *gorm.DB) error) error {

internal/model/user/device.go

@@ -51,13 +51,12 @@ func (m *customUserModel) UpdateDevice(ctx context.Context, data *Device, tx ...
 	if err != nil {
 		return err
 	}
-	deviceIdKey := fmt.Sprintf("%s%v", cacheUserDeviceIdPrefix, old.Id)
 	err = m.ExecCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
 		return conn.Save(data).Error
-	}, deviceIdKey)
+	}, old.GetCacheKeys()...)
 	return err
 }
 
@@ -69,12 +68,11 @@ func (m *customUserModel) DeleteDevice(ctx context.Context, id int64, tx ...*gor
 		}
 		return err
 	}
-	deviceIdKey := fmt.Sprintf("%s%v", cacheUserDeviceIdPrefix, data.Id)
 	err = m.ExecCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
 		return conn.Delete(&Device{}, id).Error
-	}, deviceIdKey)
+	}, data.GetCacheKeys()...)
 	return err
 }

internal/model/user/model.go

@@ -6,11 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/perfect-panel/server/internal/config"
-	"github.com/perfect-panel/server/internal/model/server"
 	"github.com/perfect-panel/server/internal/model/subscribe"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/tool"
 	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
 )
@@ -63,6 +59,7 @@ type UserFilterParams struct {
 	UserId          *int64
 	SubscribeId     *int64
 	UserSubscribeId *int64
+	Order           string // Order by id, e.g., "desc"
 }
 
 type customUserLogicModel interface {
@@ -110,12 +107,23 @@ type customUserLogicModel interface {
 	FilterLoginLogList(ctx context.Context, page, size int, filter *LoginLogFilterParams) ([]*LoginLog, int64, error)
 
 	ClearSubscribeCache(ctx context.Context, data ...*Subscribe) error
+	clearUserCache(ctx context.Context, data ...*User) error
 
 	InsertResetSubscribeLog(ctx context.Context, log *ResetSubscribeLog, tx ...*gorm.DB) error
 	UpdateResetSubscribeLog(ctx context.Context, log *ResetSubscribeLog, tx ...*gorm.DB) error
 	FindResetSubscribeLog(ctx context.Context, id int64) (*ResetSubscribeLog, error)
 	DeleteResetSubscribeLog(ctx context.Context, id int64, tx ...*gorm.DB) error
 	FilterResetSubscribeLogList(ctx context.Context, filter *FilterResetSubscribeLogParams) ([]*ResetSubscribeLog, int64, error)
+
+	QueryDailyUserStatisticsList(ctx context.Context, date time.Time) ([]UserStatisticsWithDate, error)
+	QueryMonthlyUserStatisticsList(ctx context.Context, date time.Time) ([]UserStatisticsWithDate, error)
+}
+
+type UserStatisticsWithDate struct {
+	Date              string
+	Register          int64
+	NewOrderUsers     int64
+	RenewalOrderUsers int64
 }
 
 // NewModel returns a model for the database table.
@@ -125,56 +133,6 @@ func NewModel(conn *gorm.DB, c *redis.Client) Model {
 	}
 }
 
-func (m *defaultUserModel) getSubscribeCacheKey(data *Subscribe) []string {
-	if data == nil {
-		return []string{}
-	}
-	var keys []string
-	if data.Token != "" {
-		keys = append(keys, fmt.Sprintf("%s%s", cacheUserSubscribeTokenPrefix, data.Token))
-	}
-	if data.UserId != 0 {
-		keys = append(keys, fmt.Sprintf("%s%d", cacheUserSubscribeUserPrefix, data.UserId))
-	}
-	if data.Id != 0 {
-		keys = append(keys, fmt.Sprintf("%s%d", cacheUserSubscribeIdPrefix, data.Id))
-	}
-
-	if data.SubscribeId != 0 {
-		var sub *subscribe.Subscribe
-		err := m.QueryNoCacheCtx(context.Background(), &sub, func(conn *gorm.DB, v interface{}) error {
-			return conn.Model(&subscribe.Subscribe{}).Where("id = ?", data.SubscribeId).First(&sub).Error
-		})
-		if err != nil {
-			logger.Error("getUserSubscribeCacheKey", logger.Field("error", err.Error()), logger.Field("subscribeId", data.SubscribeId))
-			return keys
-		}
-		if sub.Server != "" {
-			ids := tool.StringToInt64Slice(sub.Server)
-			for _, id := range ids {
-				keys = append(keys, fmt.Sprintf("%s%d", config.ServerUserListCacheKey, id))
-			}
-		}
-		if sub.ServerGroup != "" {
-			ids := tool.StringToInt64Slice(sub.ServerGroup)
-			var servers []*server.Server
-			err = m.QueryNoCacheCtx(context.Background(), &servers, func(conn *gorm.DB, v interface{}) error {
-				return conn.Model(&server.Server{}).Where("group_id in ?", ids).Find(v).Error
-			})
-			if err != nil {
-				logger.Error("getUserSubscribeCacheKey", logger.Field("error", err.Error()), logger.Field("subscribeId", data.SubscribeId))
-				return keys
-			}
-			for _, s := range servers {
-				keys = append(keys, fmt.Sprintf("%s%d", config.ServerUserListCacheKey, s.Id))
-			}
-		}
-	}
-
-	return keys
-
-}
-
 // QueryPageList returns a list of records that meet the conditions.
 func (m *customUserModel) QueryPageList(ctx context.Context, page, size int, filter *UserFilterParams) ([]*User, int64, error) {
 	var list []*User
@@ -196,6 +154,9 @@ func (m *customUserModel) QueryPageList(ctx context.Context, page, size int, fil
 				conn = conn.Joins("LEFT JOIN user_subscribe ON user.id = user_subscribe.user_id").
 					Where("user_subscribe.subscribe_id =? and `status` IN (0,1)", *filter.SubscribeId)
 			}
+			if filter.Order != "" {
+				conn = conn.Order(fmt.Sprintf("user.id %s", filter.Order))
+			}
 		}
 		return conn.Model(&User{}).Group("user.id").Count(&total).Limit(size).Offset((page - 1) * size).Preload("UserDevices").Preload("AuthMethods").Find(&list).Error
 	})
@@ -245,7 +206,15 @@ func (m *customUserModel) UpdateUserSubscribeWithTraffic(ctx context.Context, id
 	if err != nil {
 		return err
 	}
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+
+	// 使用 defer 确保更新后清理缓存
+	defer func() {
+		if clearErr := m.ClearSubscribeCacheByModels(ctx, sub); clearErr != nil {
+			// 记录清理缓存错误
+		}
+	}()
+
+	return m.ExecNoCacheCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
@@ -253,7 +222,7 @@ func (m *customUserModel) UpdateUserSubscribeWithTraffic(ctx context.Context, id
 			"download": gorm.Expr("download + ?", download),
 			"upload":   gorm.Expr("upload + ?", upload),
 		}).Error
-	}, m.getSubscribeCacheKey(sub)...)
+	})
 }
 
 func (m *customUserModel) QueryResisterUserTotalByDate(ctx context.Context, date time.Time) (int64, error) {
@@ -293,7 +262,7 @@ func (m *customUserModel) QueryAdminUsers(ctx context.Context) ([]*User, error)
 }
 
 func (m *customUserModel) UpdateUserCache(ctx context.Context, data *User) error {
-	return m.CachedConn.DelCacheCtx(ctx, m.getCacheKeys(data)...)
+	return m.ClearUserCache(ctx, data)
 }
 
 func (m *customUserModel) InsertCommissionLog(ctx context.Context, data *CommissionLog, tx ...*gorm.DB) error {
@@ -399,3 +368,43 @@ func (m *customUserModel) FilterResetSubscribeLogList(ctx context.Context, filte
 
 	return list, total, err
 }
+
+// QueryDailyUserStatisticsList Query daily user statistics list for the current month (from 1st to current date)
+func (m *customUserModel) QueryDailyUserStatisticsList(ctx context.Context, date time.Time) ([]UserStatisticsWithDate, error) {
+	var results []UserStatisticsWithDate
+	err := m.QueryNoCacheCtx(ctx, &results, func(conn *gorm.DB, v interface{}) error {
+		firstDay := time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location())
+		return conn.Model(&User{}).
+			Select(
+				"DATE(created_at) as date, "+
+					"COUNT(*) as register, "+
+					"0 as new_order_users, "+
+					"0 as renewal_order_users",
+			).
+			Where("created_at BETWEEN ? AND ?", firstDay, date).
+			Group("DATE(created_at)").
+			Order("date ASC").
+			Scan(v).Error
+	})
+	return results, err
+}
+
+// QueryMonthlyUserStatisticsList Query monthly user statistics list for the past 6 months
+func (m *customUserModel) QueryMonthlyUserStatisticsList(ctx context.Context, date time.Time) ([]UserStatisticsWithDate, error) {
+	var results []UserStatisticsWithDate
+	err := m.QueryNoCacheCtx(ctx, &results, func(conn *gorm.DB, v interface{}) error {
+		sixMonthsAgo := date.AddDate(0, -5, 0)
+		return conn.Model(&User{}).
+			Select(
+				"DATE_FORMAT(created_at, '%Y-%m') as date, "+
+					"COUNT(*) as register, "+
+					"0 as new_order_users, "+
+					"0 as renewal_order_users",
+			).
+			Where("created_at >= ?", sixMonthsAgo).
+			Group("DATE_FORMAT(created_at, '%Y-%m')").
+			Order("date ASC").
+			Scan(v).Error
+	})
+	return results, err
+}

internal/model/user/subscribe.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (m *defaultUserModel) UpdateUserSubscribeCache(ctx context.Context, data *Subscribe) error {
-	return m.CachedConn.DelCacheCtx(ctx, m.getSubscribeCacheKey(data)...)
+	return m.ClearSubscribeCacheByModels(ctx, data)
 }
 
 // QueryActiveSubscriptions returns the number of active subscriptions.
@@ -113,12 +113,20 @@ func (m *defaultUserModel) UpdateSubscribe(ctx context.Context, data *Subscribe,
 	if err != nil {
 		return err
 	}
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+
+	// 使用 defer 确保更新后清理缓存
+	defer func() {
+		if clearErr := m.ClearSubscribeCacheByModels(ctx, old, data); clearErr != nil {
+			// 记录清理缓存错误
+		}
+	}()
+
+	return m.ExecNoCacheCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
 		return conn.Model(&Subscribe{}).Where("id = ?", data.Id).Save(data).Error
-	}, m.getSubscribeCacheKey(old)...)
+	})
 }
 
 // DeleteSubscribe deletes a record.
@@ -127,22 +135,37 @@ func (m *defaultUserModel) DeleteSubscribe(ctx context.Context, token string, tx
 	if err != nil {
 		return err
 	}
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+
+	// 使用 defer 确保删除后清理缓存
+	defer func() {
+		if clearErr := m.ClearSubscribeCacheByModels(ctx, data); clearErr != nil {
+			// 记录清理缓存错误
+		}
+	}()
+
+	return m.ExecNoCacheCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
 		return conn.Where("token = ?", token).Delete(&Subscribe{}).Error
-	}, m.getSubscribeCacheKey(data)...)
+	})
 }
 
 // InsertSubscribe insert Subscribe into the database.
 func (m *defaultUserModel) InsertSubscribe(ctx context.Context, data *Subscribe, tx ...*gorm.DB) error {
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+	// 使用 defer 确保插入后清理相关缓存
+	defer func() {
+		if clearErr := m.ClearSubscribeCacheByModels(ctx, data); clearErr != nil {
+			// 记录清理缓存错误
+		}
+	}()
+
+	return m.ExecNoCacheCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
 		return conn.Create(data).Error
-	}, m.getSubscribeCacheKey(data)...)
+	})
 }
 
 func (m *defaultUserModel) DeleteSubscribeById(ctx context.Context, id int64, tx ...*gorm.DB) error {
@@ -150,18 +173,22 @@ func (m *defaultUserModel) DeleteSubscribeById(ctx context.Context, id int64, tx
 	if err != nil {
 		return err
 	}
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+
+	// 使用 defer 确保删除后清理缓存
+	defer func() {
+		if clearErr := m.ClearSubscribeCacheByModels(ctx, data); clearErr != nil {
+			// 记录清理缓存错误
+		}
+	}()
+
+	return m.ExecNoCacheCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
 		}
 		return conn.Where("id = ?", id).Delete(&Subscribe{}).Error
-	}, m.getSubscribeCacheKey(data)...)
+	})
 }
 
 func (m *defaultUserModel) ClearSubscribeCache(ctx context.Context, data ...*Subscribe) error {
-	var keys []string
-	for _, item := range data {
-		keys = append(keys, m.getSubscribeCacheKey(item)...)
-	}
-	return m.CachedConn.DelCacheCtx(ctx, keys...)
+	return m.ClearSubscribeCacheByModels(ctx, data...)
 }

internal/model/user/user.go

@@ -2,9 +2,6 @@ package user
 
 import (
 	"time"
-
-	"gorm.io/gorm"
-	"gorm.io/plugin/soft_delete"
 )
 
 type User struct {
@@ -28,39 +25,7 @@ type User struct {
 	UpdatedAt             time.Time     `gorm:"comment:Update Time"`
 }
 
-func (User) TableName() string {
-	return "user"
-}
-
-type OldUser struct {
-	Id    int64  `gorm:"primaryKey"`
-	Email string `gorm:"index:idx_email;type:varchar(100);comment:Email"`
-	//Telephone             string                `gorm:"index:idx_telephone;type:varchar(20);default:'';comment:Telephone"`
-	//TelephoneAreaCode     string                `gorm:"index:idx_telephone;type:varchar(20);default:'';comment:TelephoneAreaCode"`
-	Password              string                `gorm:"type:varchar(100);not null;comment:User Password"`
-	Avatar                string                `gorm:"type:varchar(200);default:'';comment:User Avatar"`
-	Balance               int64                 `gorm:"default:0;comment:User Balance"` // User Balance Amount
-	Telegram              int64                 `gorm:"default:null;comment:Telegram Account"`
-	ReferCode             string                `gorm:"type:varchar(20);default:'';comment:Referral Code"`
-	RefererId             int64                 `gorm:"index:idx_referer;comment:Referrer ID"`
-	Commission            int64                 `gorm:"default:0;comment:Commission"` // Commission Amount
-	GiftAmount            int64                 `gorm:"default:0;comment:User Gift Amount"`
-	Enable                *bool                 `gorm:"default:true;not null;comment:Is Account Enabled"`
-	IsAdmin               *bool                 `gorm:"default:false;not null;comment:Is Admin"`
-	ValidEmail            *bool                 `gorm:"default:false;not null;comment:Is Email Verified"`
-	EnableEmailNotify     *bool                 `gorm:"default:false;not null;comment:Enable Email Notifications"`
-	EnableTelegramNotify  *bool                 `gorm:"default:false;not null;comment:Enable Telegram Notifications"`
-	EnableBalanceNotify   *bool                 `gorm:"default:false;not null;comment:Enable Balance Change Notifications"`
-	EnableLoginNotify     *bool                 `gorm:"default:false;not null;comment:Enable Login Notifications"`
-	EnableSubscribeNotify *bool                 `gorm:"default:false;not null;comment:Enable Subscription Notifications"`
-	EnableTradeNotify     *bool                 `gorm:"default:false;not null;comment:Enable Trade Notifications"`
-	CreatedAt             time.Time             `gorm:"<-:create;comment:Creation Time"`
-	UpdatedAt             time.Time             `gorm:"comment:Update Time"`
-	DeletedAt             gorm.DeletedAt        `gorm:"default:null;comment:Deletion Time"`
-	IsDel                 soft_delete.DeletedAt `gorm:"softDelete:flag,DeletedAtField:DeletedAt;comment:1: Normal 0: Deleted"` // Using `1` and `0` to indicate
-}
-
-func (OldUser) TableName() string {
+func (*User) TableName() string {
 	return "user"
 }
 
@@ -83,7 +48,7 @@ type Subscribe struct {
 	UpdatedAt   time.Time  `gorm:"comment:Update Time"`
 }
 
-func (Subscribe) TableName() string {
+func (*Subscribe) TableName() string {
 	return "user_subscribe"
 }
 
@@ -125,7 +90,7 @@ type CommissionLog struct {
 	CreatedAt time.Time `gorm:"<-:create;comment:Creation Time"`
 }
 
-func (CommissionLog) TableName() string {
+func (*CommissionLog) TableName() string {
 	return "user_commission_log"
 }
 
@@ -139,7 +104,7 @@ type AuthMethods struct {
 	UpdatedAt      time.Time `gorm:"comment:Update Time"`
 }
 
-func (AuthMethods) TableName() string {
+func (*AuthMethods) TableName() string {
 	return "user_auth_methods"
 }
 
@@ -155,7 +120,7 @@ type Device struct {
 	UpdatedAt  time.Time `gorm:"comment:Update Time"`
 }
 
-func (Device) TableName() string {
+func (*Device) TableName() string {
 	return "user_device"
 }