Merge remote-tracking branch 'upstream'

# Conflicts:
#	apis/public/subscribe.api
#	initialize/migrate/database/02115_ads.up.sql
#	internal/logic/auth/deviceLoginLogic.go
#	internal/logic/public/subscribe/queryUserSubscribeNodeListLogic.go
#	internal/logic/public/user/unbindDeviceLogic.go
#	internal/types/types.go
#	pkg/tool/encryption_test.go

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

@@ -1,2 +1,20 @@
-ALTER TABLE `ads`
-    ADD COLUMN `description` VARCHAR(255) DEFAULT '' COMMENT 'Description';
+-- 只有当 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);