diff --git a/backend/app/Controllers/AuthorizationController.php b/backend/app/Controllers/AuthorizationController.php index 0959e18..7a09b70 100644 --- a/backend/app/Controllers/AuthorizationController.php +++ b/backend/app/Controllers/AuthorizationController.php @@ -319,6 +319,25 @@ class AuthorizationController extends Controller $this->error('卡密不存在'); } + // 通用卡(project_id=0):授权归属到请求指定的项目 + $reqProjectId = (int) ($input['project_id'] ?? 0); + $authProjectId = (int) $card['project_id']; + $authProjectName = $card['project_name'] ?? ''; + if ($authProjectId === 0) { + if ($reqProjectId <= 0) { + $this->error('通用卡激活请传入 project_id 指定项目'); + } + $proj = $db->fetch( + "SELECT name FROM {$db->table('projects')} WHERE id = ? AND deleted_at IS NULL", + [$reqProjectId] + ); + if (!$proj) { + $this->error('指定的项目不存在'); + } + $authProjectId = $reqProjectId; + $authProjectName = $proj['name']; + } + if ($card['status'] === 'disabled') { $this->error('该卡密已被禁用'); } @@ -375,8 +394,8 @@ class AuthorizationController extends Controller // 如果当前用户是代理,使用此类卡密需按代理价格扣费 if ($currentRole === 'agent' && $currentUserId > 0) { $cardTypeForCost = $db->fetch( - "SELECT agent_cost FROM {$db->table('card_types')} WHERE id = ? AND project_id = ?", - [$card['card_type_id'], $card['project_id']] + "SELECT agent_cost FROM {$db->table('card_types')} WHERE id = ?", + [$card['card_type_id']] ); if (!$cardTypeForCost || (float) $cardTypeForCost['agent_cost'] <= 0) { @@ -403,10 +422,10 @@ class AuthorizationController extends Controller // 检查当前机器人QQ在同一项目下是否已有授权(未撤销),有则续费 $existingAuth = $db->fetch( "SELECT * FROM {$db->table('authorizations')} - WHERE project_id = ? AND bot_qq = ? AND status != 'revoked' - ORDER BY expire_time IS NULL DESC, expire_time DESC, id DESC - LIMIT 1", - [$card['project_id'], $botQq] + WHERE project_id = ? AND bot_qq = ? AND status != 'revoked' + ORDER BY expire_time IS NULL DESC, expire_time DESC, id DESC + LIMIT 1", + [$authProjectId, $botQq] ); $agentId = (int) ($card['use_user_id'] ?? 0); @@ -459,8 +478,8 @@ class AuthorizationController extends Controller [ $card['id'], $card['card_key'], - $card['project_id'], - $card['project_name'] ?? '', + $authProjectId, + $authProjectName, $botQq, $contactQq, $contactName, @@ -495,8 +514,8 @@ class AuthorizationController extends Controller 'bot_qq' => $botQq, 'contact_qq' => $contactQq, 'contact_name'=> $contactName, - 'project_id' => (int) $card['project_id'], - 'project_name'=> $card['project_name'] ?? '', + 'project_id' => $authProjectId, + 'project_name'=> $authProjectName, 'expire_time' => $newExpireTime, 'is_renew' => true, ], '续费成功'); @@ -513,8 +532,8 @@ class AuthorizationController extends Controller [ $card['id'], $card['card_key'], - $card['project_id'], - $card['project_name'] ?? '', + $authProjectId, + $authProjectName, $botQq, $contactQq, $contactName, @@ -553,8 +572,8 @@ class AuthorizationController extends Controller 'bot_qq' => $botQq, 'contact_qq' => $contactQq, 'contact_name'=> $contactName, - 'project_id' => (int) $card['project_id'], - 'project_name'=> $card['project_name'] ?? '', + 'project_id' => $authProjectId, + 'project_name'=> $authProjectName, 'expire_time' => $expireTime, 'is_renew' => false, ], '授权成功'); diff --git a/backend/app/Controllers/CardController.php b/backend/app/Controllers/CardController.php index c9fa615..68f3d6a 100644 --- a/backend/app/Controllers/CardController.php +++ b/backend/app/Controllers/CardController.php @@ -96,6 +96,7 @@ class CardController extends Controller /** * 批量生成卡密 + * project_id=0 表示全部项目通用卡(仅 admin) */ public function generate(): void { @@ -115,26 +116,42 @@ class CardController extends Controller $remark = $input['remark'] ?? ''; $db = Database::getInstance(); - - // 验证项目存在 - $project = $db->fetch("SELECT id FROM {$db->table('projects')} WHERE id = ? AND deleted_at IS NULL", [$projectId]); - if (!$project) { - $this->error('项目不存在'); - } - - // 验证卡密类型 - $cardType = $db->fetch( - "SELECT * FROM {$db->table('card_types')} WHERE id = ? AND project_id = ?", - [$cardTypeId, $projectId] - ); - if (!$cardType) { - $this->error('卡密类型不存在'); - } - $userId = $this->getUserId(); $userRole = $this->getUserRole(); - // 项目管理员:只能在自己负责的项目中生成卡密 + // 全部项目通用卡(project_id=0)仅超级管理员 + $isUniversal = ($projectId === 0); + if ($isUniversal && $userRole !== 'admin') { + $this->error('通用卡(全部项目)仅超级管理员可生成', 403); + } + + if ($isUniversal) { + // 通用卡:按 id 取任意项目的套餐定义时长与名称 + $cardType = $db->fetch( + "SELECT * FROM {$db->table('card_types')} WHERE id = ?", + [$cardTypeId] + ); + if (!$cardType) { + $this->error('套餐不存在'); + } + } else { + // 验证项目存在 + $project = $db->fetch("SELECT id FROM {$db->table('projects')} WHERE id = ? AND deleted_at IS NULL", [$projectId]); + if (!$project) { + $this->error('项目不存在'); + } + + // 验证卡密类型 + $cardType = $db->fetch( + "SELECT * FROM {$db->table('card_types')} WHERE id = ? AND project_id = ?", + [$cardTypeId, $projectId] + ); + if (!$cardType) { + $this->error('卡密类型不存在'); + } + } + + // 项目管理员:只能在自己负责的项目中生成卡密(通用卡已在上方拦截) if ($userRole === 'project_admin') { $currentUser = $this->getCurrentUser(); $projectIds = $currentUser['project_ids'] ?? []; diff --git a/backend/app/Controllers/PublicController.php b/backend/app/Controllers/PublicController.php index c69704c..ebbb363 100644 --- a/backend/app/Controllers/PublicController.php +++ b/backend/app/Controllers/PublicController.php @@ -639,11 +639,19 @@ class PublicController extends Controller $db = Database::getInstance(); + // 优先匹配本项目卡密;未命中则尝试通用卡(project_id=0)或其他项目兼容 $card = $db->fetch( "SELECT * FROM {$db->table('cards')} WHERE card_key = ? AND project_id = ?", [$cardKey, $projectId] ); + if (!$card) { + $card = $db->fetch( + "SELECT * FROM {$db->table('cards')} WHERE card_key = ? AND project_id = 0", + [$cardKey] + ); + } + if (!$card) { // 尝试查找跨项目卡密(兼容) $card = $db->fetch( diff --git a/backend/app/Core/Validator.php b/backend/app/Core/Validator.php index 08d7ea5..3c1a4ae 100644 --- a/backend/app/Core/Validator.php +++ b/backend/app/Core/Validator.php @@ -68,7 +68,11 @@ class Validator private function ruleInteger(string $field, mixed $value, array $params): void { - if ($value !== null && $value !== '' && !filter_var($value, FILTER_VALIDATE_INT)) { + if ($value === null || $value === '') { + return; + } + // 注意: filter_var(0, FILTER_VALIDATE_INT) === 0,不能用 ! 判断 + if (filter_var($value, FILTER_VALIDATE_INT) === false) { $this->addError($field, "{$field}必须是整数"); } } diff --git a/frontend/src/views/Cards.vue b/frontend/src/views/Cards.vue index fb07607..2e2d2ff 100644 --- a/frontend/src/views/Cards.vue +++ b/frontend/src/views/Cards.vue @@ -56,6 +56,7 @@ + @@ -160,9 +161,14 @@ - + + + - +