Develop (#76)

* 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>

pkg/constant/types.go

@@ -1,8 +1,6 @@
 package constant
 
-import (
-	"encoding/json"
-)
+import "encoding/json"
 
 // Used for type cloning conversion
 const (
@@ -46,7 +44,17 @@ type TemporaryOrderInfo struct {
 	InviteCode string `json:"invite_code,omitempty"`
 }
 
-func (t TemporaryOrderInfo) Marshal() string {
-	value, _ := json.Marshal(t)
-	return string(value)
+func (t *TemporaryOrderInfo) Unmarshal(data []byte) error {
+	type Alias TemporaryOrderInfo
+	aux := (*Alias)(t)
+	return json.Unmarshal(data, aux)
+}
+
+func (t *TemporaryOrderInfo) Marshal() ([]byte, error) {
+	type Alias TemporaryOrderInfo
+	return json.Marshal(&struct {
+		*Alias
+	}{
+		Alias: (*Alias)(t),
+	})
 }

pkg/email/worker.go

@@ -3,11 +3,11 @@ package email
 import (
 	"context"
 	"encoding/json"
-	"strings"
 	"time"
 
 	"github.com/perfect-panel/server/internal/model/task"
 	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/tool"
 	"gorm.io/gorm"
 )
 
@@ -50,14 +50,13 @@ func (w *Worker) Start() {
 	limit.Lock()
 	defer limit.Unlock()
 	tx := w.db.WithContext(w.ctx)
-	var taskInfo task.EmailTask
-	if err := tx.Model(&task.EmailTask{}).Where("id = ?", w.id).First(&taskInfo).Error; err != nil {
+	var taskInfo task.Task
+	if err := tx.Model(&task.Task{}).Where("id = ?", w.id).First(&taskInfo).Error; err != nil {
 		logger.Error("Batch Send Email",
 			logger.Field("message", "Failed to find task"),
 			logger.Field("error", err.Error()),
 			logger.Field("task_id", w.id),
 		)
-		w.status = 2 // 设置状态为已完成
 		return
 	}
 	if taskInfo.Status != 0 {
@@ -65,27 +64,50 @@ func (w *Worker) Start() {
 			logger.Field("message", "Task already completed or in progress"),
 			logger.Field("task_id", w.id),
 		)
-		w.status = 2 // 设置状态为已完成
 		return
 	}
-	if taskInfo.Recipients == "" && taskInfo.Additional == "" {
+
+	var scope task.EmailScope
+	if err := json.Unmarshal([]byte(taskInfo.Scope), &scope); err != nil {
+		logger.Error("Batch Send Email",
+			logger.Field("message", "Failed to parse task scope"),
+			logger.Field("error", err.Error()),
+			logger.Field("task_id", w.id),
+		)
+		return
+	}
+
+	if len(scope.Recipients) == 0 && len(scope.Additional) == 0 {
 		logger.Error("Batch Send Email",
 			logger.Field("message", "No recipients or additional emails provided"),
 			logger.Field("task_id", w.id),
 		)
-		w.status = 2 // 设置状态为已完成
 		return
 	}
+
+	var content task.EmailContent
+	if err := json.Unmarshal([]byte(taskInfo.Content), &content); err != nil {
+		logger.Error("Batch Send Email",
+			logger.Field("message", "Failed to parse task content"),
+			logger.Field("error", err.Error()),
+			logger.Field("task_id", w.id),
+		)
+		return
+	}
+
 	w.status = 1 // 设置状态为运行中
 	var recipients []string
 	// 解析收件人
-	if taskInfo.Recipients != "" {
-		recipients = append(recipients, strings.Split(taskInfo.Recipients, "\n")...)
+	if len(scope.Recipients) > 0 {
+		recipients = append(recipients, scope.Recipients...)
 	}
 	// 解析附加收件人
-	if taskInfo.Additional != "" {
-		recipients = append(recipients, strings.Split(taskInfo.Additional, "\n")...)
+	if len(scope.Additional) > 0 {
+		recipients = append(recipients, scope.Additional...)
 	}
+	// 去重和清理空字符串
+	recipients = tool.RemoveDuplicateElements(recipients...)
+
 	if len(recipients) == 0 {
 		logger.Error("Batch Send Email",
 			logger.Field("message", "No valid recipients found"),
@@ -97,10 +119,10 @@ func (w *Worker) Start() {
 
 	// 设置发送间隔时间
 	var intervalTime time.Duration
-	if taskInfo.Interval == 0 {
+	if scope.Interval == 0 {
 		intervalTime = 1 * time.Second
 	} else {
-		intervalTime = time.Duration(taskInfo.Interval) * time.Second
+		intervalTime = time.Duration(scope.Interval) * time.Second
 	}
 
 	var errors []ErrorInfo
@@ -115,12 +137,11 @@ func (w *Worker) Start() {
 			return
 		default:
 		}
-
 		if taskInfo.Status == 0 {
 			taskInfo.Status = 1 // 1 表示任务进行中
 		}
 
-		if err := w.sender.Send([]string{recipient}, taskInfo.Subject, taskInfo.Content); err != nil {
+		if err := w.sender.Send([]string{recipient}, content.Subject, content.Content); err != nil {
 			logger.Error("Batch Send Email",
 				logger.Field("message", "Failed to send email"),
 				logger.Field("error", err.Error()),
@@ -136,19 +157,26 @@ func (w *Worker) Start() {
 			taskInfo.Errors = string(text)
 		}
 		count++
-		if err := tx.Model(&task.EmailTask{}).Save(&taskInfo).Error; err != nil {
+		taskInfo.Current = count
+		if err := tx.Model(&task.Task{}).Where("`id` = ?", taskInfo.Id).Save(&taskInfo).Error; err != nil {
 			logger.Error("Batch Send Email",
 				logger.Field("message", "Failed to update task progress"),
 				logger.Field("error", err.Error()),
 				logger.Field("task_id", w.id),
 			)
+			errors = append(errors, ErrorInfo{
+				Error: err.Error(),
+				Email: recipient,
+				Time:  time.Now().Unix(),
+			})
 			w.status = 2 // 设置状态为已完成
-			return
 		}
 		time.Sleep(intervalTime)
 	}
-	taskInfo.Status = 2 // 设置状态为已完成
-	if err := tx.Model(&task.EmailTask{}).Save(&taskInfo).Error; err != nil {
+	taskInfo.Status = 2 // 2 表示任务已完成
+	w.status = 2        // 设置状态为已完成
+
+	if err := tx.Model(&task.Task{}).Where("`id` = ?", taskInfo.Id).Save(&taskInfo).Error; err != nil {
 		logger.Error("Batch Send Email",
 			logger.Field("message", "Failed to finalize task"),
 			logger.Field("error", err.Error()),

pkg/orm/tool_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/perfect-panel/server/internal/model/task"
+
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 )
@@ -30,7 +31,7 @@ func TestMysql(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to connect to MySQL: %v", err)
 	}
-	err = db.Migrator().AutoMigrate(&task.EmailTask{})
+	err = db.Migrator().AutoMigrate(&task.Task{})
 	if err != nil {
 		t.Fatalf("Failed to auto migrate: %v", err)
 		return

pkg/payment/platform.go

@@ -9,10 +9,12 @@ const (
 	AlipayF2F
 	EPay
 	Balance
-	UNSUPPORTED
+	CryptoSaaS
+	UNSUPPORTED Platform = -1
 )
 
 var platformNames = map[string]Platform{
+	"CryptoSaaS":  CryptoSaaS,
 	"Stripe":      Stripe,
 	"AlipayF2F":   AlipayF2F,
 	"EPay":        EPay,
@@ -68,5 +70,14 @@ func GetSupportedPlatforms() []types.PlatformInfo {
 				"key": "Key",
 			},
 		},
+		{
+			Platform:    CryptoSaaS.String(),
+			PlatformUrl: "https://t.me/CryptoSaaSBot",
+			PlatformFieldDescription: map[string]string{
+				"endpoint":   "API Endpoint",
+				"account_id": "Account ID",
+				"secret_key": "Secret Key",
+			},
+		},
 	}
 }

pkg/tool/slice.go

@@ -59,6 +59,7 @@ func Int64SliceToString(intSlice []int64) string {
 
 // string slice to string
 func StringSliceToString(stringSlice []string) string {
+	stringSlice = RemoveDuplicateElements(stringSlice...)
 	return strings.Join(stringSlice, ",")
 }
 

pkg/tool/time.go

@@ -144,3 +144,10 @@ func DayDiff(startTime, endTime time.Time) int64 {
 	duration := endTime.Sub(startTime)
 	return int64(duration.Hours() / 24) // 转换为整天数
 }
+
+// HourDiff 计算两个时间点之间的小时差
+func HourDiff(startTime, endTime time.Time) int64 {
+	// 计算时间差
+	duration := endTime.Sub(startTime)
+	return int64(duration.Hours()) // 返回小时数，可能包含小数部分
+}