Merge branch 'old' into main

initialize/config.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/perfect-panel/server/internal/report"
 	"github.com/perfect-panel/server/pkg/logger"
 	"gorm.io/driver/mysql"
 
@@ -35,10 +36,30 @@ func Config(path string) (chan bool, *http.Server) {
 	configPath = path
 	// Create a new Gin instance
 	r := gin.Default()
+	// get server port
+	port := 8080
+	host := "127.0.0.1"
 
+	// check gateway mode
+	if report.IsGatewayMode() {
+		// get free port
+		freePort, err := report.ModulePort()
+		if err != nil {
+			logger.Errorf("get module port error: %s", err.Error())
+			panic(err)
+		}
+		port = freePort
+		// register module
+		err = report.RegisterModule(port)
+		if err != nil {
+			logger.Errorf("register module error: %s", err.Error())
+			panic(err)
+		}
+		logger.Infof("module registered on port %d", port)
+	}
 	// Create a new HTTP server
 	server := &http.Server{
-		Addr:    ":8080",
+		Addr:    fmt.Sprintf("%s:%d", host, port),
 		Handler: r,
 	}
 	// Load templates

initialize/device.go

@@ -0,0 +1,26 @@
+package initialize
+
+import (
+	"context"
+
+	"github.com/perfect-panel/server/pkg/logger"
+
+	"github.com/perfect-panel/server/internal/config"
+	"github.com/perfect-panel/server/internal/model/auth"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/pkg/tool"
+)
+
+func Device(ctx *svc.ServiceContext) {
+	logger.Debug("device config initialization")
+	method, err := ctx.AuthModel.FindOneByMethod(context.Background(), "device")
+	if err != nil {
+		panic(err)
+	}
+	var cfg config.DeviceConfig
+	var deviceConfig auth.DeviceConfig
+	deviceConfig.Unmarshal(method.Config)
+	tool.DeepCopy(&cfg, deviceConfig)
+	cfg.Enable = *method.Enabled
+	ctx.Config.Device = cfg
+}

initialize/init.go

@@ -9,6 +9,7 @@ func StartInitSystemConfig(svc *svc.ServiceContext) {
 	Site(svc)
 	Node(svc)
 	Email(svc)
+	Device(svc)
 	Invite(svc)
 	Verify(svc)
 	Subscribe(svc)

initialize/migrate/database/02115_ads.up.sql

@@ -0,0 +1,20 @@
+-- 只有当 ads 表中不存在 description 字段时才添加
+SET
+@col_exists := (
+    SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'ads'
+      AND COLUMN_NAME = 'description'
+);
+
+SET
+@query := IF(
+    @col_exists = 0,
+    'ALTER TABLE `ads` ADD COLUMN `description` VARCHAR(255) DEFAULT '''' COMMENT ''Description'';',
+    'SELECT "Column `description` already exists"'
+);
+
+PREPARE stmt FROM @query;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;

initialize/migrate/database/02116_user_algo.down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `user`
+DROP COLUMN `algo`,
+    DROP COLUMN `salt`;

initialize/migrate/database/02116_user_algo.up.sql

@@ -0,0 +1,35 @@
+-- 添加 algo 列（如果不存在）
+SET @dbname = DATABASE();
+SET @tablename = 'user';
+SET @colname = 'algo';
+SET @sql = (
+    SELECT IF(
+        COUNT(*) = 0,
+        'ALTER TABLE `user` ADD COLUMN `algo` VARCHAR(20) NOT NULL DEFAULT ''default'' COMMENT ''Encryption Algorithm'' AFTER `password`;',
+        'SELECT "Column `algo` already exists";'
+    )
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = @dbname
+      AND TABLE_NAME = @tablename
+      AND COLUMN_NAME = @colname
+);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 添加 salt 列（如果不存在）
+SET @colname = 'salt';
+SET @sql = (
+    SELECT IF(
+        COUNT(*) = 0,
+        'ALTER TABLE `user` ADD COLUMN `salt` VARCHAR(20) NOT NULL DEFAULT ''default'' COMMENT ''Password Salt'' AFTER `algo`;',
+        'SELECT "Column `salt` already exists";'
+    )
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = @dbname
+      AND TABLE_NAME = @tablename
+      AND COLUMN_NAME = @colname
+);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;

initialize/migrate/database/02117_site_custom_data.down.sql

@@ -0,0 +1,7 @@
+INSERT INTO `system` (`category`, `key`, `value`, `type`, `desc`, `created_at`, `updated_at`)
+SELECT 'site', 'CustomData', '{
+  "kr_website_id": ""
+}', 'string', 'Custom Data', '2025-04-22 14:25:16.637', '2025-10-14 15:47:19.187'
+    WHERE NOT EXISTS (
+    SELECT 1 FROM `system` WHERE `category` = 'site' AND `key` = 'CustomData'
+);

initialize/migrate/database/02117_site_custom_data.up.sql

@@ -0,0 +1,7 @@
+INSERT INTO `system` (`category`, `key`, `value`, `type`, `desc`, `created_at`, `updated_at`)
+SELECT 'site', 'CustomData', '{
+  "kr_website_id": ""
+}', 'string', 'Custom Data', '2025-04-22 14:25:16.637', '2025-10-14 15:47:19.187'
+    WHERE NOT EXISTS (
+    SELECT 1 FROM `system` WHERE `category` = 'site' AND `key` = 'CustomData'
+);

initialize/migrate/database/02118_traffic_log_idx.down.sql

@@ -0,0 +1 @@
+ALTER TABLE traffic_log DROP INDEX idx_timestamp;

initialize/migrate/database/02118_traffic_log_idx.up.sql

@@ -0,0 +1 @@
+ALTER TABLE traffic_log ADD INDEX idx_timestamp (timestamp);

initialize/migrate/database/02119_user_subscribe_note.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `user_subscribe`
+DROP COLUMN `note`;

initialize/migrate/database/02119_user_subscribe_note.up.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `user_subscribe`
+ADD COLUMN `note` VARCHAR(500) NOT NULL DEFAULT ''
+  COMMENT 'User note for subscription'
+  AFTER `status`;

initialize/migrate/database/02120_user_rules.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `user`
+DROP COLUMN IF EXISTS `rules`;

initialize/migrate/database/02120_user_rules.up.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `user`
+    ADD COLUMN `rules` TEXT NULL
+  COMMENT 'User rules for subscription'
+  AFTER `created_at`;

initialize/migrate/database/02121_user_withdrawal.down.sql

@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS `withdrawals`;
+
+DELETE FROM `system`
+WHERE `category` = 'invite'
+  AND `key` = 'WithdrawalMethod';

initialize/migrate/database/02121_user_withdrawal.up.sql

@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS `withdrawals` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'Primary Key',
+    `user_id` BIGINT NOT NULL COMMENT 'User ID',
+    `amount` BIGINT NOT NULL COMMENT 'Withdrawal Amount',
+    `content` TEXT COMMENT 'Withdrawal Content',
+    `status` TINYINT(1) NOT NULL DEFAULT 0 COMMENT 'Withdrawal Status',
+    `reason` VARCHAR(500) NOT NULL DEFAULT '' COMMENT 'Rejection Reason',
+    `created_at` DATETIME NOT NULL COMMENT 'Creation Time',
+    `updated_at` DATETIME NOT NULL COMMENT 'Update Time',
+    PRIMARY KEY (`id`),
+    KEY `idx_user_id` (`user_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+INSERT IGNORE INTO `system` (`category`, `key`, `value`, `type`, `desc`, `created_at`, `updated_at`)
+VALUES
+    ('invite', 'WithdrawalMethod', '', 'string', 'withdrawal method', '2025-04-22 14:25:16.637', '2025-04-22 14:25:16.637');

initialize/version.go

@@ -2,6 +2,7 @@ package initialize
 
 import (
 	"errors"
+	"time"
 
 	"github.com/perfect-panel/server/internal/model/user"
 	"gorm.io/gorm"
@@ -16,13 +17,17 @@ func Migrate(ctx *svc.ServiceContext) {
 	mc := orm.Mysql{
 		Config: ctx.Config.MySQL,
 	}
+	now := time.Now()
 	if err := migrate.Migrate(mc.Dsn()).Up(); err != nil {
 		if !errors.Is(err, migrate.NoChange) {
 			logger.Errorf("[Migrate] Up error: %v", err.Error())
 			panic(err)
 		}
 		logger.Info("[Migrate] database not change")
+	} else {
+		logger.Info("[Migrate] Database change, took " + time.Since(now).String())
 	}
+
 	// if not found admin user
 	err := ctx.DB.Transaction(func(tx *gorm.DB) error {
 		var count int64