diff --git a/.gitignore b/.gitignore index 0c7c6d9..671caa3 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ /backend/tmp_*.php /backend/test_admin.txt /backend/public/uploads/avatars/* +/backend/public/uploads/packages/* +!/backend/public/uploads/packages/.gitkeep /frontend/vite.config.js.timestamp-* # 系统文件 diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..f978af4 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,61 @@ +# 更新日志 + +## v1.1.0 (2026-10-08) + +### 新增功能:安装统计与版本推送 + +#### 安装统计 +- 新增 `ca_installations` 安装记录表:每次安装独立计数(含已删除) +- 统计维度:总安装次数、存活安装、已删除、今日/本周新增、最后上线时间 +- 支持按项目汇总查看安装情况 +- 管理端页面:`安装统计`(列表 / 筛选 / 详情 / 软删除 / 恢复 / 批量删除 / 导出 CSV) +- 权限:超级管理员、项目管理员(限绑定项目)、代理(限本人卡密相关) + +#### 版本推送(安装包分发) +- 新增 `ca_project_versions` 项目版本表 +- 管理端上传安装包(zip/tar/gz/7z/exe/dmg/apk/msi/pkg/rar/bin,≤200MB) +- 支持更新说明、设为最新版本、禁用/启用、删除版本及文件 +- 管理端页面:`版本推送` +- 权限:发布/修改/删除仅超级管理员与项目管理员;**代理仅只读** + +#### 强制推送 +- 版本可开启 `is_force` 或设置 `min_client_version` +- 客户端检查更新时返回 `update_required=true`,提示强制更新 +- **仅客户端提示,不阻断** `verify` 授权结果 + +#### 客户端接口(API Key) +| 接口 | 说明 | +|------|------| +| `POST /api/public/installations/check-update` | 检查更新 + 登记安装/更新在线时间 | +| `POST /api/public/installations/heartbeat` | 轻量心跳,更新 `last_online_at` | +| `POST /api/public/verify` | 成功响应附带更新字段,并同步安装记录 | + +`check-update` / `verify` 成功时返回:`update_available`、`update_required`、`latest_version`、`download_url`、`file_size`、`checksum`、`changelog`、`is_force`、`install_id` 等。 + +#### 管理端接口(JWT) +| 方法 | 路径 | 说明 | +|------|------|------| +| GET | `/api/installations` | 安装列表 | +| GET | `/api/installations/stats` | 安装统计(含已删除) | +| GET | `/api/installations/export` | 导出 CSV | +| DELETE | `/api/installations/{id}` | 标记已删除 | +| POST | `/api/installations/{id}/restore` | 恢复安装 | +| GET | `/api/projects/{projectId}/versions` | 版本列表 | +| POST | `/api/projects/{projectId}/versions` | 发布版本(multipart) | +| PUT | `/api/versions/{id}/force` | 强制推送开关 | +| PUT | `/api/versions/{id}/latest` | 设为最新 | +| DELETE | `/api/versions/{id}` | 删除版本 | + +#### 文档 +- README 补充安装统计与版本推送 API 文档 +- 公开文档页 `/docs` 增加功能介绍、后台使用方法、客户端对接说明与 CURL 示例 + +#### 数据库升级 +- 已有库执行:`backend/database/migrations/20261008_add_installations_and_versions.sql` +- 全新安装:`backend/database/schema.sql` 已包含新表 + +--- + +## v1.0.0 + +初始版本:卡密授权、项目/套餐/卡密管理、代理分销、在线支付商城、授权验证 API、黑名单、SMTP 到期提醒、Docker 部署。 diff --git a/README.md b/README.md index 5446322..07c78a3 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,13 @@ 一个轻量级的卡密(激活码)+ 机器授权管理系统,支持多项目管理、代理分销、在线支付购买,适用于软件授权、会员激活等场景。 +> **当前版本:v1.1.0** · 更新日志见 [CHANGELOG.md](./CHANGELOG.md) + ## 技术栈 | 层 | 技术 | |---|---| -| 后端 | PHP 7.4+ 自研框架(Router + Middleware + Controller) | +| 后端 | PHP 8.1+ 自研框架(Router + Middleware + Controller) | | 数据库 | MySQL 8.0+ | | 前端 | Vue 3 + Element Plus + Pinia + ECharts | | 构建 | Vite | @@ -26,6 +28,8 @@ - 代理余额体系(充值记录、扣费追溯、额度查询) - 订单管理(代客手动完成 / 手动确认) - 在线购买商城(公开页面,支持 epay/codepay 支付回调) +- **安装统计**:项目安装次数、存活/已删除、最后上线时间(v1.1.0) +- **版本推送**:上传安装包并推送客户端下载,支持强制更新提示(v1.1.0) - 黑名单系统(机器码/IP 封禁,可配置封禁策略) - SMTP 邮件通知(授权快到期自动发送提醒到联系人 QQ 邮箱) - 仪表盘统计图表(收入趋势、授权趋势、套餐销售占比) @@ -37,6 +41,9 @@ - `/agent/login` 代理登录 - `/agent/register` 代理注册 - `/shop` 自助购买(公开页面) +- `/docs` 系统介绍与使用文档(含安装统计/版本推送说明) +- `/installations` 安装统计(v1.1.0) +- `/project-versions` 版本推送(v1.1.0) ## 快速开始 @@ -276,7 +283,87 @@ Content-Type: application/json } ``` -**响应格式同 1.2。** +**响应格式同 1.2,并额外附带更新提示字段(成功时):** + +```json +{ + "code": 200, + "data": { + "valid": true, + "message": "授权有效", + "type": "月卡", + "duration_days": 30, + "expire_time": "2026-11-01 12:00:00", + "is_permanent": false, + "remaining_days": 24, + "update_available": true, + "update_required": false, + "current_version": "1.0.0", + "latest_version": "1.2.0", + "version": "1.2.0", + "download_url": "/uploads/packages/1/pkg_1_xxx.zip", + "file_size": 10485760, + "checksum": "sha256...", + "changelog": "修复若干问题", + "min_client_version": "", + "is_force": 0, + "install_id": 123 + } +} +``` + +> 说明:`update_required` 仅作客户端强制更新提示,不阻断授权结果。 + +### 1.3.1 安装检查更新 / 心跳(客户端) + +``` +POST /api/public/installations/check-update +X-Api-Key: <项目的 API Key> +Content-Type: application/json + +{ + "machine_id": "设备唯一指纹", + "client_version": "1.0.0", // 可选 + "card_key": "CA-XXXX-XXXX", // 可选 + "device_info": "Windows 11" // 可选 +} +``` + +**响应:** + +```json +{ + "code": 200, + "data": { + "update_available": true, + "update_required": true, + "current_version": "1.0.0", + "latest_version": "2.0.0", + "version": "2.0.0", + "download_url": "/uploads/packages/1/pkg_1_xxx.zip", + "file_size": 20971520, + "checksum": "sha256...", + "changelog": "重大更新", + "min_client_version": "1.1.0", + "is_force": 1, + "install_id": 123 + } +} +``` + +``` +POST /api/public/installations/heartbeat +X-Api-Key: <项目的 API Key> +Content-Type: application/json + +{ "machine_id": "设备唯一指纹", "client_version": "1.0.0", "card_key": "..." } +``` + +**客户端接入建议:** +- 启动/周期心跳时调用 `check-update` +- `update_available=true` 且 `update_required=false` → 弹出「发现新版本,是否下载?」 +- `update_required=true` → 强制更新提示(不可关闭),引导下载 `download_url` +- 授权验证 `verify` 时也会同步更新安装记录的 `last_online_at`,并附带相同更新字段 ### 1.4 获取项目列表(商城用) @@ -445,6 +532,87 @@ Content-Type: application/json } ``` +--- + +## 四之二、安装统计与版本推送 + +### 权限说明 + +| 功能 | admin | project_admin | agent | +|------|-------|---------------|-------| +| 查看安装统计 | 全部 | 仅绑定项目 | 仅本人卡密相关 | +| 删除/恢复安装 | ✓ | ✓ | ✗ | +| 发布/修改/删除版本 | ✓ | ✓ | ✗(仅只读列表) | +| 强制推送开关 | ✓ | ✓ | ✗ | + +### 安装统计 + +| 方法 | 路径 | 说明 | +|------|------|------| +| GET | `/api/installations` | 安装列表(分页/筛选) | +| GET | `/api/installations/stats` | 统计:总安装(含已删除)、存活、已删除、今日新增、最后上线 | +| GET | `/api/installations/{id}` | 安装详情 | +| DELETE | `/api/installations/{id}` | 标记已删除(软删除) | +| POST | `/api/installations/{id}/restore` | 恢复为存活 | +| POST | `/api/installations/batch-delete` | 批量删除 `{ids:[]}` | +| GET | `/api/installations/export` | 导出 CSV | + +**统计响应示例:** + +```json +{ + "code": 200, + "data": { + "total_installs": 1280, + "active": 1150, + "deleted": 130, + "today_new": 12, + "week_new": 80, + "last_online_at": "2026-10-08 10:30:00", + "projects": [ + { + "project_id": 1, + "project_name": "演示项目", + "total_installs": 500, + "active": 450, + "deleted": 50, + "today_new": 5, + "last_online_at": "2026-10-08 10:00:00" + } + ] + } +} +``` + +列表 query 参数:`project_id`、`status`(active/deleted)、`keyword`、`date_from`、`date_to`、`page`、`page_size`。 + +### 版本推送管理 + +| 方法 | 路径 | 角色 | 说明 | +|------|------|------|------| +| GET | `/api/projects/{projectId}/versions` | 三角色 | 版本列表 | +| GET | `/api/projects/{projectId}/versions/{id}` | 三角色 | 版本详情 | +| POST | `/api/projects/{projectId}/versions` | admin/project_admin | 上传发布(multipart) | +| PUT | `/api/versions/{id}` | admin/project_admin | 更新说明/强制/最低版本/状态 | +| PUT | `/api/versions/{id}/force` | admin/project_admin | 强制推送开关 | +| PUT | `/api/versions/{id}/latest` | admin/project_admin | 设为最新版本 | +| DELETE | `/api/versions/{id}` | admin/project_admin | 删除版本及文件 | + +**发布版本(multipart/form-data):** + +| 字段 | 必填 | 说明 | +|------|------|------| +| `version` | 是 | 版本号,同项目唯一 | +| `file` | 是 | 安装包(zip/tar/gz/7z/exe/dmg/apk/msi/pkg/rar/bin,≤200MB) | +| `changelog` | 否 | 更新说明 | +| `is_force` | 否 | 0/1,默认 0;1=客户端强制更新提示 | +| `min_client_version` | 否 | 低于此版本强制更新 | +| `is_latest` | 否 | 默认 1;设为 1 时旧版本自动取消 latest | + +强制推送语义:仅返回 `update_required=true` 提示客户端弹窗,**不阻断** `verify` 授权。 + +**安装次数口径:** `total_installs = COUNT(*)`(存活 + 已删除);每次安装独立记录,同机器删除后重装会再次计入。 + ### 创建套餐 ``` diff --git a/backend/app/Controllers/InstallationController.php b/backend/app/Controllers/InstallationController.php new file mode 100644 index 0000000..93a92bc --- /dev/null +++ b/backend/app/Controllers/InstallationController.php @@ -0,0 +1,310 @@ +getCurrentUser() ?: []; + $page = max(1, (int) ($_GET['page'] ?? 1)); + $pageSize = min((int) ($_GET['page_size'] ?? 20), 100); + $offset = ($page - 1) * $pageSize; + + $filters = [ + 'project_id' => $_GET['project_id'] ?? '', + 'status' => $_GET['status'] ?? '', + 'keyword' => trim($_GET['keyword'] ?? ''), + 'date_from' => $_GET['date_from'] ?? '', + 'date_to' => $_GET['date_to'] ?? '', + ]; + + $built = InstallationService::buildListWhere($user, $filters); + $where = $built['where']; + $params = $built['params']; + + $total = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('installations')} i WHERE 1=1 {$where}", + $params + ); + + $list = $db->fetchAll( + "SELECT i.*, p.name AS project_name + FROM {$db->table('installations')} i + LEFT JOIN {$db->table('projects')} p ON p.id = i.project_id + WHERE 1=1 {$where} + ORDER BY i.id DESC + LIMIT {$offset}, {$pageSize}", + $params + ); + + $this->success([ + 'list' => $list, + 'total' => $total, + 'page' => $page, + 'page_size' => $pageSize, + ]); + } + + /** + * 安装统计(含已删除) + * GET /api/installations/stats + */ + public function stats(): void + { + $user = $this->getCurrentUser() ?: []; + $projectId = !empty($_GET['project_id']) ? (int) $_GET['project_id'] : null; + + $this->success(InstallationService::stats($user, $projectId)); + } + + /** + * 安装详情 + * GET /api/installations/{id} + */ + public function detail(int $id): void + { + $db = Database::getInstance(); + $user = $this->getCurrentUser() ?: []; + + $row = $db->fetch( + "SELECT i.*, p.name AS project_name + FROM {$db->table('installations')} i + LEFT JOIN {$db->table('projects')} p ON p.id = i.project_id + WHERE i.id = ?", + [$id] + ); + if (!$row) { + $this->error('安装记录不存在', 404); + } + + if (!$this->canAccess((int) $row['project_id'], $user)) { + $this->error('无权访问该安装记录', 403); + } + + $this->success($row); + } + + /** + * 删除安装(软删除) + * DELETE /api/installations/{id} + */ + public function delete(int $id): void + { + $db = Database::getInstance(); + $user = $this->getCurrentUser() ?: []; + $role = $user['role'] ?? ''; + + if (!in_array($role, ['admin', 'project_admin'], true)) { + $this->error('无权删除安装记录', 403); + } + + $row = $db->fetch( + "SELECT id, project_id, machine_id FROM {$db->table('installations')} WHERE id = ?", + [$id] + ); + if (!$row) { + $this->error('安装记录不存在', 404); + } + if (!$this->canAccess((int) $row['project_id'], $user)) { + $this->error('无权操作该项目的安装记录', 403); + } + + $db->execute( + "UPDATE {$db->table('installations')} + SET status = 'deleted', deleted_at = NOW() + WHERE id = ?", + [$id] + ); + + logger('installation_delete', 'installation', $id, [ + 'project_id' => (int) $row['project_id'], + 'machine_id' => $row['machine_id'], + ]); + + $this->success(null, '已标记为已删除'); + } + + /** + * 恢复安装 + * POST /api/installations/{id}/restore + */ + public function restore(int $id): void + { + $db = Database::getInstance(); + $user = $this->getCurrentUser() ?: []; + $role = $user['role'] ?? ''; + + if (!in_array($role, ['admin', 'project_admin'], true)) { + $this->error('无权恢复安装记录', 403); + } + + $row = $db->fetch( + "SELECT id, project_id, machine_id FROM {$db->table('installations')} WHERE id = ?", + [$id] + ); + if (!$row) { + $this->error('安装记录不存在', 404); + } + if (!$this->canAccess((int) $row['project_id'], $user)) { + $this->error('无权操作该项目的安装记录', 403); + } + + $db->execute( + "UPDATE {$db->table('installations')} + SET status = 'active', deleted_at = NULL + WHERE id = ?", + [$id] + ); + + logger('installation_restore', 'installation', $id, [ + 'project_id' => (int) $row['project_id'], + 'machine_id' => $row['machine_id'], + ]); + + $this->success(null, '已恢复为存活'); + } + + /** + * 批量删除 + * POST /api/installations/batch-delete + */ + public function batchDelete(): void + { + $db = Database::getInstance(); + $user = $this->getCurrentUser() ?: []; + $role = $user['role'] ?? ''; + + if (!in_array($role, ['admin', 'project_admin'], true)) { + $this->error('无权删除安装记录', 403); + } + + $input = $this->getJsonInput(); + $ids = $input['ids'] ?? []; + if (empty($ids) || !is_array($ids)) { + $this->error('请选择要删除的安装记录'); + } + $ids = array_map('intval', $ids); + + $deleted = 0; + foreach ($ids as $id) { + $row = $db->fetch( + "SELECT id, project_id FROM {$db->table('installations')} WHERE id = ?", + [$id] + ); + if (!$row || !$this->canAccess((int) $row['project_id'], $user)) { + continue; + } + $db->execute( + "UPDATE {$db->table('installations')} SET status = 'deleted', deleted_at = NOW() WHERE id = ?", + [$id] + ); + $deleted++; + } + + logger('installation_batch_delete', 'installation', 0, ['count' => $deleted]); + $this->success(['deleted' => $deleted], "已删除 {$deleted} 条"); + } + + /** + * 导出安装记录 + * GET /api/installations/export + */ + public function export(): void + { + $db = Database::getInstance(); + $user = $this->getCurrentUser() ?: []; + + $filters = [ + 'project_id' => $_GET['project_id'] ?? '', + 'status' => $_GET['status'] ?? '', + 'keyword' => trim($_GET['keyword'] ?? ''), + 'date_from' => $_GET['date_from'] ?? '', + 'date_to' => $_GET['date_to'] ?? '', + ]; + $built = InstallationService::buildListWhere($user, $filters); + + $list = $db->fetchAll( + "SELECT i.id, i.project_id, p.name AS project_name, i.machine_id, i.card_key, i.ip, + i.device_info, i.client_version, i.status, i.install_count, + i.installed_at, i.last_online_at, i.deleted_at + FROM {$db->table('installations')} i + LEFT JOIN {$db->table('projects')} p ON p.id = i.project_id + WHERE 1=1 {$built['where']} + ORDER BY i.id DESC + LIMIT 5000", + $built['params'] + ); + + $headers = [ + 'ID', '项目ID', '项目名称', '机器指纹', '卡密', 'IP', '设备信息', + '客户端版本', '状态', '累计激活', '安装时间', '最后上线', '删除时间', + ]; + + header('Content-Type: text/csv; charset=UTF-8'); + header('Content-Disposition: attachment; filename=installations_' . date('Ymd_His') . '.csv'); + echo "\xEF\xBB\xBF"; // UTF-8 BOM + $out = fopen('php://output', 'w'); + fputcsv($out, $headers); + foreach ($list as $row) { + fputcsv($out, [ + $row['id'], + $row['project_id'], + $row['project_name'] ?? '', + $row['machine_id'], + $row['card_key'] ?? '', + $row['ip'] ?? '', + $row['device_info'] ?? '', + $row['client_version'] ?? '', + $row['status'], + $row['install_count'], + $row['installed_at'], + $row['last_online_at'] ?? '', + $row['deleted_at'] ?? '', + ]); + } + fclose($out); + exit; + } + + /** + * 权限判断 + */ + private function canAccess(int $projectId, array $user): bool + { + $role = $user['role'] ?? ''; + if ($role === 'admin') { + return true; + } + if ($role === 'project_admin') { + $projectIds = $user['project_ids'] ?? []; + return in_array($projectId, array_map('intval', $projectIds), true); + } + if ($role === 'agent') { + $db = Database::getInstance(); + $agentIds = PermissionService::getAgentIdsUnder((int) ($user['id'] ?? 0)); + if (empty($agentIds)) { + return false; + } + $placeholders = implode(',', array_fill(0, count($agentIds), '?')); + $count = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('cards')} WHERE project_id = ? AND use_user_id IN ({$placeholders})", + array_merge([$projectId], $agentIds) + ); + return $count > 0; + } + return false; + } +} diff --git a/backend/app/Controllers/ProjectVersionController.php b/backend/app/Controllers/ProjectVersionController.php new file mode 100644 index 0000000..694e697 --- /dev/null +++ b/backend/app/Controllers/ProjectVersionController.php @@ -0,0 +1,364 @@ +getCurrentUser() ?: []; + if (!VersionService::assertProjectAccess($projectId, $user)) { + $this->error('无权访问该项目', 403); + } + + $db = Database::getInstance(); + $list = $db->fetchAll( + "SELECT v.*, p.name AS project_name + FROM {$db->table('project_versions')} v + LEFT JOIN {$db->table('projects')} p ON p.id = v.project_id + WHERE v.project_id = ? + ORDER BY v.id DESC", + [$projectId] + ); + + $this->success($list); + } + + /** + * 版本详情 + * GET /api/projects/{projectId}/versions/{id} + */ + public function detail(int $projectId, int $id): void + { + $user = $this->getCurrentUser() ?: []; + if (!VersionService::assertProjectAccess($projectId, $user)) { + $this->error('无权访问该项目', 403); + } + + $db = Database::getInstance(); + $row = $db->fetch( + "SELECT v.*, p.name AS project_name + FROM {$db->table('project_versions')} v + LEFT JOIN {$db->table('projects')} p ON p.id = v.project_id + WHERE v.id = ? AND v.project_id = ?", + [$id, $projectId] + ); + if (!$row) { + $this->error('版本不存在', 404); + } + + $this->success($row); + } + + /** + * 上传发布版本 + * POST /api/projects/{projectId}/versions (multipart) + */ + public function create(int $projectId): void + { + $user = $this->getCurrentUser() ?: []; + $role = $user['role'] ?? ''; + + if (!VersionService::canPublish($role)) { + $this->error('代理账号不可发布版本', 403); + } + if (!VersionService::assertProjectAccess($projectId, $user)) { + $this->error('无权操作该项目', 403); + } + + $version = trim($_POST['version'] ?? ''); + if ($version === '') { + $this->error('版本号不能为空'); + } + + if (!isset($_FILES['file']) || $_FILES['file']['error'] !== UPLOAD_ERR_OK) { + $this->error('请上传安装包文件'); + } + + $file = $_FILES['file']; + $ext = strtolower(pathinfo($file['name'], PATHINFO_EXTENSION)); + if (!in_array($ext, self::ALLOWED_EXT, true)) { + $this->error('仅支持 ' . implode('/', self::ALLOWED_EXT) . ' 格式的安装包'); + } + if ($file['size'] > self::MAX_SIZE) { + $this->error('安装包大小不能超过 200MB'); + } + + $db = Database::getInstance(); + $exists = $db->fetch( + "SELECT id FROM {$db->table('project_versions')} WHERE project_id = ? AND version = ?", + [$projectId, $version] + ); + if ($exists) { + $this->error('该版本号已存在'); + } + + $uploadDir = BASE_PATH . '/public/uploads/packages/' . $projectId; + if (!is_dir($uploadDir) && !mkdir($uploadDir, 0755, true) && !is_dir($uploadDir)) { + $this->error('创建上传目录失败'); + } + + // 安全文件名:随机 + 原扩展名 + $safeName = 'pkg_' . $projectId . '_' . time() . '_' . bin2hex(random_bytes(6)) . '.' . $ext; + $filepath = $uploadDir . '/' . $safeName; + if (!move_uploaded_file($file['tmp_name'], $filepath)) { + $this->error('安装包上传失败,请重试'); + } + + $checksum = ''; + if (is_file($filepath)) { + $checksum = @hash_file('sha256', $filepath) ?: ''; + } + + $fileSize = (int) $file['size']; + $isLatest = isset($_POST['is_latest']) ? (int) $_POST['is_latest'] : 1; + $isForce = isset($_POST['is_force']) ? (int) $_POST['is_force'] : 0; + $isForce = $isForce === 1 ? 1 : 0; + $isLatest = $isLatest === 0 ? 0 : 1; + $minVersion = trim($_POST['min_client_version'] ?? ''); + $changelog = $_POST['changelog'] ?? ''; + $filePath = '/uploads/packages/' . $projectId . '/' . $safeName; + + $db->beginTransaction(); + try { + if ($isLatest) { + $db->execute( + "UPDATE {$db->table('project_versions')} SET is_latest = 0 WHERE project_id = ?", + [$projectId] + ); + } + + $versionId = $db->insert( + "INSERT INTO {$db->table('project_versions')} + (project_id, version, file_name, file_path, file_size, checksum, changelog, + min_client_version, is_force, is_latest, download_count, status, created_by) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, 1, ?)", + [ + $projectId, + $version, + $file['name'], + $filePath, + $fileSize, + $checksum, + $changelog !== '' ? $changelog : null, + $minVersion, + $isForce, + $isLatest, + (int) ($user['id'] ?? 0), + ] + ); + $db->commit(); + } catch (\Throwable $e) { + $db->rollback(); + @unlink($filepath); + $this->error('版本发布失败: ' . $e->getMessage()); + } + + logger('version_publish', 'project_version', $versionId, [ + 'project_id' => $projectId, + 'version' => $version, + 'is_force' => $isForce, + 'is_latest' => $isLatest, + ]); + + $row = $db->fetch( + "SELECT * FROM {$db->table('project_versions')} WHERE id = ?", + [$versionId] + ); + + $this->success($row, '版本发布成功'); + } + + /** + * 更新版本信息(changelog / force / min_version / status) + * PUT /api/versions/{id} + */ + public function update(int $id): void + { + $user = $this->getCurrentUser() ?: []; + if (!VersionService::canPublish($user['role'] ?? '')) { + $this->error('代理账号不可修改版本', 403); + } + + $db = Database::getInstance(); + $row = $db->fetch( + "SELECT * FROM {$db->table('project_versions')} WHERE id = ?", + [$id] + ); + if (!$row) { + $this->error('版本不存在', 404); + } + if (!VersionService::assertProjectAccess((int) $row['project_id'], $user)) { + $this->error('无权操作该项目的版本', 403); + } + + $input = $this->getJsonInput(); + + $changelog = array_key_exists('changelog', $input) ? $input['changelog'] : $row['changelog']; + $minVersion = array_key_exists('min_client_version', $input) ? trim((string) $input['min_client_version']) : ($row['min_client_version'] ?? ''); + $isForce = array_key_exists('is_force', $input) ? ((int) $input['is_force'] === 1 ? 1 : 0) : (int) $row['is_force']; + $status = array_key_exists('status', $input) ? ((int) $input['status'] === 1 ? 1 : 0) : (int) $row['status']; + + $db->execute( + "UPDATE {$db->table('project_versions')} + SET changelog = ?, min_client_version = ?, is_force = ?, status = ? + WHERE id = ?", + [ + $changelog !== '' ? $changelog : null, + $minVersion, + $isForce, + $status, + $id, + ] + ); + + logger('version_update', 'project_version', $id, [ + 'version' => $row['version'], + 'is_force' => $isForce, + ]); + + $this->success($db->fetch("SELECT * FROM {$db->table('project_versions')} WHERE id = ?", [$id]), '更新成功'); + } + + /** + * 切换强制推送 + * PUT /api/versions/{id}/force + */ + public function toggleForce(int $id): void + { + $user = $this->getCurrentUser() ?: []; + if (!VersionService::canPublish($user['role'] ?? '')) { + $this->error('代理账号不可修改强制推送', 403); + } + + $db = Database::getInstance(); + $row = $db->fetch( + "SELECT * FROM {$db->table('project_versions')} WHERE id = ?", + [$id] + ); + if (!$row) { + $this->error('版本不存在', 404); + } + if (!VersionService::assertProjectAccess((int) $row['project_id'], $user)) { + $this->error('无权操作该项目的版本', 403); + } + + $input = $this->getJsonInput(); + if (array_key_exists('is_force', $input)) { + $isForce = ((int) $input['is_force'] === 1) ? 1 : 0; + } else { + $isForce = ((int) $row['is_force'] === 1) ? 0 : 1; + } + + $db->execute( + "UPDATE {$db->table('project_versions')} SET is_force = ? WHERE id = ?", + [$isForce, $id] + ); + + logger('version_force_toggle', 'project_version', $id, [ + 'version' => $row['version'], + 'is_force' => $isForce, + ]); + + $this->success( + ['id' => $id, 'is_force' => $isForce], + $isForce ? '已开启强制推送' : '已关闭强制推送' + ); + } + + /** + * 设为最新版本 + * PUT /api/versions/{id}/latest + */ + public function setLatest(int $id): void + { + $user = $this->getCurrentUser() ?: []; + if (!VersionService::canPublish($user['role'] ?? '')) { + $this->error('代理账号不可设置最新版本', 403); + } + + $db = Database::getInstance(); + $row = $db->fetch( + "SELECT * FROM {$db->table('project_versions')} WHERE id = ?", + [$id] + ); + if (!$row) { + $this->error('版本不存在', 404); + } + if (!VersionService::assertProjectAccess((int) $row['project_id'], $user)) { + $this->error('无权操作该项目的版本', 403); + } + + $db->beginTransaction(); + try { + $db->execute( + "UPDATE {$db->table('project_versions')} SET is_latest = 0 WHERE project_id = ?", + [(int) $row['project_id']] + ); + $db->execute( + "UPDATE {$db->table('project_versions')} SET is_latest = 1, status = 1 WHERE id = ?", + [$id] + ); + $db->commit(); + } catch (\Throwable $e) { + $db->rollback(); + $this->error('设置最新版本失败'); + } + + logger('version_set_latest', 'project_version', $id, ['version' => $row['version']]); + $this->success(null, '已设为最新版本'); + } + + /** + * 删除版本 + * DELETE /api/versions/{id} + */ + public function delete(int $id): void + { + $user = $this->getCurrentUser() ?: []; + if (!VersionService::canPublish($user['role'] ?? '')) { + $this->error('代理账号不可删除版本', 403); + } + + $db = Database::getInstance(); + $row = $db->fetch( + "SELECT * FROM {$db->table('project_versions')} WHERE id = ?", + [$id] + ); + if (!$row) { + $this->error('版本不存在', 404); + } + if (!VersionService::assertProjectAccess((int) $row['project_id'], $user)) { + $this->error('无权操作该项目的版本', 403); + } + + $db->execute("DELETE FROM {$db->table('project_versions')} WHERE id = ?", [$id]); + + // 删除物理文件 + $abs = BASE_PATH . '/public' . $row['file_path']; + if (is_file($abs)) { + @unlink($abs); + } + + logger('version_delete', 'project_version', $id, [ + 'project_id' => (int) $row['project_id'], + 'version' => $row['version'], + ]); + + $this->success(null, '版本已删除'); + } +} diff --git a/backend/app/Controllers/PublicController.php b/backend/app/Controllers/PublicController.php index 1ff34fd..8b446db 100644 --- a/backend/app/Controllers/PublicController.php +++ b/backend/app/Controllers/PublicController.php @@ -4,10 +4,12 @@ namespace App\Controllers; use App\Core\Controller; use App\Core\Database; use App\Core\Validator; +use App\Services\InstallationService; +use App\Services\VersionService; /** * 公开接口控制器 - * 包含:购买页、查询页、授权验证、支付回调 + * 包含:购买页、查询页、授权验证、安装上报、支付回调 */ class PublicController extends Controller { @@ -23,6 +25,25 @@ class PublicController extends Controller $this->success($projects); } + /** + * 已启用的支付方式列表(前台购买页展示用) + * GET /api/public/payment/options + */ + public function paymentOptions(): void + { + $db = Database::getInstance(); + $row = $db->fetch( + "SELECT `value` FROM {$db->table('configs')} WHERE `key` = 'payment_pay_types'" + ); + $types = $row ? json_decode($row['value'], true) : ['alipay', 'wxpay']; + $valid = ['alipay', 'wxpay', 'qqpay']; + $types = array_values(array_filter($types, fn($t) => in_array($t, $valid, true))); + if (empty($types)) { + $types = ['alipay', 'wxpay']; + } + $this->success(['pay_types' => $types, 'payment_enabled' => $row !== null]); + } + /** * 获取项目的卡密类型(套餐)列表 */ @@ -66,6 +87,17 @@ class PublicController extends Controller $db = Database::getInstance(); + // 校验支付方式是否已勾选启用 + $payTypesRow = $db->fetch( + "SELECT `value` FROM {$db->table('configs')} WHERE `key` = 'payment_pay_types'" + ); + if ($payTypesRow) { + $enabledPayTypes = json_decode($payTypesRow['value'], true) ?: []; + if (!in_array($payType, $enabledPayTypes, true)) { + $this->error('该支付方式未开启,请选择其他支付方式'); + } + } + // 验证项目 $project = $db->fetch( "SELECT id, name FROM {$db->table('projects')} WHERE id = ? AND status = 1 AND deleted_at IS NULL", @@ -484,20 +516,121 @@ class PublicController extends Controller $this->success($card); } + /** + * 检查更新 + 上报安装/在线 (客户端调用) + * Header: X-Api-Key: {project_api_key} + * POST: {machine_id, client_version?, card_key?, device_info?} + */ + public function checkUpdate(): void + { + $projectId = (int) ($_SERVER['HTTP_X_PROJECT_ID'] ?? 0); + $input = $this->getJsonInput(); + + $machineId = trim((string) ($input['machine_id'] ?? '')); + $clientVersion = trim((string) ($input['client_version'] ?? '')); + $cardKey = trim((string) ($input['card_key'] ?? '')); + $deviceInfo = (string) ($input['device_info'] ?? ''); + $deviceIp = (string) ($input['ip'] ?? clientIp()); + + if ($machineId === '') { + $this->error('缺少机器码 machine_id', 400); + } + + $cardId = null; + if ($cardKey !== '') { + $db = Database::getInstance(); + $card = $db->fetch( + "SELECT id FROM {$db->table('cards')} WHERE card_key = ? AND project_id = ?", + [$cardKey, $projectId] + ); + if ($card) { + $cardId = (int) $card['id']; + } + } + + $upsert = InstallationService::upsert( + $projectId, + $machineId, + $deviceIp, + $deviceInfo, + $clientVersion, + $cardId, + $cardKey + ); + + $payload = VersionService::buildUpdatePayload($projectId, $clientVersion); + $payload['install_id'] = $upsert['install_id']; + + // 有更新时累计下载提示次数 + if (!empty($payload['update_available']) && !empty($payload['version'])) { + $db = Database::getInstance(); + $db->execute( + "UPDATE {$db->table('project_versions')} SET download_count = download_count + 1 + WHERE project_id = ? AND version = ?", + [$projectId, $payload['version']] + ); + } + + $this->success($payload, 'ok'); + } + + /** + * 安装心跳 (客户端调用) + * Header: X-Api-Key: {project_api_key} + * POST: {machine_id, client_version?, card_key?, device_info?} + */ + public function heartbeat(): void + { + $projectId = (int) ($_SERVER['HTTP_X_PROJECT_ID'] ?? 0); + $input = $this->getJsonInput(); + + $machineId = trim((string) ($input['machine_id'] ?? '')); + if ($machineId === '') { + $this->error('缺少机器码 machine_id', 400); + } + + $cardKey = trim((string) ($input['card_key'] ?? '')); + $cardId = null; + if ($cardKey !== '') { + $db = Database::getInstance(); + $card = $db->fetch( + "SELECT id FROM {$db->table('cards')} WHERE card_key = ? AND project_id = ?", + [$cardKey, $projectId] + ); + if ($card) { + $cardId = (int) $card['id']; + } + } + + $upsert = InstallationService::heartbeat( + $projectId, + $machineId, + (string) ($input['ip'] ?? clientIp()), + (string) ($input['device_info'] ?? ''), + (string) ($input['client_version'] ?? ''), + $cardId, + $cardKey + ); + + $this->success(['install_id' => $upsert['install_id']], 'ok'); + } + /** * 授权验证接口 (客户端调用) * Header: X-Api-Key: {project_api_key} - * POST: {card_key, machine_id, ip, device_info} + * POST: {card_key, machine_id, ip, device_info, client_version?} + * 成功时附带更新提示字段,并更新安装 last_online_at */ public function verify(): void { - $projectId = $_SERVER['HTTP_X_PROJECT_ID'] ?? 0; + $projectId = (int) ($_SERVER['HTTP_X_PROJECT_ID'] ?? 0); $input = $this->getJsonInput(); $cardKey = $input['card_key'] ?? ''; $machineId = $input['machine_id'] ?? ''; $deviceIp = $input['ip'] ?? clientIp(); $deviceInfo = $input['device_info'] ?? ''; + $clientVersion = (string) ($input['client_version'] ?? ''); if (empty($cardKey) || empty($machineId)) { $this->error('参数不完整', 400); @@ -546,6 +679,20 @@ class PublicController extends Controller [json_encode($bindInfo, JSON_UNESCAPED_UNICODE), $expireTime, $card['id']] ); + // 登记安装记录 + $upsert = InstallationService::upsert( + $projectId, + (string) $machineId, + (string) $deviceIp, + (string) $deviceInfo, + $clientVersion, + (int) $card['id'], + (string) $cardKey + ); + + $updatePayload = VersionService::buildUpdatePayload($projectId, $clientVersion); + $updatePayload['install_id'] = $upsert['install_id']; + $this->success([ 'valid' => true, 'message' => '激活成功', @@ -553,7 +700,7 @@ class PublicController extends Controller 'duration_days' => $card['duration_days'], 'expire_time' => $expireTime, 'is_permanent' => $card['duration_days'] == 0, - ], 'ok'); + ] + $updatePayload, 'ok'); return; } @@ -572,6 +719,20 @@ class PublicController extends Controller return; } + // 授权有效:更新安装 last_online_at + $upsert = InstallationService::upsert( + $projectId, + (string) $machineId, + (string) $deviceIp, + (string) $deviceInfo, + $clientVersion, + (int) $card['id'], + (string) $cardKey + ); + + $updatePayload = VersionService::buildUpdatePayload($projectId, $clientVersion); + $updatePayload['install_id'] = $upsert['install_id']; + $this->success([ 'valid' => true, 'message' => '授权有效', @@ -581,9 +742,11 @@ class PublicController extends Controller 'bound_at' => $card['bound_at'], 'is_permanent' => $card['duration_days'] == 0, 'remaining_days' => $card['expire_time'] ? max(0, ceil((strtotime($card['expire_time']) - time()) / 86400)) : null, - ], 'ok'); + ] + $updatePayload, 'ok'); return; } + + $this->success(['valid' => false, 'message' => '卡密状态异常'], 'ok'); } /** diff --git a/backend/app/Helpers/functions.php b/backend/app/Helpers/functions.php index 40a56ad..c577f41 100644 --- a/backend/app/Helpers/functions.php +++ b/backend/app/Helpers/functions.php @@ -148,4 +148,23 @@ function logger(string $action, string $targetType = '', int $targetId = 0, arra } catch (\Throwable $e) { error_log('Logger error: ' . $e->getMessage()); } +} + +/** + * 语义化版本比较 + * @return int -1 ab + */ +function compareVersions(string $a, string $b): int +{ + $normalize = static function (string $v): string { + $v = trim($v); + if ($v === '') { + return '0.0.0'; + } + if ($v[0] === 'v' || $v[0] === 'V') { + $v = substr($v, 1); + } + return $v; + }; + return version_compare($normalize($a), $normalize($b)); } \ No newline at end of file diff --git a/backend/app/Services/InstallationService.php b/backend/app/Services/InstallationService.php new file mode 100644 index 0000000..6f6b1a2 --- /dev/null +++ b/backend/app/Services/InstallationService.php @@ -0,0 +1,238 @@ +fetch( + "SELECT id FROM {$db->table('installations')} + WHERE project_id = ? AND machine_id = ? AND status = 'active' + ORDER BY id DESC LIMIT 1", + [$projectId, $machineId] + ); + + if ($existing) { + $updateCardId = $cardId; + $updateCardKey = $cardKey !== '' ? $cardKey : null; + $updateDevice = $deviceInfo !== '' ? $deviceInfo : null; + $updateVersion = $clientVersion !== '' ? $clientVersion : null; + + $db->execute( + "UPDATE {$db->table('installations')} + SET ip = ?, device_info = ?, client_version = ?, + last_online_at = NOW(), + card_id = COALESCE(?, card_id), + card_key = COALESCE(?, card_key) + WHERE id = ?", + [ + $ip !== '' ? $ip : null, + $updateDevice, + $updateVersion, + $updateCardId, + $updateCardKey, + $existing['id'], + ] + ); + return ['install_id' => (int) $existing['id'], 'is_new' => false]; + } + + $installId = $db->insert( + "INSERT INTO {$db->table('installations')} + (project_id, card_id, card_key, machine_id, ip, device_info, client_version, + status, install_count, last_online_at, installed_at) + VALUES (?, ?, ?, ?, ?, ?, ?, 'active', 1, NOW(), NOW())", + [ + $projectId, + $cardId, + $cardKey, + $machineId, + $ip !== '' ? $ip : null, + $deviceInfo !== '' ? $deviceInfo : null, + $clientVersion !== '' ? $clientVersion : null, + ] + ); + + return ['install_id' => $installId, 'is_new' => true]; + } + + /** + * 仅更新在线时间(心跳) + */ + public static function heartbeat( + int $projectId, + string $machineId, + string $ip = '', + string $deviceInfo = '', + string $clientVersion = '', + ?int $cardId = null, + string $cardKey = '' + ): array { + return self::upsert($projectId, $machineId, $ip, $deviceInfo, $clientVersion, $cardId, $cardKey); + } + + /** + * 数据范围过滤(admin / project_admin / agent) + * @return array {where: string, params: array} + */ + public static function scope(array $user): array + { + $db = Database::getInstance(); + $role = $user['role'] ?? ''; + + if ($role === 'admin') { + return ['where' => '', 'params' => []]; + } + + if ($role === 'project_admin') { + $projectIds = $user['project_ids'] ?? []; + if (empty($projectIds)) { + return ['where' => ' AND 1=0', 'params' => []]; + } + $placeholders = implode(',', array_fill(0, count($projectIds), '?')); + return [ + 'where' => " AND i.project_id IN ({$placeholders})", + 'params' => array_map('intval', $projectIds), + ]; + } + + // 代理:仅本人及下级代理发放卡密相关的安装 + $agentIds = PermissionService::getAgentIdsUnder((int) ($user['id'] ?? 0)); + if (empty($agentIds)) { + return ['where' => ' AND 1=0', 'params' => []]; + } + $placeholders = implode(',', array_fill(0, count($agentIds), '?')); + return [ + 'where' => " AND i.card_id IN (SELECT c.id FROM {$db->table('cards')} c WHERE c.use_user_id IN ({$placeholders}))", + 'params' => array_map('intval', $agentIds), + ]; + } + + /** + * 构建安装列表/统计 WHERE + */ + public static function buildListWhere(array $user, array $filters = []): array + { + $scope = self::scope($user); + $where = $scope['where']; + $params = $scope['params']; + + if (!empty($filters['project_id'])) { + $where .= ' AND i.project_id = ?'; + $params[] = (int) $filters['project_id']; + } + if (!empty($filters['status']) && in_array($filters['status'], ['active', 'deleted'], true)) { + $where .= ' AND i.status = ?'; + $params[] = $filters['status']; + } + if (!empty($filters['keyword'])) { + $where .= ' AND (i.machine_id LIKE ? OR i.card_key LIKE ? OR i.ip LIKE ?)'; + $kw = '%' . $filters['keyword'] . '%'; + $params[] = $kw; + $params[] = $kw; + $params[] = $kw; + } + if (!empty($filters['date_from'])) { + $where .= ' AND i.installed_at >= ?'; + $params[] = $filters['date_from'] . ' 00:00:00'; + } + if (!empty($filters['date_to'])) { + $where .= ' AND i.installed_at <= ?'; + $params[] = $filters['date_to'] . ' 23:59:59'; + } + + return ['where' => $where, 'params' => $params]; + } + + /** + * 安装统计(含已删除) + */ + public static function stats(array $user, ?int $projectId = null): array + { + $db = Database::getInstance(); + $whereList = self::buildListWhere($user, $projectId ? ['project_id' => $projectId] : []); + $where = $whereList['where']; + $params = $whereList['params']; + + $total = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('installations')} i WHERE 1=1 {$where}", + $params + ); + $active = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('installations')} i WHERE i.status = 'active' {$where}", + $params + ); + $deleted = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('installations')} i WHERE i.status = 'deleted' {$where}", + $params + ); + $todayNew = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('installations')} i WHERE DATE(i.installed_at) = CURDATE() {$where}", + $params + ); + $weekNew = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('installations')} i WHERE i.installed_at >= DATE_SUB(NOW(), INTERVAL 7 DAY) {$where}", + $params + ); + $lastOnline = $db->fetchColumn( + "SELECT MAX(i.last_online_at) FROM {$db->table('installations')} i WHERE i.last_online_at IS NOT NULL {$where}", + $params + ); + + $projects = $db->fetchAll( + "SELECT i.project_id, p.name AS project_name, + COUNT(*) AS total_installs, + SUM(CASE WHEN i.status = 'active' THEN 1 ELSE 0 END) AS active, + SUM(CASE WHEN i.status = 'deleted' THEN 1 ELSE 0 END) AS deleted, + SUM(CASE WHEN DATE(i.installed_at) = CURDATE() THEN 1 ELSE 0 END) AS today_new, + MAX(i.last_online_at) AS last_online_at + FROM {$db->table('installations')} i + LEFT JOIN {$db->table('projects')} p ON p.id = i.project_id + WHERE 1=1 {$where} + GROUP BY i.project_id, p.name + ORDER BY total_installs DESC", + $params + ); + + return [ + 'total_installs' => $total, + 'active' => $active, + 'deleted' => $deleted, + 'today_new' => $todayNew, + 'week_new' => $weekNew, + 'last_online_at' => $lastOnline ?: null, + 'projects' => array_map(static function (array $row): array { + return [ + 'project_id' => (int) $row['project_id'], + 'project_name' => $row['project_name'], + 'total_installs' => (int) $row['total_installs'], + 'active' => (int) $row['active'], + 'deleted' => (int) $row['deleted'], + 'today_new' => (int) $row['today_new'], + 'last_online_at' => $row['last_online_at'], + ]; + }, $projects), + ]; + } +} diff --git a/backend/app/Services/VersionService.php b/backend/app/Services/VersionService.php new file mode 100644 index 0000000..f278b7c --- /dev/null +++ b/backend/app/Services/VersionService.php @@ -0,0 +1,184 @@ +b + */ + public static function compare(string $a, string $b): int + { + return version_compare(self::normalize($a), self::normalize($b)); + } + + /** + * 规范化版本号:剥离前缀 v/V,预发布后缀 + */ + public static function normalize(string $version): string + { + $version = trim($version); + if ($version === '') { + return '0.0.0'; + } + if ($version[0] === 'v' || $version[0] === 'V') { + $version = substr($version, 1); + } + // 预发布:1.2.0-beta.1 -> 1.2.0-beta + return $version; + } + + /** + * 获取项目最新可用版本 + */ + public static function getLatest(int $projectId): ?array + { + $db = Database::getInstance(); + $row = $db->fetch( + "SELECT * FROM {$db->table('project_versions')} + WHERE project_id = ? AND status = 1 AND is_latest = 1 + ORDER BY id DESC LIMIT 1", + [$projectId] + ); + return $row ?: null; + } + + /** + * 构造客户端更新提示载荷 + * + * @return array { + * update_available: bool, update_required: bool, + * current_version: string, latest_version: string, + * version: ?string, download_url: ?string, file_size: int, + * checksum: string, changelog: ?string, + * min_client_version: string, is_force: int + * } + */ + public static function buildUpdatePayload(int $projectId, string $clientVersion = ''): array + { + $db = Database::getInstance(); + $latest = self::getLatest($projectId); + + $clientVersion = self::normalize($clientVersion); + $hasClient = trim($clientVersion) !== '' && $clientVersion !== '0.0.0'; + + if (!$latest) { + return [ + 'update_available' => false, + 'update_required' => false, + 'current_version' => $clientVersion, + 'latest_version' => '', + 'version' => null, + 'download_url' => null, + 'file_size' => 0, + 'checksum' => '', + 'changelog' => null, + 'min_client_version' => '', + 'is_force' => 0, + 'install_id' => null, + ]; + } + + $latestVersion = self::normalize($latest['version']); + $minVersion = self::normalize($latest['min_client_version'] ?? ''); + $isForce = (int) $latest['is_force']; + + $updateAvailable = !$hasClient || self::compare($latestVersion, $clientVersion) > 0; + $belowMin = $minVersion !== '' && $minVersion !== '0.0.0' + && self::compare($clientVersion, $minVersion) < 0; + $updateRequired = ($isForce === 1 && $updateAvailable) || ($belowMin && $updateAvailable); + + return [ + 'update_available' => $updateAvailable, + 'update_required' => $updateRequired, + 'current_version' => $clientVersion, + 'latest_version' => $latest['version'], + 'version' => $latest['version'], + 'download_url' => $latest['file_path'], + 'file_size' => (int) $latest['file_size'], + 'checksum' => $latest['checksum'] ?? '', + 'changelog' => $latest['changelog'], + 'min_client_version' => $latest['min_client_version'] ?? '', + 'is_force' => $isForce, + 'install_id' => null, + ]; + } + + /** + * 数据范围:项目管理员/管理员可见;代理只读(由控制器限制写操作) + */ + public static function scope(array $user): array + { + $role = $user['role'] ?? ''; + if ($role === 'admin') { + return ['where' => 'p.deleted_at IS NULL', 'params' => []]; + } + if ($role === 'project_admin') { + $projectIds = $user['project_ids'] ?? []; + if (empty($projectIds)) { + return ['where' => '1=0', 'params' => []]; + } + $placeholders = implode(',', array_fill(0, count($projectIds), '?')); + return [ + 'where' => "p.deleted_at IS NULL AND p.id IN ({$placeholders})", + 'params' => array_map('intval', $projectIds), + ]; + } + + // 代理:有卡密记录的项目 + $db = Database::getInstance(); + $agentIds = PermissionService::getAgentIdsUnder((int) ($user['id'] ?? 0)); + if (empty($agentIds)) { + return ['where' => '1=0', 'params' => []]; + } + $placeholders = implode(',', array_fill(0, count($agentIds), '?')); + return [ + 'where' => "p.deleted_at IS NULL AND p.id IN ( + SELECT DISTINCT c.project_id FROM {$db->table('cards')} c WHERE c.use_user_id IN ({$placeholders}) + )", + 'params' => array_map('intval', $agentIds), + ]; + } + + /** + * 是否允许发布/修改版本(仅 admin / project_admin) + */ + public static function canPublish(?string $role): bool + { + return in_array($role, ['admin', 'project_admin'], true); + } + + /** + * 校验项目访问权限 + */ + public static function assertProjectAccess(int $projectId, array $user): bool + { + $role = $user['role'] ?? ''; + if ($role === 'admin') { + return true; + } + if ($role === 'project_admin') { + $projectIds = $user['project_ids'] ?? []; + return in_array($projectId, array_map('intval', $projectIds), true); + } + if ($role === 'agent') { + $db = Database::getInstance(); + $agentIds = PermissionService::getAgentIdsUnder((int) ($user['id'] ?? 0)); + if (empty($agentIds)) { + return false; + } + $placeholders = implode(',', array_fill(0, count($agentIds), '?')); + $count = (int) $db->fetchColumn( + "SELECT COUNT(*) FROM {$db->table('cards')} WHERE project_id = ? AND use_user_id IN ({$placeholders})", + array_merge([$projectId], $agentIds) + ); + return $count > 0; + } + return false; + } +} diff --git a/backend/database/migrations/20261008_add_installations_and_versions.sql b/backend/database/migrations/20261008_add_installations_and_versions.sql new file mode 100644 index 0000000..5541bf2 --- /dev/null +++ b/backend/database/migrations/20261008_add_installations_and_versions.sql @@ -0,0 +1,56 @@ +-- 安装记录表 + 项目版本/安装包表 +-- 适用于已有数据库的增量升级;新库直接使用 schema.sql + +-- ============================================ +-- 安装记录表 +-- ============================================ +CREATE TABLE IF NOT EXISTS `ca_installations` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `project_id` BIGINT UNSIGNED NOT NULL COMMENT '所属项目ID', + `card_id` BIGINT UNSIGNED DEFAULT NULL COMMENT '关联卡密ID(可空)', + `card_key` VARCHAR(64) DEFAULT '' COMMENT '卡密(冗余,便于查询)', + `machine_id` VARCHAR(128) NOT NULL COMMENT '机器指纹', + `ip` VARCHAR(45) DEFAULT '' COMMENT '最后IP', + `device_info` TEXT DEFAULT NULL COMMENT '设备信息', + `client_version` VARCHAR(50) DEFAULT '' COMMENT '客户端版本', + `status` ENUM('active','deleted') NOT NULL DEFAULT 'active' COMMENT '状态: active=存活, deleted=已删除', + `install_count` INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '该机器累计激活次数', + `last_online_at` DATETIME DEFAULT NULL COMMENT '最后上线时间', + `installed_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '安装时间', + `deleted_at` DATETIME DEFAULT NULL COMMENT '删除时间', + `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_project_id` (`project_id`), + KEY `idx_status` (`status`), + KEY `idx_project_machine` (`project_id`,`machine_id`,`status`), + KEY `idx_card_id` (`card_id`), + KEY `idx_last_online` (`last_online_at`), + KEY `idx_deleted_at` (`deleted_at`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='安装记录表'; + +-- ============================================ +-- 项目版本/安装包表 +-- ============================================ +CREATE TABLE IF NOT EXISTS `ca_project_versions` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `project_id` BIGINT UNSIGNED NOT NULL COMMENT '所属项目ID', + `version` VARCHAR(50) NOT NULL COMMENT '版本号(如 1.2.0)', + `file_name` VARCHAR(255) NOT NULL COMMENT '原始文件名', + `file_path` VARCHAR(500) NOT NULL COMMENT '存储路径(相对public)', + `file_size` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '文件大小(字节)', + `checksum` VARCHAR(64) DEFAULT '' COMMENT 'SHA256', + `changelog` TEXT DEFAULT NULL COMMENT '更新说明', + `min_client_version` VARCHAR(50) DEFAULT '' COMMENT '强制更新最低版本(可空)', + `is_force` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否强制推送: 0=否, 1=是', + `is_latest` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '是否最新版本', + `download_count` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '下载次数', + `status` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '状态: 0=禁用, 1=正常', + `created_by` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '发布人ID', + `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_project_version` (`project_id`,`version`), + KEY `idx_project_id` (`project_id`), + KEY `idx_is_latest` (`project_id`,`is_latest`,`status`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='项目版本/安装包表'; diff --git a/backend/database/schema.sql b/backend/database/schema.sql index 71323f5..8c30c95 100644 --- a/backend/database/schema.sql +++ b/backend/database/schema.sql @@ -5,6 +5,8 @@ -- 字符集: utf8mb4 -- ============================================ +SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci; + CREATE DATABASE IF NOT EXISTS `card_auth` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; USE `card_auth`; @@ -279,7 +281,7 @@ CREATE TABLE `ca_coupons` ( -- 初始化超级管理员 (密码: admin123456) INSERT INTO `ca_users` (`username`, `password`, `nickname`, `role`, `status`) VALUES -('admin', '$2y$12$LJ3m4ys3OoMJ8zKR0gVNNe5hHOqFh0VhJmKqxXkGgFMfGZqXsQHqK', '超级管理员', 'admin', 1); +('admin', '$2y$10$5IZyJdCtuVQ0O7fIzeXgbOa8rOi2kkHBYmEiA4Z/UyKxK.dgBXZLO', '超级管理员', 'admin', 1); -- 初始化演示项目 INSERT INTO `ca_projects` (`name`, `description`, `api_key`, `status`) VALUES @@ -328,4 +330,60 @@ INSERT INTO `ca_configs` (`key`, `value`, `description`) VALUES ('smtp_from_email', '', '发件人邮箱'), ('smtp_from_name', 'CardAuth', '发件人名称'), ('smtp_enabled', '0', '是否启用邮件通知(1=启用,0=禁用)'), -('smtp_expire_days', '7', '到期前N天发送提醒邮件'); \ No newline at end of file +('smtp_expire_days', '7', '到期前N天发送提醒邮件'); + +-- ============================================ +-- 12. 安装记录表 +-- ============================================ +DROP TABLE IF EXISTS `ca_installations`; +CREATE TABLE `ca_installations` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `project_id` BIGINT UNSIGNED NOT NULL COMMENT '所属项目ID', + `card_id` BIGINT UNSIGNED DEFAULT NULL COMMENT '关联卡密ID(可空)', + `card_key` VARCHAR(64) DEFAULT '' COMMENT '卡密(冗余,便于查询)', + `machine_id` VARCHAR(128) NOT NULL COMMENT '机器指纹', + `ip` VARCHAR(45) DEFAULT '' COMMENT '最后IP', + `device_info` TEXT DEFAULT NULL COMMENT '设备信息', + `client_version` VARCHAR(50) DEFAULT '' COMMENT '客户端版本', + `status` ENUM('active','deleted') NOT NULL DEFAULT 'active' COMMENT '状态: active=存活, deleted=已删除', + `install_count` INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '该机器累计激活次数', + `last_online_at` DATETIME DEFAULT NULL COMMENT '最后上线时间', + `installed_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '安装时间', + `deleted_at` DATETIME DEFAULT NULL COMMENT '删除时间', + `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_project_id` (`project_id`), + KEY `idx_status` (`status`), + KEY `idx_project_machine` (`project_id`,`machine_id`,`status`), + KEY `idx_card_id` (`card_id`), + KEY `idx_last_online` (`last_online_at`), + KEY `idx_deleted_at` (`deleted_at`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='安装记录表'; + +-- ============================================ +-- 13. 项目版本/安装包表 +-- ============================================ +DROP TABLE IF EXISTS `ca_project_versions`; +CREATE TABLE `ca_project_versions` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `project_id` BIGINT UNSIGNED NOT NULL COMMENT '所属项目ID', + `version` VARCHAR(50) NOT NULL COMMENT '版本号(如 1.2.0)', + `file_name` VARCHAR(255) NOT NULL COMMENT '原始文件名', + `file_path` VARCHAR(500) NOT NULL COMMENT '存储路径(相对public)', + `file_size` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '文件大小(字节)', + `checksum` VARCHAR(64) DEFAULT '' COMMENT 'SHA256', + `changelog` TEXT DEFAULT NULL COMMENT '更新说明', + `min_client_version` VARCHAR(50) DEFAULT '' COMMENT '强制更新最低版本(可空)', + `is_force` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否强制推送: 0=否, 1=是', + `is_latest` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '是否最新版本', + `download_count` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '下载次数', + `status` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '状态: 0=禁用, 1=正常', + `created_by` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '发布人ID', + `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_project_version` (`project_id`,`version`), + KEY `idx_project_id` (`project_id`), + KEY `idx_is_latest` (`project_id`,`is_latest`,`status`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='项目版本/安装包表'; \ No newline at end of file diff --git a/backend/public/uploads/packages/.gitkeep b/backend/public/uploads/packages/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/backend/routes/api.php b/backend/routes/api.php index 903d6a0..d502696 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -16,6 +16,8 @@ use App\Controllers\AuthorizationController; use App\Controllers\CouponController; use App\Controllers\BlacklistController; use App\Controllers\NotificationController; +use App\Controllers\InstallationController; +use App\Controllers\ProjectVersionController; use App\Middleware\AuthMiddleware; use App\Middleware\RateLimitMiddleware; use App\Middleware\ApiKeyMiddleware; @@ -41,6 +43,9 @@ $router->group('api/public', function ($router) { // 卡密查询 $router->get('cards/query', [PublicController::class, 'queryCard']); + // 支付方式(前台展示用) + $router->get('payment/options', [PublicController::class, 'paymentOptions']); + // 支付回调 $router->get('payment/notify', [PublicController::class, 'paymentNotify']); $router->post('payment/notify', [PublicController::class, 'paymentNotify']); @@ -65,6 +70,12 @@ $router->group('api/public/verify', function ($router) { $router->post('', [PublicController::class, 'verify']); }, [new ApiKeyMiddleware(), new RateLimitMiddleware(60, 60, 'verify')]); +// 安装上报/检查更新 (API Key认证) +$router->group('api/public/installations', function ($router) { + $router->post('check-update', [PublicController::class, 'checkUpdate']); + $router->post('heartbeat', [PublicController::class, 'heartbeat']); +}, [new ApiKeyMiddleware(), new RateLimitMiddleware(60, 60, 'install')]); + // ============================================ // 认证接口 (无需JWT) // ============================================ @@ -175,6 +186,24 @@ $router->group('api', function ($router) { $router->put('coupons/{id}', [CouponController::class, 'update']); $router->delete('coupons/{id}', [CouponController::class, 'delete']); + // 安装统计管理 (admin / project_admin / agent) + $router->get('installations', [InstallationController::class, 'list']); + $router->get('installations/stats', [InstallationController::class, 'stats']); + $router->get('installations/export', [InstallationController::class, 'export']); + $router->get('installations/{id}', [InstallationController::class, 'detail']); + $router->delete('installations/{id}', [InstallationController::class, 'delete']); + $router->post('installations/{id}/restore', [InstallationController::class, 'restore']); + $router->post('installations/batch-delete', [InstallationController::class, 'batchDelete']); + + // 项目版本/安装包管理 (发布仅 admin/project_admin; agent 只读) + $router->get('projects/{projectId}/versions', [ProjectVersionController::class, 'list']); + $router->get('projects/{projectId}/versions/{id}', [ProjectVersionController::class, 'detail']); + $router->post('projects/{projectId}/versions', [ProjectVersionController::class, 'create']); + $router->put('versions/{id}', [ProjectVersionController::class, 'update']); + $router->put('versions/{id}/force', [ProjectVersionController::class, 'toggleForce']); + $router->put('versions/{id}/latest', [ProjectVersionController::class, 'setLatest']); + $router->delete('versions/{id}', [ProjectVersionController::class, 'delete']); + // 黑名单管理(仅管理员) $router->group('blacklists', function ($router) { $router->get('', [BlacklistController::class, 'list']); diff --git a/frontend/src/api/installations.js b/frontend/src/api/installations.js new file mode 100644 index 0000000..7b0a8fb --- /dev/null +++ b/frontend/src/api/installations.js @@ -0,0 +1,36 @@ +import request from './index' + +/** + * 安装统计 API + */ +const installationApi = { + list(params) { + return request.get('/installations', { params }) + }, + stats(params) { + return request.get('/installations/stats', { params }) + }, + detail(id) { + return request.get(`/installations/${id}`) + }, + remove(id) { + return request.delete(`/installations/${id}`) + }, + restore(id) { + return request.post(`/installations/${id}/restore`) + }, + batchDelete(ids) { + return request.post('/installations/batch-delete', { ids }) + }, + exportUrl(params = {}) { + const q = new URLSearchParams() + Object.entries(params).forEach(([k, v]) => { + if (v !== '' && v !== null && v !== undefined) q.set(k, v) + }) + const token = localStorage.getItem('access_token') + if (token) q.set('token', token) + return `/api/installations/export?${q.toString()}` + } +} + +export default installationApi diff --git a/frontend/src/api/versions.js b/frontend/src/api/versions.js new file mode 100644 index 0000000..5736047 --- /dev/null +++ b/frontend/src/api/versions.js @@ -0,0 +1,33 @@ +import request from './index' + +/** + * 项目版本/安装包 API + */ +const versionApi = { + list(projectId, params) { + return request.get(`/projects/${projectId}/versions`, { params }) + }, + detail(projectId, id) { + return request.get(`/projects/${projectId}/versions/${id}`) + }, + create(projectId, formData) { + return request.post(`/projects/${projectId}/versions`, formData, { + headers: { 'Content-Type': 'multipart/form-data' }, + timeout: 300000 + }) + }, + update(id, data) { + return request.put(`/versions/${id}`, data) + }, + toggleForce(id, isForce) { + return request.put(`/versions/${id}/force`, { is_force: isForce }) + }, + setLatest(id) { + return request.put(`/versions/${id}/latest`) + }, + remove(id) { + return request.delete(`/versions/${id}`) + } +} + +export default versionApi diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index dcba581..e1e6af7 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -22,7 +22,6 @@ const routes = [ { path: '/', component: () => import('@/views/layout/MainLayout.vue'), - redirect: '/dashboard', children: [ { path: 'dashboard', @@ -78,6 +77,18 @@ const routes = [ component: () => import('@/views/Authorizations.vue'), meta: { title: '授权管理', icon: 'Lock' } }, + { + path: 'installations', + name: 'Installations', + component: () => import('@/views/Installations.vue'), + meta: { title: '安装统计', icon: 'Download' } + }, + { + path: 'project-versions', + name: 'ProjectVersions', + component: () => import('@/views/ProjectVersions.vue'), + meta: { title: '版本推送', icon: 'Upload' } + }, { path: 'coupons', name: 'Coupons', @@ -109,6 +120,18 @@ const routes = [ name: 'Shop', component: () => import('@/views/public/Shop.vue'), meta: { title: '购买中心' } + }, + { + path: '/docs', + name: 'IntroDocs', + component: () => import('@/views/public/Docs.vue'), + meta: { title: '系统介绍与使用文档' } + }, + { + path: '/result', + name: 'PaymentResult', + component: () => import('@/views/public/PaymentResult.vue'), + meta: { title: '支付结果' } } ] @@ -129,9 +152,14 @@ router.beforeEach((to, from, next) => { document.title = to.meta.title ? `${to.meta.title} - CardAuth` : 'CardAuth' const token = localStorage.getItem('access_token') const userRole = localStorage.getItem('user_role') - const publicPaths = ['/login', '/shop', '/agent/login', '/agent/register'] + const publicPaths = ['/login', '/shop', '/agent/login', '/agent/register', '/docs', '/result'] const isPublic = publicPaths.some(p => to.path.startsWith(p)) + // 首页一律显示介绍页;管理员可从介绍页顶部进入后台 + if (to.path === '/') { + return next('/docs') + } + // 未登录访问非公开页面 -> 登录页 if (!isPublic && !token) { return next('/login') diff --git a/frontend/src/views/Installations.vue b/frontend/src/views/Installations.vue new file mode 100644 index 0000000..a6c8bd1 --- /dev/null +++ b/frontend/src/views/Installations.vue @@ -0,0 +1,395 @@ + + + + + diff --git a/frontend/src/views/ProjectVersions.vue b/frontend/src/views/ProjectVersions.vue new file mode 100644 index 0000000..5ae042b --- /dev/null +++ b/frontend/src/views/ProjectVersions.vue @@ -0,0 +1,424 @@ + + + + + diff --git a/frontend/src/views/Projects.vue b/frontend/src/views/Projects.vue index a6282dd..784ddd3 100644 --- a/frontend/src/views/Projects.vue +++ b/frontend/src/views/Projects.vue @@ -59,10 +59,12 @@ - + @@ -113,6 +115,7 @@ + + diff --git a/frontend/src/views/public/Shop.vue b/frontend/src/views/public/Shop.vue index c1e224c..ebceca3 100644 --- a/frontend/src/views/public/Shop.vue +++ b/frontend/src/views/public/Shop.vue @@ -1,4 +1,4 @@ -