From b5a10bc4b76da9705ff5d1bc1edb4a4ebe4dfe13 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 11 Oct 2026 12:48:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=B2=E7=94=A8=E5=8D=A1=E5=AF=86?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=BF=80=E6=B4=BB=E6=94=B9=E4=B8=BA=E5=B9=82?= =?UTF-8?q?=E7=AD=89=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 同卡密+同机器人QQ已有授权 → 返回已激活成功, 不再报已使用 - 已绑定机器码的卡在网页激活 → 明确提示去客户端验证 - 客户端 verify 绑定机器后可正常校验 --- .../Controllers/AuthorizationController.php | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/backend/app/Controllers/AuthorizationController.php b/backend/app/Controllers/AuthorizationController.php index 72b7c88..0959e18 100644 --- a/backend/app/Controllers/AuthorizationController.php +++ b/backend/app/Controllers/AuthorizationController.php @@ -324,6 +324,35 @@ class AuthorizationController extends Controller } if ($card['status'] === 'used') { + // 已使用:同一卡密 + 同一机器人QQ 已有有效授权 → 幂等返回成功(避免客户端重试报已使用) + $already = $db->fetch( + "SELECT * FROM {$db->table('authorizations')} + WHERE card_id = ? AND bot_qq = ? AND status != 'revoked' + ORDER BY id DESC LIMIT 1", + [$card['id'], $botQq] + ); + if ($already) { + $this->success([ + 'id' => (int) $already['id'], + 'card_key' => $cardKey, + 'bot_qq' => $botQq, + 'contact_qq' => $already['contact_qq'], + 'contact_name'=> $already['contact_name'] ?? '', + 'project_id' => (int) $already['project_id'], + 'project_name'=> $already['project_name'] ?? ($card['project_name'] ?? ''), + 'expire_time' => $already['expire_time'], + 'is_renew' => false, + 'already_activated' => true, + ], '卡密已激活'); + return; + } + + // 卡密已被客户端机器码绑定(verify 激活) + $bind = json_decode($card['bind_info'] ?? '{}', true) ?: []; + if (!empty($bind['machine_id'])) { + $this->error('该卡密已在客户端激活绑定机器码,无需在网页重复激活'); + } + $this->error('该卡密已被使用'); }