From e2bcc23308af3a62e3c140b4b35b21a65ff8d2ce Mon Sep 17 00:00:00 2001 From: zhx Date: Sat, 18 Jul 2026 11:24:06 +0800 Subject: [PATCH] fix: fit activity resource ids to production schema --- .../sql/20260717_aslan_game_king.sql | 30 +++++++++---------- .../sql/20260718_aslan_gift_challenge.sql | 26 ++++++++-------- .../sql/20260717_aslan_game_king.sql | 30 +++++++++---------- .../sql/20260718_aslan_gift_challenge.sql | 26 ++++++++-------- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.deploy/prod-deploy/sql/20260717_aslan_game_king.sql b/.deploy/prod-deploy/sql/20260717_aslan_game_king.sql index 03225caf..0a366077 100644 --- a/.deploy/prod-deploy/sql/20260717_aslan_game_king.sql +++ b/.deploy/prod-deploy/sql/20260717_aslan_game_king.sql @@ -221,20 +221,20 @@ CREATE TABLE IF NOT EXISTS aslan_game_king_delivery_item ( -- the Operations directory. They do not grant the campaign page to unrelated roles. INSERT INTO sys_resource (id, resource_name, mapping, method, auth_type, perm, update_time) VALUES - ('activity:game-king:list', '游戏王活动列表', '/activity/game-king/list', 'GET', 3, 'activity:game-king:list', NOW()), - ('activity:game-king:detail', '游戏王活动详情', '/activity/game-king/detail/**', 'GET', 3, 'activity:game-king:detail', NOW()), - ('activity:game-king:save', '保存游戏王活动', '/activity/game-king/save', 'POST', 3, 'activity:game-king:save', NOW()), - ('activity:game-king:enable', '启停游戏王活动', '/activity/game-king/enable/**', 'PUT', 3, 'activity:game-king:enable', NOW()), - ('activity:game-king:prizes:get', '游戏王奖品列表', '/activity/game-king/prizes/**', 'GET', 3, 'activity:game-king:prizes:get', NOW()), - ('activity:game-king:prizes:save', '保存游戏王奖品', '/activity/game-king/prizes/**', 'PUT', 3, 'activity:game-king:prizes:save', NOW()), - ('activity:game-king:rank:get', '游戏王排名奖励', '/activity/game-king/rank-rewards/**', 'GET', 3, 'activity:game-king:rank:get', NOW()), - ('activity:game-king:rank:save', '保存游戏王排名奖励', '/activity/game-king/rank-rewards/**', 'PUT', 3, 'activity:game-king:rank:save', NOW()), - ('activity:game-king:draw:get', '游戏王抽奖记录', '/activity/game-king/draw-records/**', 'GET', 3, 'activity:game-king:draw:get', NOW()), - ('activity:game-king:draw:retry', '重试游戏王抽奖奖励', '/activity/game-king/draw/retry/**', 'POST', 3, 'activity:game-king:draw:retry', NOW()), - ('activity:game-king:delivery:resolve', '核账处理游戏王未知奖励', '/activity/game-king/delivery-item/resolve/**', 'POST', 3, 'activity:game-king:delivery:resolve', NOW()), - ('activity:game-king:settlement:get', '游戏王结算记录', '/activity/game-king/settlement-records/**', 'GET', 3, 'activity:game-king:settlement:get', NOW()), - ('activity:game-king:settlement:run', '执行游戏王结算', '/activity/game-king/settlement/**', 'POST', 3, 'activity:game-king:settlement:run', NOW()), - ('activity:game-king:backfill', '补算游戏王消费', '/activity/game-king/backfill/**', 'POST', 3, 'activity:game-king:backfill', NOW()) + ('activity:gk:list', '游戏王活动列表', '/activity/game-king/list', 'GET', 3, 'activity:game-king:list', NOW()), + ('activity:gk:detail', '游戏王活动详情', '/activity/game-king/detail/**', 'GET', 3, 'activity:game-king:detail', NOW()), + ('activity:gk:save', '保存游戏王活动', '/activity/game-king/save', 'POST', 3, 'activity:game-king:save', NOW()), + ('activity:gk:enable', '启停游戏王活动', '/activity/game-king/enable/**', 'PUT', 3, 'activity:game-king:enable', NOW()), + ('activity:gk:prizes:get', '游戏王奖品列表', '/activity/game-king/prizes/**', 'GET', 3, 'activity:game-king:prizes:get', NOW()), + ('activity:gk:prizes:save', '保存游戏王奖品', '/activity/game-king/prizes/**', 'PUT', 3, 'activity:game-king:prizes:save', NOW()), + ('activity:gk:rank:get', '游戏王排名奖励', '/activity/game-king/rank-rewards/**', 'GET', 3, 'activity:game-king:rank:get', NOW()), + ('activity:gk:rank:save', '保存游戏王排名奖励', '/activity/game-king/rank-rewards/**', 'PUT', 3, 'activity:game-king:rank:save', NOW()), + ('activity:gk:draw:get', '游戏王抽奖记录', '/activity/game-king/draw-records/**', 'GET', 3, 'activity:game-king:draw:get', NOW()), + ('activity:gk:draw:retry', '重试游戏王抽奖奖励', '/activity/game-king/draw/retry/**', 'POST', 3, 'activity:game-king:draw:retry', NOW()), + ('activity:gk:delivery:resolve', '核账处理游戏王未知奖励', '/activity/game-king/delivery-item/resolve/**', 'POST', 3, 'activity:game-king:delivery:resolve', NOW()), + ('activity:gk:settlement:get', '游戏王结算记录', '/activity/game-king/settlement-records/**', 'GET', 3, 'activity:game-king:settlement:get', NOW()), + ('activity:gk:settlement:run', '执行游戏王结算', '/activity/game-king/settlement/**', 'POST', 3, 'activity:game-king:settlement:run', NOW()), + ('activity:gk:backfill', '补算游戏王消费', '/activity/game-king/backfill/**', 'POST', 3, 'activity:game-king:backfill', NOW()) ON DUPLICATE KEY UPDATE resource_name = VALUES(resource_name), mapping = VALUES(mapping), @@ -292,7 +292,7 @@ WHERE campaign_menu.alias = 'ActivityGameKing'; INSERT INTO sys_menu_resource (menu_id, resource_id) SELECT menu.id, resource.id FROM sys_menu menu -JOIN sys_resource resource ON resource.id LIKE 'activity:game-king:%' +JOIN sys_resource resource ON resource.id LIKE 'activity:gk:%' LEFT JOIN sys_menu_resource existing ON existing.menu_id = menu.id AND existing.resource_id = resource.id WHERE menu.alias = 'ActivityGameKing' diff --git a/.deploy/prod-deploy/sql/20260718_aslan_gift_challenge.sql b/.deploy/prod-deploy/sql/20260718_aslan_gift_challenge.sql index b76b3909..849f363b 100644 --- a/.deploy/prod-deploy/sql/20260718_aslan_gift_challenge.sql +++ b/.deploy/prod-deploy/sql/20260718_aslan_gift_challenge.sql @@ -276,18 +276,18 @@ CREATE TABLE IF NOT EXISTS aslan_gift_challenge_delivery_item ( -- RBAC is idempotent. The page is inherited only by roles that already own Operations. INSERT INTO sys_resource (id, resource_name, mapping, method, auth_type, perm, update_time) VALUES - ('activity:gift-challenge:list', '礼物挑战活动列表', '/activity/gift-challenge/list', 'GET', 3, 'activity:gift-challenge:list', NOW()), - ('activity:gift-challenge:detail', '礼物挑战活动详情', '/activity/gift-challenge/detail/**', 'GET', 3, 'activity:gift-challenge:detail', NOW()), - ('activity:gift-challenge:save', '保存礼物挑战活动', '/activity/gift-challenge/save', 'POST', 3, 'activity:gift-challenge:save', NOW()), - ('activity:gift-challenge:enable', '启停礼物挑战活动', '/activity/gift-challenge/enable/**', 'PUT', 3, 'activity:gift-challenge:enable', NOW()), - ('activity:gift-challenge:tasks:get', '礼物挑战任务列表', '/activity/gift-challenge/tasks/**', 'GET', 3, 'activity:gift-challenge:tasks:get', NOW()), - ('activity:gift-challenge:tasks:save', '保存礼物挑战任务', '/activity/gift-challenge/tasks/**', 'PUT', 3, 'activity:gift-challenge:tasks:save', NOW()), - ('activity:gift-challenge:rank:get', '礼物挑战排名奖励', '/activity/gift-challenge/rank-rewards/**', 'GET', 3, 'activity:gift-challenge:rank:get', NOW()), - ('activity:gift-challenge:rank:save', '保存礼物挑战排名奖励', '/activity/gift-challenge/rank-rewards/**', 'PUT', 3, 'activity:gift-challenge:rank:save', NOW()), - ('activity:gift-challenge:ranking', '查看礼物挑战榜单', '/activity/gift-challenge/ranking/**', 'GET', 3, 'activity:gift-challenge:ranking', NOW()), - ('activity:gift-challenge:settlement:get', '礼物挑战结算记录', '/activity/gift-challenge/settlement-records/**', 'GET', 3, 'activity:gift-challenge:settlement:get', NOW()), - ('activity:gift-challenge:settlement:run', '执行礼物挑战结算', '/activity/gift-challenge/settlement/**', 'POST', 3, 'activity:gift-challenge:settlement:run', NOW()), - ('activity:gift-challenge:delivery:resolve', '核账处理礼物挑战未知奖励', '/activity/gift-challenge/delivery-item/resolve/**', 'POST', 3, 'activity:gift-challenge:delivery:resolve', NOW()) + ('activity:gc:list', '礼物挑战活动列表', '/activity/gift-challenge/list', 'GET', 3, 'activity:gift-challenge:list', NOW()), + ('activity:gc:detail', '礼物挑战活动详情', '/activity/gift-challenge/detail/**', 'GET', 3, 'activity:gift-challenge:detail', NOW()), + ('activity:gc:save', '保存礼物挑战活动', '/activity/gift-challenge/save', 'POST', 3, 'activity:gift-challenge:save', NOW()), + ('activity:gc:enable', '启停礼物挑战活动', '/activity/gift-challenge/enable/**', 'PUT', 3, 'activity:gift-challenge:enable', NOW()), + ('activity:gc:tasks:get', '礼物挑战任务列表', '/activity/gift-challenge/tasks/**', 'GET', 3, 'activity:gift-challenge:tasks:get', NOW()), + ('activity:gc:tasks:save', '保存礼物挑战任务', '/activity/gift-challenge/tasks/**', 'PUT', 3, 'activity:gift-challenge:tasks:save', NOW()), + ('activity:gc:rank:get', '礼物挑战排名奖励', '/activity/gift-challenge/rank-rewards/**', 'GET', 3, 'activity:gift-challenge:rank:get', NOW()), + ('activity:gc:rank:save', '保存礼物挑战排名奖励', '/activity/gift-challenge/rank-rewards/**', 'PUT', 3, 'activity:gift-challenge:rank:save', NOW()), + ('activity:gc:ranking', '查看礼物挑战榜单', '/activity/gift-challenge/ranking/**', 'GET', 3, 'activity:gift-challenge:ranking', NOW()), + ('activity:gc:settlement:get', '礼物挑战结算记录', '/activity/gift-challenge/settlement-records/**', 'GET', 3, 'activity:gift-challenge:settlement:get', NOW()), + ('activity:gc:settlement:run', '执行礼物挑战结算', '/activity/gift-challenge/settlement/**', 'POST', 3, 'activity:gift-challenge:settlement:run', NOW()), + ('activity:gc:delivery:resolve', '核账处理礼物挑战未知奖励', '/activity/gift-challenge/delivery-item/resolve/**', 'POST', 3, 'activity:gift-challenge:delivery:resolve', NOW()) ON DUPLICATE KEY UPDATE resource_name = VALUES(resource_name), mapping = VALUES(mapping), @@ -345,7 +345,7 @@ WHERE campaign_menu.alias = 'ActivityGiftChallenge'; INSERT INTO sys_menu_resource (menu_id, resource_id) SELECT menu.id, resource.id FROM sys_menu menu -JOIN sys_resource resource ON resource.id LIKE 'activity:gift-challenge:%' +JOIN sys_resource resource ON resource.id LIKE 'activity:gc:%' LEFT JOIN sys_menu_resource existing ON existing.menu_id = menu.id AND existing.resource_id = resource.id WHERE menu.alias = 'ActivityGiftChallenge' diff --git a/.deploy/test-deploy/sql/20260717_aslan_game_king.sql b/.deploy/test-deploy/sql/20260717_aslan_game_king.sql index 03225caf..0a366077 100644 --- a/.deploy/test-deploy/sql/20260717_aslan_game_king.sql +++ b/.deploy/test-deploy/sql/20260717_aslan_game_king.sql @@ -221,20 +221,20 @@ CREATE TABLE IF NOT EXISTS aslan_game_king_delivery_item ( -- the Operations directory. They do not grant the campaign page to unrelated roles. INSERT INTO sys_resource (id, resource_name, mapping, method, auth_type, perm, update_time) VALUES - ('activity:game-king:list', '游戏王活动列表', '/activity/game-king/list', 'GET', 3, 'activity:game-king:list', NOW()), - ('activity:game-king:detail', '游戏王活动详情', '/activity/game-king/detail/**', 'GET', 3, 'activity:game-king:detail', NOW()), - ('activity:game-king:save', '保存游戏王活动', '/activity/game-king/save', 'POST', 3, 'activity:game-king:save', NOW()), - ('activity:game-king:enable', '启停游戏王活动', '/activity/game-king/enable/**', 'PUT', 3, 'activity:game-king:enable', NOW()), - ('activity:game-king:prizes:get', '游戏王奖品列表', '/activity/game-king/prizes/**', 'GET', 3, 'activity:game-king:prizes:get', NOW()), - ('activity:game-king:prizes:save', '保存游戏王奖品', '/activity/game-king/prizes/**', 'PUT', 3, 'activity:game-king:prizes:save', NOW()), - ('activity:game-king:rank:get', '游戏王排名奖励', '/activity/game-king/rank-rewards/**', 'GET', 3, 'activity:game-king:rank:get', NOW()), - ('activity:game-king:rank:save', '保存游戏王排名奖励', '/activity/game-king/rank-rewards/**', 'PUT', 3, 'activity:game-king:rank:save', NOW()), - ('activity:game-king:draw:get', '游戏王抽奖记录', '/activity/game-king/draw-records/**', 'GET', 3, 'activity:game-king:draw:get', NOW()), - ('activity:game-king:draw:retry', '重试游戏王抽奖奖励', '/activity/game-king/draw/retry/**', 'POST', 3, 'activity:game-king:draw:retry', NOW()), - ('activity:game-king:delivery:resolve', '核账处理游戏王未知奖励', '/activity/game-king/delivery-item/resolve/**', 'POST', 3, 'activity:game-king:delivery:resolve', NOW()), - ('activity:game-king:settlement:get', '游戏王结算记录', '/activity/game-king/settlement-records/**', 'GET', 3, 'activity:game-king:settlement:get', NOW()), - ('activity:game-king:settlement:run', '执行游戏王结算', '/activity/game-king/settlement/**', 'POST', 3, 'activity:game-king:settlement:run', NOW()), - ('activity:game-king:backfill', '补算游戏王消费', '/activity/game-king/backfill/**', 'POST', 3, 'activity:game-king:backfill', NOW()) + ('activity:gk:list', '游戏王活动列表', '/activity/game-king/list', 'GET', 3, 'activity:game-king:list', NOW()), + ('activity:gk:detail', '游戏王活动详情', '/activity/game-king/detail/**', 'GET', 3, 'activity:game-king:detail', NOW()), + ('activity:gk:save', '保存游戏王活动', '/activity/game-king/save', 'POST', 3, 'activity:game-king:save', NOW()), + ('activity:gk:enable', '启停游戏王活动', '/activity/game-king/enable/**', 'PUT', 3, 'activity:game-king:enable', NOW()), + ('activity:gk:prizes:get', '游戏王奖品列表', '/activity/game-king/prizes/**', 'GET', 3, 'activity:game-king:prizes:get', NOW()), + ('activity:gk:prizes:save', '保存游戏王奖品', '/activity/game-king/prizes/**', 'PUT', 3, 'activity:game-king:prizes:save', NOW()), + ('activity:gk:rank:get', '游戏王排名奖励', '/activity/game-king/rank-rewards/**', 'GET', 3, 'activity:game-king:rank:get', NOW()), + ('activity:gk:rank:save', '保存游戏王排名奖励', '/activity/game-king/rank-rewards/**', 'PUT', 3, 'activity:game-king:rank:save', NOW()), + ('activity:gk:draw:get', '游戏王抽奖记录', '/activity/game-king/draw-records/**', 'GET', 3, 'activity:game-king:draw:get', NOW()), + ('activity:gk:draw:retry', '重试游戏王抽奖奖励', '/activity/game-king/draw/retry/**', 'POST', 3, 'activity:game-king:draw:retry', NOW()), + ('activity:gk:delivery:resolve', '核账处理游戏王未知奖励', '/activity/game-king/delivery-item/resolve/**', 'POST', 3, 'activity:game-king:delivery:resolve', NOW()), + ('activity:gk:settlement:get', '游戏王结算记录', '/activity/game-king/settlement-records/**', 'GET', 3, 'activity:game-king:settlement:get', NOW()), + ('activity:gk:settlement:run', '执行游戏王结算', '/activity/game-king/settlement/**', 'POST', 3, 'activity:game-king:settlement:run', NOW()), + ('activity:gk:backfill', '补算游戏王消费', '/activity/game-king/backfill/**', 'POST', 3, 'activity:game-king:backfill', NOW()) ON DUPLICATE KEY UPDATE resource_name = VALUES(resource_name), mapping = VALUES(mapping), @@ -292,7 +292,7 @@ WHERE campaign_menu.alias = 'ActivityGameKing'; INSERT INTO sys_menu_resource (menu_id, resource_id) SELECT menu.id, resource.id FROM sys_menu menu -JOIN sys_resource resource ON resource.id LIKE 'activity:game-king:%' +JOIN sys_resource resource ON resource.id LIKE 'activity:gk:%' LEFT JOIN sys_menu_resource existing ON existing.menu_id = menu.id AND existing.resource_id = resource.id WHERE menu.alias = 'ActivityGameKing' diff --git a/.deploy/test-deploy/sql/20260718_aslan_gift_challenge.sql b/.deploy/test-deploy/sql/20260718_aslan_gift_challenge.sql index b76b3909..849f363b 100644 --- a/.deploy/test-deploy/sql/20260718_aslan_gift_challenge.sql +++ b/.deploy/test-deploy/sql/20260718_aslan_gift_challenge.sql @@ -276,18 +276,18 @@ CREATE TABLE IF NOT EXISTS aslan_gift_challenge_delivery_item ( -- RBAC is idempotent. The page is inherited only by roles that already own Operations. INSERT INTO sys_resource (id, resource_name, mapping, method, auth_type, perm, update_time) VALUES - ('activity:gift-challenge:list', '礼物挑战活动列表', '/activity/gift-challenge/list', 'GET', 3, 'activity:gift-challenge:list', NOW()), - ('activity:gift-challenge:detail', '礼物挑战活动详情', '/activity/gift-challenge/detail/**', 'GET', 3, 'activity:gift-challenge:detail', NOW()), - ('activity:gift-challenge:save', '保存礼物挑战活动', '/activity/gift-challenge/save', 'POST', 3, 'activity:gift-challenge:save', NOW()), - ('activity:gift-challenge:enable', '启停礼物挑战活动', '/activity/gift-challenge/enable/**', 'PUT', 3, 'activity:gift-challenge:enable', NOW()), - ('activity:gift-challenge:tasks:get', '礼物挑战任务列表', '/activity/gift-challenge/tasks/**', 'GET', 3, 'activity:gift-challenge:tasks:get', NOW()), - ('activity:gift-challenge:tasks:save', '保存礼物挑战任务', '/activity/gift-challenge/tasks/**', 'PUT', 3, 'activity:gift-challenge:tasks:save', NOW()), - ('activity:gift-challenge:rank:get', '礼物挑战排名奖励', '/activity/gift-challenge/rank-rewards/**', 'GET', 3, 'activity:gift-challenge:rank:get', NOW()), - ('activity:gift-challenge:rank:save', '保存礼物挑战排名奖励', '/activity/gift-challenge/rank-rewards/**', 'PUT', 3, 'activity:gift-challenge:rank:save', NOW()), - ('activity:gift-challenge:ranking', '查看礼物挑战榜单', '/activity/gift-challenge/ranking/**', 'GET', 3, 'activity:gift-challenge:ranking', NOW()), - ('activity:gift-challenge:settlement:get', '礼物挑战结算记录', '/activity/gift-challenge/settlement-records/**', 'GET', 3, 'activity:gift-challenge:settlement:get', NOW()), - ('activity:gift-challenge:settlement:run', '执行礼物挑战结算', '/activity/gift-challenge/settlement/**', 'POST', 3, 'activity:gift-challenge:settlement:run', NOW()), - ('activity:gift-challenge:delivery:resolve', '核账处理礼物挑战未知奖励', '/activity/gift-challenge/delivery-item/resolve/**', 'POST', 3, 'activity:gift-challenge:delivery:resolve', NOW()) + ('activity:gc:list', '礼物挑战活动列表', '/activity/gift-challenge/list', 'GET', 3, 'activity:gift-challenge:list', NOW()), + ('activity:gc:detail', '礼物挑战活动详情', '/activity/gift-challenge/detail/**', 'GET', 3, 'activity:gift-challenge:detail', NOW()), + ('activity:gc:save', '保存礼物挑战活动', '/activity/gift-challenge/save', 'POST', 3, 'activity:gift-challenge:save', NOW()), + ('activity:gc:enable', '启停礼物挑战活动', '/activity/gift-challenge/enable/**', 'PUT', 3, 'activity:gift-challenge:enable', NOW()), + ('activity:gc:tasks:get', '礼物挑战任务列表', '/activity/gift-challenge/tasks/**', 'GET', 3, 'activity:gift-challenge:tasks:get', NOW()), + ('activity:gc:tasks:save', '保存礼物挑战任务', '/activity/gift-challenge/tasks/**', 'PUT', 3, 'activity:gift-challenge:tasks:save', NOW()), + ('activity:gc:rank:get', '礼物挑战排名奖励', '/activity/gift-challenge/rank-rewards/**', 'GET', 3, 'activity:gift-challenge:rank:get', NOW()), + ('activity:gc:rank:save', '保存礼物挑战排名奖励', '/activity/gift-challenge/rank-rewards/**', 'PUT', 3, 'activity:gift-challenge:rank:save', NOW()), + ('activity:gc:ranking', '查看礼物挑战榜单', '/activity/gift-challenge/ranking/**', 'GET', 3, 'activity:gift-challenge:ranking', NOW()), + ('activity:gc:settlement:get', '礼物挑战结算记录', '/activity/gift-challenge/settlement-records/**', 'GET', 3, 'activity:gift-challenge:settlement:get', NOW()), + ('activity:gc:settlement:run', '执行礼物挑战结算', '/activity/gift-challenge/settlement/**', 'POST', 3, 'activity:gift-challenge:settlement:run', NOW()), + ('activity:gc:delivery:resolve', '核账处理礼物挑战未知奖励', '/activity/gift-challenge/delivery-item/resolve/**', 'POST', 3, 'activity:gift-challenge:delivery:resolve', NOW()) ON DUPLICATE KEY UPDATE resource_name = VALUES(resource_name), mapping = VALUES(mapping), @@ -345,7 +345,7 @@ WHERE campaign_menu.alias = 'ActivityGiftChallenge'; INSERT INTO sys_menu_resource (menu_id, resource_id) SELECT menu.id, resource.id FROM sys_menu menu -JOIN sys_resource resource ON resource.id LIKE 'activity:gift-challenge:%' +JOIN sys_resource resource ON resource.id LIKE 'activity:gc:%' LEFT JOIN sys_menu_resource existing ON existing.menu_id = menu.id AND existing.resource_id = resource.id WHERE menu.alias = 'ActivityGiftChallenge'