* refactor: rename queryannouncementhandler.go to queryAnnouncementLogic.go for clarity
* feat(panDomain): update subscription logic to use V2 handler for improved functionality
* refactor(subscribe): replace V2 handler with a unified Handler method for subscription logic
* feat(subscribe): implement user agent limit feature with configurable list
* fix(subscribe): improve error handling and logging for subscription requests
* feat(subscribe): add user agent limit configuration to system settings
* refactor(api): remove deprecated application-related endpoints and types
* refactor(swagger): remove deprecated app.json generation from swagger configuration
* refactor(swagger): remove deprecated app.json check from swagger configuration
* fix(subscribe): update delete method to use Where clause for improved query accuracy
* fix(subscribe): update Id field tag to use primaryKey and improve save method query
* fix(subscribe): update Id field tag to use primaryKey and improve model queries
* fix(subscribe): rename variable for clarity and add special handling for Stash user agent
* fix(email): convert RegisterStartTime and RegisterEndTime to time.Time for accurate query filtering
* refactor(log): consolidate logging models and update related logic for improved clarity and functionality
* fix(types): change Content field type in MessageLog to interface{} for improved flexibility
* fix(log): change MessageLog list to use value type for improved performance and memory efficiency
* fix(email): set EmailTypeVerify in task payload and update content type conversion for verification email
* fix(log): remove unused Id field from SystemLog during login log insertion
* fix(login): remove debug logs and error logging during user login process
* fix(log): add traffic reset logging for subscription resets
* fix(log): insert reset traffic log during subscription activation
* feat(log): add endpoints for retrieving and resetting subscribe traffic logs
* refactor(log): remove Reset Subscribe Traffic Log endpoint and related types
* feat(traffic): add traffic statistics logging and scheduling
* fix(subscribe): ensure active status and reset timestamps during traffic resets
* feat(api): enhance server and node management with new request/response structures
* refactor(api): rename OnlineUser to ServerOnlineUser for clarity
* feat(api): define OnlineUser type with SID and IP fields
* feat(server): implement server management handlers and database schema
* feat(api): add traffic log details filtering and enhance traffic log structures
* feat(api): migrate server and node data handling, update related structures and logic
* feat(server): implement server deletion logic with error handling
* feat(api): update log filtering to use ResetSubscribe type for subscription logs
* feat(api): standardize timestamp field across log structures
* feat(api): refactor cache key handling for server and user lists
* feat(api): enhance server status handling with protocol support and refactor related logic
* fix(traffic): adjust start date for traffic statistics and improve log deletion comment
* feat(api): implement daily traffic ranking for users and servers with error handling
* feat(api): update server total data response to use 'OnlineUsers' and implement daily traffic statistics logging
* feat(api): add log settings management with auto-clear and clear days configuration
* fix(log): correct category in log settings update query
* feat(routes): add handler for scheduled traffic statistics
* feat(model): add user counts struct and update queries for new and renewal users
* feat(api): add referral percentage and only first purchase fields to user model and requests
* feat(database): update user table to add referral percentage and only first purchase fields
* feat(api): add reset sort endpoints for server and node
* feat(api): add sort field to server model
* feat(api): implement sorting functionality for nodes and servers
* fix(database): add sort column to nodes table
* fix(model): enhance user statistics queries with new order and renewal order counts
* fix(log): update timestamp handling in login and registration logs
* fix(log): update sorting logic for server and user subscribe traffic logs
* fix(server): add server status handling based on last reported time
* fix(model): correct filter condition to use 'date' instead of 'data'
* fix(migration): add index for traffic log on timestamp, user_id, and subscribe_id
* fix(log): optimize user traffic rank data handling by using append instead of index assignment
* fix(filter): refactor node list creation to use append and remove duplicates from tags
* fix(node): add ServerId and Enabled fields to node update logic
* feat(tags): add endpoint to query all node tags
* fix(preview): add Preload parameter to FilterNodeList for improved data retrieval
* fix(log): date is empty
* feat(subscribe): add Language field to subscription models and update query logic
* feat(subscription): add Language parameter to GetSubscription request and update query logic
* fix(server): encode ServerKey in base64 and update last reported time for nodes
* feat: delete common GetSubscription
* feat(subscription): implement FilterList method for subscription queries and update related logic
* fix(subscribe): remove duplicate user agents in SubscribeHandler
* fix(push): initialize onlineUsers as a map in pushOnlineUsersLogic
* fix(reset): initialize subs as a map in clearCache method
* refactor(query): simplify node and tag filtering using InSet function
* feat(userlist): enhance GetServerUserListLogic with improved node and tag handling
* fix(userlist): correct node ID assignment and update query logic for tag filtering
* fix(userlist): correct node ID assignment in getServerUserListLogic
* refactor(query): streamline query construction for tag filtering
* fix(statistics): optimize server ranking data handling in QueryServerTotalDataLogic
* refactor(statistics): simplify server ranking data construction in QueryServerTotalDataLogic
* fix(statistics): correct server traffic data assignment in QueryServerTotalDataLogic
* fix(statistics): optimize yesterday's top 10 server traffic data assignment in QueryServerTotalDataLogic
* fix(middleware): remove duplicate elements from user agent list in PanDomainMiddleware
* feat(middleware): enhance user agent handling by querying client list in PanDomainMiddleware
* feat(client): subscribe_template
* feat(oauth): add user agent and IP logging to registration and login processes
* fix(balance): add timestamp to balance logs for payment, refund, and recharge transactions
* fix(log): correct comment for CommissionTypeRefund to improve clarity
* fix(log): replace magic number with constant for gift type in purchase checkout logic
* fix(log): rename OrderId to OrderNo for consistency in balance logging
* feat(log): add logging for balance, gift amount, and commission adjustments
* fix(user): correct placement of DeepCopy for user info update logic
* feat(log): add UserSubscribeId to FilterSubscribeLogRequest for enhanced filtering
* fix(purchase): streamline error handling and improve JSON marshaling for temporary orders
* fix(order): simplify commission handling and improve payload parsing logic
* fix(order): update commission calculation to actual payment amount minus gateway handling fee
* feat(payment): add support for CryptoSaaS payment platform and enhance configuration handling
* fix(balance): update QueryUserBalanceLog response structure to include balance log list
* fix(email): update task progress handling to use specific task ID for updates
* feat(quota): add quota task creation and querying endpoints with updated data structures
* fix(email): update task handling to use generic task model and improve error logging
* fix(order): improve error logging for database transaction and user cache updates
* feat(quota): enhance quota task management with new request structures and processing logic
* fix(quota): remove redundant quota task status endpoint from admin marketing routes
* fix(worker): update task completion status handling in worker logic
* fix(quota): update taskInfo to include current subscription count in quota logic
* doc(log): rename function for clarity and add cache cleanup comment
* fix(quota): update time handling in quota logic and correct subscriber ID query
* fix(quota): update time handling to use UnixMilli for start time in quota logic
* feat(protocol): add server protocol configuration query and enhance protocol options
* fix(quota): correct time range queries for start and expire times in quota logic
* fix(types): update plugin options to include 'none' in the plugin field
---------
Co-authored-by: Chang lue Tsen <tension@ppanel.dev>
171 lines
5.1 KiB
Go
171 lines
5.1 KiB
Go
package marketing
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/hibiken/asynq"
|
|
"github.com/perfect-panel/server/internal/model/task"
|
|
"github.com/perfect-panel/server/internal/model/user"
|
|
"github.com/perfect-panel/server/internal/svc"
|
|
"github.com/perfect-panel/server/internal/types"
|
|
"github.com/perfect-panel/server/pkg/logger"
|
|
"github.com/perfect-panel/server/pkg/tool"
|
|
"github.com/perfect-panel/server/pkg/xerr"
|
|
types2 "github.com/perfect-panel/server/queue/types"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
type CreateBatchSendEmailTaskLogic struct {
|
|
logger.Logger
|
|
ctx context.Context
|
|
svcCtx *svc.ServiceContext
|
|
}
|
|
|
|
// NewCreateBatchSendEmailTaskLogic Create a batch send email task
|
|
func NewCreateBatchSendEmailTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateBatchSendEmailTaskLogic {
|
|
return &CreateBatchSendEmailTaskLogic{
|
|
Logger: logger.WithContext(ctx),
|
|
ctx: ctx,
|
|
svcCtx: svcCtx,
|
|
}
|
|
}
|
|
func (l *CreateBatchSendEmailTaskLogic) CreateBatchSendEmailTask(req *types.CreateBatchSendEmailTaskRequest) (err error) {
|
|
tx := l.svcCtx.DB
|
|
|
|
var emails []string
|
|
|
|
// 通用查询器(含 user JOIN + 注册时间范围过滤)
|
|
baseQuery := func() *gorm.DB {
|
|
query := tx.Model(&user.AuthMethods{}).
|
|
Select("auth_identifier").
|
|
Joins("JOIN user ON user.id = user_auth_methods.user_id").
|
|
Where("auth_type = ?", "email")
|
|
|
|
if req.RegisterStartTime != 0 {
|
|
query = query.Where("user.created_at >= ?", time.UnixMilli(req.RegisterStartTime))
|
|
}
|
|
if req.RegisterEndTime != 0 {
|
|
query = query.Where("user.created_at <= ?", time.UnixMilli(req.RegisterEndTime))
|
|
}
|
|
return query
|
|
}
|
|
|
|
var query *gorm.DB
|
|
|
|
scope := task.ParseScopeType(req.Scope)
|
|
|
|
switch scope {
|
|
case task.ScopeAll:
|
|
query = baseQuery()
|
|
|
|
case task.ScopeActive:
|
|
query = baseQuery().
|
|
Joins("JOIN user_subscribe ON user.id = user_subscribe.user_id").
|
|
Where("user_subscribe.status IN ?", []int64{1, 2})
|
|
|
|
case task.ScopeExpired:
|
|
query = baseQuery().
|
|
Joins("JOIN user_subscribe ON user.id = user_subscribe.user_id").
|
|
Where("user_subscribe.status = ?", 3)
|
|
|
|
case task.ScopeNone:
|
|
query = baseQuery().
|
|
Joins("LEFT JOIN user_subscribe ON user.id = user_subscribe.user_id").
|
|
Where("user_subscribe.user_id IS NULL")
|
|
default:
|
|
|
|
}
|
|
if query != nil {
|
|
// 执行查询
|
|
err = query.Pluck("auth_identifier", &emails).Error
|
|
if err != nil {
|
|
l.Errorf("[CreateBatchSendEmailTask] Failed to fetch email addresses: %v", err.Error())
|
|
return xerr.NewErrCode(xerr.DatabaseQueryError)
|
|
}
|
|
}
|
|
|
|
// 邮箱列表为空,返回错误
|
|
if len(emails) == 0 && scope != task.ScopeSkip {
|
|
l.Errorf("[CreateBatchSendEmailTask] No email addresses found for the specified scope")
|
|
return xerr.NewErrMsg("No email addresses found for the specified scope")
|
|
}
|
|
|
|
// 邮箱地址去重
|
|
emails = tool.RemoveDuplicateElements(emails...)
|
|
|
|
var additionalEmails []string
|
|
// 追加额外的邮箱地址(不覆盖)
|
|
if req.Additional != "" {
|
|
additionalEmails = tool.RemoveDuplicateElements(strings.Split(req.Additional, "\n")...)
|
|
}
|
|
if len(additionalEmails) == 0 && scope == task.ScopeSkip {
|
|
l.Errorf("[CreateBatchSendEmailTask] No additional email addresses provided for skip scope")
|
|
return xerr.NewErrMsg("No additional email addresses provided for skip scope")
|
|
}
|
|
|
|
scheduledAt := time.Now().Add(10 * time.Second) // 默认延迟10秒执行,防止任务创建和执行时间过于接近
|
|
if req.Scheduled != 0 {
|
|
scheduledAt = time.Unix(req.Scheduled, 0)
|
|
if scheduledAt.Before(time.Now()) {
|
|
scheduledAt = time.Now()
|
|
}
|
|
}
|
|
|
|
scopeInfo := task.EmailScope{
|
|
Type: scope.Int8(),
|
|
RegisterStartTime: req.RegisterStartTime,
|
|
RegisterEndTime: req.RegisterEndTime,
|
|
Recipients: emails,
|
|
Additional: additionalEmails,
|
|
Scheduled: req.Scheduled,
|
|
Interval: req.Interval,
|
|
Limit: req.Limit,
|
|
}
|
|
scopeBytes, _ := scopeInfo.Marshal()
|
|
|
|
taskContent := task.EmailContent{
|
|
Subject: req.Subject,
|
|
Content: req.Content,
|
|
}
|
|
|
|
contentBytes, _ := taskContent.Marshal()
|
|
|
|
var total uint64
|
|
if additionalEmails != nil {
|
|
list := append(emails, additionalEmails...)
|
|
total = uint64(len(tool.RemoveDuplicateElements(list...)))
|
|
} else {
|
|
total = uint64(len(emails))
|
|
}
|
|
|
|
taskInfo := &task.Task{
|
|
Type: task.TypeEmail,
|
|
Scope: string(scopeBytes),
|
|
Content: string(contentBytes),
|
|
Status: 0,
|
|
Errors: "",
|
|
Total: total,
|
|
Current: 0,
|
|
}
|
|
|
|
if err = l.svcCtx.DB.Model(&task.Task{}).Create(taskInfo).Error; err != nil {
|
|
l.Errorf("[CreateBatchSendEmailTask] Failed to create email task: %v", err.Error())
|
|
return xerr.NewErrCode(xerr.DatabaseInsertError)
|
|
}
|
|
// create task
|
|
l.Infof("[CreateBatchSendEmailTask] Successfully created email task with ID: %d", taskInfo.Id)
|
|
|
|
t := asynq.NewTask(types2.ScheduledBatchSendEmail, []byte(strconv.FormatInt(taskInfo.Id, 10)))
|
|
info, err := l.svcCtx.Queue.EnqueueContext(l.ctx, t, asynq.ProcessAt(scheduledAt))
|
|
if err != nil {
|
|
l.Errorf("[CreateBatchSendEmailTask] Failed to enqueue email task: %v", err.Error())
|
|
return xerr.NewErrCode(xerr.QueueEnqueueError)
|
|
}
|
|
l.Infof("[CreateBatchSendEmailTask] Successfully enqueued email task with ID: %s, scheduled at: %s", info.ID, scheduledAt.Format(time.DateTime))
|
|
|
|
return nil
|
|
}
|