Merge old/master into main, resolving conflicts by preferring old in workflows and removing deprecated adapter files

initialize/init.go

@@ -14,7 +14,6 @@ func StartInitSystemConfig(svc *svc.ServiceContext) {
 	Subscribe(svc)
 	Register(svc)
 	Mobile(svc)
-	TrafficDataToRedis(svc)
 	if !svc.Config.Debug {
 		Telegram(svc)
 	}

initialize/migrate/database/00001_init_schema.up.sql

@@ -91,7 +91,6 @@ CREATE TABLE IF NOT EXISTS `auth_method`
     PRIMARY KEY (`id`),
     UNIQUE KEY `uni_auth_method` (`method`)
 ) ENGINE = InnoDB
-  AUTO_INCREMENT = 9
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci;
 
@@ -305,7 +304,6 @@ CREATE TABLE IF NOT EXISTS `subscribe_type`
     `updated_at` datetime(3)                                                            DEFAULT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
-  AUTO_INCREMENT = 15
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci;
 
@@ -323,7 +321,6 @@ CREATE TABLE IF NOT EXISTS `system`
     UNIQUE KEY `uni_system_key` (`key`),
     KEY `index_key` (`key`)
 ) ENGINE = InnoDB
-  AUTO_INCREMENT = 42
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci;
 
@@ -399,7 +396,6 @@ CREATE TABLE IF NOT EXISTS `user`
     PRIMARY KEY (`id`),
     KEY `idx_referer` (`referer_id`)
 ) ENGINE = InnoDB
-  AUTO_INCREMENT = 2
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci;
 
@@ -416,7 +412,6 @@ CREATE TABLE IF NOT EXISTS `user_auth_methods`
     UNIQUE KEY `idx_auth_identifier` (`auth_identifier`),
     KEY `idx_user_id` (`user_id`)
 ) ENGINE = InnoDB
-  AUTO_INCREMENT = 2
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci;
 

initialize/migrate/database/02100_task.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `email_task`;

initialize/migrate/database/02100_task.up.sql

@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS `email_task`;
+CREATE TABLE `email_task` (
+                               `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+                               `subject` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Email Subject',
+                               `content` text COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Email Content',
+                               `recipient` text COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Email Recipient',
+                               `scope` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Email Scope',
+                               `register_start_time` datetime(3) DEFAULT NULL COMMENT 'Register Start Time',
+                               `register_end_time` datetime(3) DEFAULT NULL COMMENT 'Register End Time',
+                               `additional` text COLLATE utf8mb4_general_ci COMMENT 'Additional Information',
+                               `scheduled` datetime(3) NOT NULL COMMENT 'Scheduled Time',
+                               `interval` tinyint unsigned NOT NULL COMMENT 'Interval in Seconds',
+                               `limit` bigint unsigned NOT NULL COMMENT 'Daily send limit',
+                               `status` tinyint unsigned NOT NULL COMMENT 'Daily Status',
+                               `errors` text COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Errors',
+                               `total` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Total Number',
+                               `current` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Current Number',
+                               `created_at` datetime(3) DEFAULT NULL COMMENT 'Creation Time',
+                               `updated_at` datetime(3) DEFAULT NULL COMMENT 'Update Time',
+                               PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+SET FOREIGN_KEY_CHECKS = 1;

initialize/migrate/database/02101_subscribe_application.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `subscribe_application`;

initialize/migrate/database/02102_subscribe_config.up.sql

@@ -0,0 +1,4 @@
+INSERT IGNORE INTO `system` (`id`, `category`, `key`, `value`, `type`, `desc`, `created_at`, `updated_at`)
+VALUES
+    (42, 'subscribe', 'UserAgentLimit', 'false', 'bool', 'User Agent Limit', '2025-04-22 14:25:16.637', '2025-04-22 14:25:16.637'),
+    (43, 'subscribe', 'UserAgentList', '', 'string', 'User Agent List', '2025-04-22 14:25:16.637','2025-04-22 14:25:16.637');

initialize/migrate/database/02103_delete_application.up.sql

@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS `application`;
+DROP TABLE IF EXISTS `application_version`;
+DROP TABLE IF EXISTS `application_config`;

initialize/migrate/database/02104_system_log.down.sql

@@ -0,0 +1,106 @@
+CREATE TABLE IF NOT EXISTS `user_balance_log`
+(
+    `id`         bigint     NOT NULL AUTO_INCREMENT,
+    `user_id`    bigint     NOT NULL COMMENT 'User ID',
+    `amount`     bigint     NOT NULL COMMENT 'Amount',
+    `type`       tinyint(1) NOT NULL COMMENT 'Type: 1: Recharge 2: Withdraw 3: Payment 4: Refund 5: Reward',
+    `order_id`   bigint      DEFAULT NULL COMMENT 'Order ID',
+    `balance`    bigint     NOT NULL COMMENT 'Balance',
+    `created_at` datetime(3) DEFAULT NULL COMMENT 'Creation Time',
+    PRIMARY KEY (`id`),
+    KEY `idx_user_id` (`user_id`)
+    ) ENGINE = InnoDB
+    DEFAULT CHARSET = utf8mb4
+    COLLATE = utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS `user_commission_log`
+(
+    `id`         bigint NOT NULL AUTO_INCREMENT,
+    `user_id`    bigint NOT NULL COMMENT 'User ID',
+    `order_no`   varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Order No.',
+    `amount`     bigint NOT NULL COMMENT 'Amount',
+    `created_at` datetime(3)                                                   DEFAULT NULL COMMENT 'Creation Time',
+    PRIMARY KEY (`id`),
+    KEY `idx_user_id` (`user_id`)
+    ) ENGINE = InnoDB
+    DEFAULT CHARSET = utf8mb4
+    COLLATE = utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS `user_gift_amount_log`
+(
+    `id`                bigint     NOT NULL AUTO_INCREMENT,
+    `user_id`           bigint     NOT NULL COMMENT 'User ID',
+    `user_subscribe_id` bigint                                                        DEFAULT NULL COMMENT 'Deduction User Subscribe ID',
+    `order_no`          varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Order No.',
+    `type`              tinyint(1) NOT NULL COMMENT 'Type: 1: Increase 2: Reduce',
+    `amount`            bigint     NOT NULL COMMENT 'Amount',
+    `balance`           bigint     NOT NULL COMMENT 'Balance',
+    `remark`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Remark',
+    `created_at`        datetime(3)                                                   DEFAULT NULL COMMENT 'Creation Time',
+    PRIMARY KEY (`id`),
+    KEY `idx_user_id` (`user_id`)
+    ) ENGINE = InnoDB
+    DEFAULT CHARSET = utf8mb4
+    COLLATE = utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS `user_login_log`
+(
+    `id`         bigint                                                        NOT NULL AUTO_INCREMENT,
+    `user_id`    bigint                                                        NOT NULL COMMENT 'User ID',
+    `login_ip`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Login IP',
+    `user_agent` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci         NOT NULL COMMENT 'UserAgent',
+    `success`    tinyint(1)                                                    NOT NULL DEFAULT '0' COMMENT 'Login Success',
+    `created_at` datetime(3)                                                            DEFAULT NULL COMMENT 'Creation Time',
+    PRIMARY KEY (`id`),
+    KEY `idx_user_id` (`user_id`)
+    ) ENGINE = InnoDB
+    DEFAULT CHARSET = utf8mb4
+    COLLATE = utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS `user_reset_subscribe_log`
+(
+    `id`                BIGINT     NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    `user_id`           BIGINT     NOT NULL COMMENT 'User ID',
+    `type`              TINYINT(1) NOT NULL COMMENT 'Type: 1: Auto 2: Advance 3: Paid',
+    `order_no`          VARCHAR(255)        DEFAULT NULL COMMENT 'Order No.',
+    `user_subscribe_id` BIGINT     NOT NULL COMMENT 'User Subscribe ID',
+    `created_at`        DATETIME   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Creation Time',
+    INDEX `idx_user_id` (`user_id`),
+    INDEX `idx_user_subscribe_id` (`user_subscribe_id`)
+    ) ENGINE = InnoDB
+    DEFAULT CHARSET = utf8mb4
+    COLLATE = utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS `user_subscribe_log`
+(
+    `id`                bigint                                                        NOT NULL AUTO_INCREMENT,
+    `user_id`           bigint                                                        NOT NULL COMMENT 'User ID',
+    `user_subscribe_id` bigint                                                        NOT NULL COMMENT 'User Subscribe ID',
+    `token`             varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Token',
+    `ip`                varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'IP',
+    `user_agent`        text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci         NOT NULL COMMENT 'UserAgent',
+    `created_at`        datetime(3) DEFAULT NULL COMMENT 'Creation Time',
+    PRIMARY KEY (`id`),
+    KEY `idx_user_id` (`user_id`),
+    KEY `idx_user_subscribe_id` (`user_subscribe_id`)
+    ) ENGINE = InnoDB
+    DEFAULT CHARSET = utf8mb4
+    COLLATE = utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS `message_log`
+(
+    `id`         bigint                                                        NOT NULL AUTO_INCREMENT,
+    `type`       varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL DEFAULT 'email' COMMENT 'Message Type',
+    `platform`   varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL DEFAULT 'smtp' COMMENT 'Platform',
+    `to`         text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci         NOT NULL COMMENT 'To',
+    `subject`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Subject',
+    `content`    text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'Content',
+    `status`     tinyint(1)                                                    NOT NULL DEFAULT '0' COMMENT 'Status',
+    `created_at` datetime(3)                                                            DEFAULT NULL COMMENT 'Create Time',
+    `updated_at` datetime(3)                                                            DEFAULT NULL COMMENT 'Update Time',
+    PRIMARY KEY (`id`)
+    ) ENGINE = InnoDB
+    DEFAULT CHARSET = utf8mb4
+    COLLATE = utf8mb4_general_ci;
+
+DROP TABLE IF EXISTS `system_logs`;

initialize/migrate/database/02104_system_log.up.sql

@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS `user_balance_log`;
+DROP TABLE IF EXISTS `user_commission_log`;
+DROP TABLE IF EXISTS `user_gift_amount_log`;
+DROP TABLE IF EXISTS `user_login_log`;
+DROP TABLE IF EXISTS `user_reset_subscribe_log`;
+DROP TABLE IF EXISTS `user_subscribe_log`;
+DROP TABLE IF EXISTS `message_log`;
+DROP TABLE IF EXISTS `system_logs`;
+CREATE TABLE `system_logs` (
+   `id` bigint NOT NULL AUTO_INCREMENT,
+   `type` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Log Type: 1: Email Message 2: Mobile Message 3: Subscribe 4: Subscribe Traffic 5: Server Traffic 6: Login 7: Register 8: Balance 9: Commission 10: Reset Subscribe 11: Gift',
+   `date` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Log Date',
+   `object_id` bigint NOT NULL DEFAULT '0' COMMENT 'Object ID',
+   `content` text COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Log Content',
+   `created_at` datetime(3) DEFAULT NULL COMMENT 'Create Time',
+   PRIMARY KEY (`id`),
+   KEY `idx_type` (`type`),
+   KEY `idx_object_id` (`object_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

initialize/migrate/database/02105_node.down.sql

@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS `nodes`;
+DROP TABLE IF EXISTS `servers`;

initialize/migrate/database/02105_node.up.sql

@@ -0,0 +1,28 @@
+CREATE TABLE IF NOT EXISTS `servers` (
+        `id` bigint NOT NULL AUTO_INCREMENT,
+        `name` varchar(100) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Server Name',
+        `country` varchar(128) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Country',
+        `city` varchar(128) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'City',
+        `ratio` decimal(4,2) NOT NULL DEFAULT '0.00' COMMENT 'Traffic Ratio',
+        `address` varchar(100) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Server Address',
+        `sort` bigint NOT NULL DEFAULT '0' COMMENT 'Sort',
+        `protocols` text COLLATE utf8mb4_general_ci COMMENT 'Protocol',
+        `last_reported_at` datetime(3) DEFAULT NULL COMMENT 'Last Reported Time',
+        `created_at` datetime(3) DEFAULT NULL COMMENT 'Creation Time',
+        `updated_at` datetime(3) DEFAULT NULL COMMENT 'Update Time',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS `nodes` (
+     `id` bigint NOT NULL AUTO_INCREMENT,
+     `name` varchar(100) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Node Name',
+     `tags` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Tags',
+     `port` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Connect Port',
+     `address` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Connect Address',
+     `server_id` bigint NOT NULL DEFAULT '0' COMMENT 'Server ID',
+     `protocol` varchar(100) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Protocol',
+     `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'Enabled',
+     `created_at` datetime(3) DEFAULT NULL COMMENT 'Creation Time',
+     `updated_at` datetime(3) DEFAULT NULL COMMENT 'Update Time',
+     PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

initialize/migrate/database/02106_subscribe.down.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `subscribe`
+DROP COLUMN `nodes`,
+  DROP COLUMN `node_tags`,
+  ADD COLUMN `server` VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'Server',
+  ADD COLUMN `server_group` VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'Server Group';

initialize/migrate/database/02106_subscribe.up.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `subscribe`
+ADD COLUMN `nodes` VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'Node IDs',
+ADD COLUMN `node_tags` VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'Node Tags',
+DROP COLUMN `server`,
+DROP COLUMN `server_group`;
+
+DROP TABLE IF EXISTS `server_rule_group`;

initialize/migrate/database/02107_log_setting.up.sql

@@ -0,0 +1,4 @@
+INSERT IGNORE INTO `system` (`category`, `key`, `value`, `type`, `desc`, `created_at`, `updated_at`)
+VALUES
+    ('log', 'AutoClear', 'true', 'bool', 'Auto Clear Log', '2025-04-22 14:25:16.637', '2025-04-22 14:25:16.637'),
+    ('log', 'ClearDays', '7', 'int', 'Clear Days', '2025-04-22 14:25:16.637','2025-04-22 14:25:16.637');

initialize/migrate/database/02108_user_referral.down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `user`
+DROP COLUMN `referral_percentage`,
+DROP COLUMN `only_first_purchase`;

initialize/migrate/database/02108_user_referral.up.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `user`
+    ADD COLUMN `referral_percentage` TINYINT UNSIGNED NOT NULL DEFAULT 0
+      COMMENT 'Referral Percentage'
+      AFTER `commission`,
+    ADD COLUMN `only_first_purchase` TINYINT(1) NOT NULL DEFAULT 1
+      COMMENT 'Only First Purchase'
+      AFTER `referral_percentage`;

initialize/migrate/database/02109_node_sort.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `nodes`
+DROP COLUMN `sort`;

initialize/migrate/database/02109_node_sort.up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `nodes`
+    ADD COLUMN `sort` INT UNSIGNED NOT NULL DEFAULT 0
+    COMMENT 'Sort' AFTER `enabled`;

initialize/migrate/database/02110_traffic_log_index.down.sql

@@ -0,0 +1 @@
+DROP INDEX idx_traffic_log_time_user_sub ON traffic_log;

initialize/migrate/database/02110_traffic_log_index.up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_traffic_log_time_user_sub ON traffic_log (timestamp, user_id, subscribe_id);

initialize/migrate/database/02111_clear_table.down.sql

@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS `subscribe_type`;
+DROP TABLE IF EXISTS `sms`;

initialize/migrate/database/02111_clear_table.up.sql

@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS `subscribe_type`;
+DROP TABLE IF EXISTS `sms`;

initialize/migrate/database/02112_subscribe.up.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `subscribe`
+DROP COLUMN `group_id`,
+ADD COLUMN `language` VARCHAR(255) NOT NULL DEFAULT ''
+  COMMENT 'Language'
+  AFTER `name`;
+
+DROP TABLE IF EXISTS `subscribe_group`;

initialize/migrate/database/02113_task.up.sql

@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS `email_task`;
+CREATE TABLE `task` (
+                        `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+                        `type` tinyint NOT NULL COMMENT 'Task Type',
+                        `scope` text COLLATE utf8mb4_general_ci COMMENT 'Task Scope',
+                        `content` text COLLATE utf8mb4_general_ci COMMENT 'Task Content',
+                        `status` tinyint NOT NULL DEFAULT '0' COMMENT 'Task Status: 0: Pending, 1: In Progress, 2: Completed, 3: Failed',
+                        `errors` text COLLATE utf8mb4_general_ci COMMENT 'Task Errors',
+                        `total` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Total Number',
+                        `current` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'Current Number',
+                        `created_at` datetime(3) DEFAULT NULL COMMENT 'Creation Time',
+                        `updated_at` datetime(3) DEFAULT NULL COMMENT 'Update Time',
+                        PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

initialize/migrate/database/02114_node_config.up.sql

@@ -0,0 +1,8 @@
+INSERT
+IGNORE INTO `system` (`category`, `key`, `value`, `type`, `desc`, `created_at`, `updated_at`)
+VALUE
+    ('server', 'TrafficReportThreshold', '0', 'int', 'Traffic report threshold', '2025-04-22 14:25:16.637','2025-04-22 14:25:16.637'),
+    ('server', 'IPStrategy', '', 'string', 'IP Strategy', '2025-04-22 14:25:16.637','2025-04-22 14:25:16.637'),
+    ('server', 'DNS', '', 'string', 'DNS', '2025-04-22 14:25:16.637','2025-04-22 14:25:16.637'),
+    ('server', 'Block', '', 'string', 'Block', '2025-04-22 14:25:16.637','2025-04-22 14:25:16.637'),
+    ('server', 'Outbound', '', 'string', 'Proxy Outbound', '2025-04-22 14:25:16.637','2025-04-22 14:25:16.637');

initialize/migrate/migrate_test.go

@@ -3,7 +3,10 @@ package migrate
 import (
 	"testing"
 
+	"github.com/perfect-panel/server/internal/model/node"
 	"github.com/perfect-panel/server/pkg/orm"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
 )
 
 func getDSN() string {
@@ -30,3 +33,17 @@ func TestMigrate(t *testing.T) {
 		t.Log("migrate success")
 	}
 }
+func TestMysql(t *testing.T) {
+	db, err := gorm.Open(mysql.New(mysql.Config{
+		DSN: "root:mylove520@tcp(localhost:3306)/vpnboard",
+	}))
+	if err != nil {
+		t.Fatalf("Failed to connect to MySQL: %v", err)
+	}
+	err = db.Migrator().AutoMigrate(&node.Node{})
+	if err != nil {
+		t.Fatalf("Failed to auto migrate: %v", err)
+		return
+	}
+	t.Log("MySQL connection and migration successful")
+}

initialize/node.go

@@ -3,7 +3,6 @@ package initialize
 import (
 	"context"
 	"encoding/json"
-
 	"github.com/perfect-panel/server/pkg/logger"
 
 	"github.com/perfect-panel/server/internal/config"
@@ -19,9 +18,40 @@ func Node(ctx *svc.ServiceContext) {
 	if err != nil {
 		panic(err)
 	}
-	var nodeConfig config.NodeConfig
+	var nodeConfig config.NodeDBConfig
 	tool.SystemConfigSliceReflectToStruct(configs, &nodeConfig)
-	ctx.Config.Node = nodeConfig
+	c := config.NodeConfig{
+		NodeSecret:             nodeConfig.NodeSecret,
+		NodePullInterval:       nodeConfig.NodePullInterval,
+		NodePushInterval:       nodeConfig.NodePushInterval,
+		IPStrategy:             nodeConfig.IPStrategy,
+		TrafficReportThreshold: nodeConfig.TrafficReportThreshold,
+	}
+	if nodeConfig.DNS != "" {
+		var dns []config.NodeDNS
+		err = json.Unmarshal([]byte(nodeConfig.DNS), &dns)
+		if err != nil {
+			logger.Errorf("[Node] Unmarshal DNS config error: %s", err.Error())
+			panic(err)
+		}
+		c.DNS = dns
+	}
+	if nodeConfig.Block != "" {
+		var block []string
+		_ = json.Unmarshal([]byte(nodeConfig.Block), &block)
+		c.Block = tool.RemoveDuplicateElements(block...)
+	}
+	if nodeConfig.Outbound != "" {
+		var outbound []config.NodeOutbound
+		err = json.Unmarshal([]byte(nodeConfig.Outbound), &outbound)
+		if err != nil {
+			logger.Errorf("[Node] Unmarshal Outbound config error: %s", err.Error())
+			panic(err)
+		}
+		c.Outbound = outbound
+	}
+
+	ctx.Config.Node = c
 
 	// Manager initialization
 	if ctx.DB.Model(&system.System{}).Where("`key` = ?", "NodeMultiplierConfig").Find(&system.System{}).RowsAffected == 0 {
@@ -39,7 +69,6 @@ func Node(ctx *svc.ServiceContext) {
 
 	nodeMultiplierData, err := ctx.SystemModel.FindNodeMultiplierConfig(context.Background())
 	if err != nil {
-
 		logger.Error("Get Node Multiplier Config Error: ", logger.Field("error", err.Error()))
 		return
 	}

initialize/statistics.go

@@ -1,57 +0,0 @@
-package initialize
-
-import (
-	"context"
-	"time"
-
-	"github.com/perfect-panel/server/internal/model/cache"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/pkg/logger"
-)
-
-func TrafficDataToRedis(svcCtx *svc.ServiceContext) {
-	ctx := context.Background()
-	// 统计昨天的节点流量数据排行榜前10
-	nodeData, err := svcCtx.TrafficLogModel.TopServersTrafficByDay(ctx, time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day()-1, 0, 0, 0, 0, time.Local), 10)
-	if err != nil {
-		logger.Errorw("统计昨天的流量数据失败", logger.Field("error", err.Error()))
-	}
-	var nodeCacheData []cache.NodeTodayTrafficRank
-	for _, node := range nodeData {
-		serverInfo, err := svcCtx.ServerModel.FindOne(ctx, node.ServerId)
-		if err != nil {
-			logger.Errorw("查询节点信息失败", logger.Field("error", err.Error()))
-			continue
-		}
-		nodeCacheData = append(nodeCacheData, cache.NodeTodayTrafficRank{
-			ID:       node.ServerId,
-			Name:     serverInfo.Name,
-			Upload:   node.Upload,
-			Download: node.Download,
-			Total:    node.Upload + node.Download,
-		})
-	}
-	// 写入缓存
-	if err = svcCtx.NodeCache.UpdateYesterdayNodeTotalTrafficRank(ctx, nodeCacheData); err != nil {
-		logger.Errorw("写入昨天的流量数据到缓存失败", logger.Field("error", err.Error()))
-	}
-	// 统计昨天的用户流量数据排行榜前10
-	userData, err := svcCtx.TrafficLogModel.TopUsersTrafficByDay(ctx, time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day()-1, 0, 0, 0, 0, time.Local), 10)
-	if err != nil {
-		logger.Errorw("统计昨天的流量数据失败", logger.Field("error", err.Error()))
-	}
-	var userCacheData []cache.UserTodayTrafficRank
-	for _, user := range userData {
-		userCacheData = append(userCacheData, cache.UserTodayTrafficRank{
-			SID:      user.SubscribeId,
-			Upload:   user.Upload,
-			Download: user.Download,
-			Total:    user.Upload + user.Download,
-		})
-	}
-	// 写入缓存
-	if err = svcCtx.NodeCache.UpdateYesterdayUserTotalTrafficRank(ctx, userCacheData); err != nil {
-		logger.Errorw("写入昨天的流量数据到缓存失败", logger.Field("error", err.Error()))
-	}
-	logger.Infow("初始化昨天的流量数据到缓存成功")
-}