v1.2.0: 新增公告推送
- ca_announcements 表 + 管理端公告推送页 - 公开接口 GET /api/public/announcements (list/popup) - 支持置顶/弹窗/定时/对象筛选/关联项目 - 仅 admin/project_admin 可发布
This commit is contained in:
1 parent
74ccc193d2
commit
c64f46e2af
12 files changed
+811
-2
No files matched your search
@@ -1,5 +1,16 @@
|
||||
# 更新日志
|
||||
|
||||
## v1.2.0 (2026-10-10)
|
||||
|
||||
### 新增:公告推送
|
||||
- 新表 `ca_announcements`:标题/内容/类型/推送对象/置顶/弹窗/起止时间/关联项目
|
||||
- 管理端页面「公告推送」:发布、编辑、上线/下线、删除、批量删除
|
||||
- 公开接口 `GET /api/public/announcements`:客户端/商城拉取,返回 `list` + `popup`
|
||||
- 权限:admin / project_admin 可发布;project_admin 仅限绑定项目
|
||||
- 类型:系统 / 更新 / 活动 / 通知;对象:全部 / 管理端 / 代理端 / 客户端
|
||||
|
||||
---
|
||||
|
||||
## v1.1.1 (2026-10-08)
|
||||
|
||||
### 新增说明:自动发卡补丁(IPTV/App 直购)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
一个轻量级的卡密(激活码)+ 机器授权管理系统,支持多项目管理、代理分销、在线支付购买,适用于软件授权、会员激活等场景。
|
||||
|
||||
> **当前版本:v1.1.1** · 更新日志见 [CHANGELOG.md](./CHANGELOG.md)
|
||||
> **当前版本:v1.2.0** · 更新日志见 [CHANGELOG.md](./CHANGELOG.md)
|
||||
|
||||
## 界面预览
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
- 代理余额体系(充值记录、扣费追溯、额度查询)
|
||||
- 订单管理(代客手动完成 / 手动确认)
|
||||
- **自动发卡(IPTV/App 直购闭环)**:支付成功后自动从未用卡池取卡并绑定机器码(v1.1 补丁)
|
||||
- **公告推送(v1.2.0)**:管理端发布通知/更新/活动公告,支持置顶、定时、客户端弹窗
|
||||
- 在线购买商城(公开页面,支持 epay/codepay 支付回调)
|
||||
- **安装统计**:项目安装次数、存活/已删除、最后上线时间(v1.1.0)
|
||||
- **版本推送**:上传安装包并推送客户端下载,支持强制更新提示(v1.1.0)
|
||||
|
||||
@@ -0,0 +1,273 @@
|
||||
<?php
|
||||
namespace App\Controllers;
|
||||
|
||||
use App\Core\Controller;
|
||||
use App\Core\Database;
|
||||
use App\Core\Validator;
|
||||
|
||||
/**
|
||||
* 公告推送管理控制器
|
||||
*/
|
||||
class AnnouncementController extends Controller
|
||||
{
|
||||
/**
|
||||
* 公告列表(管理端)
|
||||
* GET /api/announcements
|
||||
*/
|
||||
public function list(): void
|
||||
{
|
||||
$db = Database::getInstance();
|
||||
$page = max(1, (int) ($_GET['page'] ?? 1));
|
||||
$pageSize = min((int) ($_GET['page_size'] ?? 20), 100);
|
||||
$offset = ($page - 1) * $pageSize;
|
||||
$keyword = trim($_GET['keyword'] ?? '');
|
||||
$type = $_GET['type'] ?? '';
|
||||
$target = $_GET['target'] ?? '';
|
||||
$status = $_GET['status'] ?? '';
|
||||
|
||||
$where = 'WHERE 1=1';
|
||||
$params = [];
|
||||
|
||||
if ($keyword !== '') {
|
||||
$where .= ' AND (title LIKE ? OR content LIKE ?)';
|
||||
$params[] = "%{$keyword}%";
|
||||
$params[] = "%{$keyword}%";
|
||||
}
|
||||
if ($type !== '' && in_array($type, ['system', 'update', 'promo', 'notice'], true)) {
|
||||
$where .= ' AND type = ?';
|
||||
$params[] = $type;
|
||||
}
|
||||
if ($target !== '' && in_array($target, ['all', 'admin', 'agent', 'client'], true)) {
|
||||
$where .= ' AND target = ?';
|
||||
$params[] = $target;
|
||||
}
|
||||
if ($status !== '') {
|
||||
$where .= ' AND status = ?';
|
||||
$params[] = (int) $status;
|
||||
}
|
||||
|
||||
$total = (int) $db->fetchColumn("SELECT COUNT(*) FROM {$db->table('announcements')} {$where}", $params);
|
||||
$list = $db->fetchAll(
|
||||
"SELECT * FROM {$db->table('announcements')} {$where}
|
||||
ORDER BY is_top DESC, id DESC
|
||||
LIMIT {$offset}, {$pageSize}",
|
||||
$params
|
||||
);
|
||||
|
||||
$this->success([
|
||||
'list' => $list,
|
||||
'total' => $total,
|
||||
'page' => $page,
|
||||
'page_size' => $pageSize,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建公告
|
||||
* POST /api/announcements
|
||||
*/
|
||||
public function create(): void
|
||||
{
|
||||
$role = $this->getUserRole();
|
||||
if (!in_array($role, ['admin', 'project_admin'], true)) {
|
||||
$this->error('仅管理员可发布公告', 403);
|
||||
}
|
||||
|
||||
$input = $this->getJsonInput();
|
||||
$validator = new Validator($input);
|
||||
if (!$validator->validate([
|
||||
'title' => 'required|min:1|max:200',
|
||||
'content' => 'required|min:1',
|
||||
])) {
|
||||
$this->error($validator->getFirstError());
|
||||
}
|
||||
|
||||
$type = in_array($input['type'] ?? '', ['system', 'update', 'promo', 'notice'], true)
|
||||
? $input['type'] : 'notice';
|
||||
$target = in_array($input['target'] ?? '', ['all', 'admin', 'agent', 'client'], true)
|
||||
? $input['target'] : 'all';
|
||||
$isTop = !empty($input['is_top']) ? 1 : 0;
|
||||
$isPopup = !empty($input['is_popup']) ? 1 : 0;
|
||||
$status = isset($input['status']) ? ((int) $input['status'] === 1 ? 1 : 0) : 1;
|
||||
$projectId = !empty($input['project_id']) ? (int) $input['project_id'] : null;
|
||||
$linkUrl = trim((string) ($input['link_url'] ?? ''));
|
||||
$startAt = !empty($input['start_at']) ? $input['start_at'] : null;
|
||||
$endAt = !empty($input['end_at']) ? $input['end_at'] : null;
|
||||
|
||||
// 项目管理员只能发到自己的项目
|
||||
if ($role === 'project_admin') {
|
||||
$user = $this->getCurrentUser();
|
||||
$projectIds = $user['project_ids'] ?? [];
|
||||
if ($projectId === null || !in_array($projectId, array_map('intval', $projectIds), true)) {
|
||||
$this->error('只能发布到您绑定的项目', 403);
|
||||
}
|
||||
}
|
||||
|
||||
$db = Database::getInstance();
|
||||
$id = $db->insert(
|
||||
"INSERT INTO {$db->table('announcements')}
|
||||
(title, content, type, target, project_id, is_top, is_popup, link_url, status, start_at, end_at, created_by)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
[
|
||||
trim($input['title']),
|
||||
$input['content'],
|
||||
$type,
|
||||
$target,
|
||||
$projectId,
|
||||
$isTop,
|
||||
$isPopup,
|
||||
$linkUrl,
|
||||
$status,
|
||||
$startAt,
|
||||
$endAt,
|
||||
(int) $this->getUserId(),
|
||||
]
|
||||
);
|
||||
|
||||
logger('announcement_create', 'announcement', $id, [
|
||||
'title' => $input['title'],
|
||||
'type' => $type,
|
||||
'target' => $target,
|
||||
]);
|
||||
|
||||
$row = $db->fetch("SELECT * FROM {$db->table('announcements')} WHERE id = ?", [$id]);
|
||||
$this->success($row, '公告发布成功');
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新公告
|
||||
* PUT /api/announcements/{id}
|
||||
*/
|
||||
public function update(int $id): void
|
||||
{
|
||||
$role = $this->getUserRole();
|
||||
if (!in_array($role, ['admin', 'project_admin'], true)) {
|
||||
$this->error('仅管理员可修改公告', 403);
|
||||
}
|
||||
|
||||
$db = Database::getInstance();
|
||||
$row = $db->fetch("SELECT * FROM {$db->table('announcements')} WHERE id = ?", [$id]);
|
||||
if (!$row) {
|
||||
$this->error('公告不存在', 404);
|
||||
}
|
||||
|
||||
if ($role === 'project_admin') {
|
||||
$user = $this->getCurrentUser();
|
||||
$projectIds = array_map('intval', $user['project_ids'] ?? []);
|
||||
if ($row['project_id'] === null || !in_array((int) $row['project_id'], $projectIds, true)) {
|
||||
$this->error('无权修改该公告', 403);
|
||||
}
|
||||
}
|
||||
|
||||
$input = $this->getJsonInput();
|
||||
$title = array_key_exists('title', $input) ? trim((string) $input['title']) : $row['title'];
|
||||
$content = array_key_exists('content', $input) ? (string) $input['content'] : $row['content'];
|
||||
if ($title === '' || $content === '') {
|
||||
$this->error('标题和内容不能为空');
|
||||
}
|
||||
|
||||
$type = array_key_exists('type', $input) && in_array($input['type'], ['system', 'update', 'promo', 'notice'], true)
|
||||
? $input['type'] : $row['type'];
|
||||
$target = array_key_exists('target', $input) && in_array($input['target'], ['all', 'admin', 'agent', 'client'], true)
|
||||
? $input['target'] : $row['target'];
|
||||
$isTop = array_key_exists('is_top', $input) ? (!empty($input['is_top']) ? 1 : 0) : (int) $row['is_top'];
|
||||
$isPopup = array_key_exists('is_popup', $input) ? (!empty($input['is_popup']) ? 1 : 0) : (int) $row['is_popup'];
|
||||
$status = array_key_exists('status', $input) ? ((int) $input['status'] === 1 ? 1 : 0) : (int) $row['status'];
|
||||
$linkUrl = array_key_exists('link_url', $input) ? trim((string) $input['link_url']) : ($row['link_url'] ?? '');
|
||||
$startAt = array_key_exists('start_at', $input) ? ($input['start_at'] ?: null) : $row['start_at'];
|
||||
$endAt = array_key_exists('end_at', $input) ? ($input['end_at'] ?: null) : $row['end_at'];
|
||||
|
||||
$db->execute(
|
||||
"UPDATE {$db->table('announcements')}
|
||||
SET title = ?, content = ?, type = ?, target = ?, is_top = ?, is_popup = ?,
|
||||
link_url = ?, status = ?, start_at = ?, end_at = ?
|
||||
WHERE id = ?",
|
||||
[$title, $content, $type, $target, $isTop, $isPopup, $linkUrl, $status, $startAt, $endAt, $id]
|
||||
);
|
||||
|
||||
logger('announcement_update', 'announcement', $id, ['title' => $title, 'status' => $status]);
|
||||
$this->success($db->fetch("SELECT * FROM {$db->table('announcements')} WHERE id = ?", [$id]), '更新成功');
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除公告
|
||||
* DELETE /api/announcements/{id}
|
||||
*/
|
||||
public function delete(int $id): void
|
||||
{
|
||||
$role = $this->getUserRole();
|
||||
if (!in_array($role, ['admin', 'project_admin'], true)) {
|
||||
$this->error('仅管理员可删除公告', 403);
|
||||
}
|
||||
|
||||
$db = Database::getInstance();
|
||||
$row = $db->fetch("SELECT id, title, project_id FROM {$db->table('announcements')} WHERE id = ?", [$id]);
|
||||
if (!$row) {
|
||||
$this->error('公告不存在', 404);
|
||||
}
|
||||
|
||||
if ($role === 'project_admin') {
|
||||
$user = $this->getCurrentUser();
|
||||
$projectIds = array_map('intval', $user['project_ids'] ?? []);
|
||||
if ($row['project_id'] === null || !in_array((int) $row['project_id'], $projectIds, true)) {
|
||||
$this->error('无权删除该公告', 403);
|
||||
}
|
||||
}
|
||||
|
||||
$db->execute("DELETE FROM {$db->table('announcements')} WHERE id = ?", [$id]);
|
||||
logger('announcement_delete', 'announcement', $id, ['title' => $row['title']]);
|
||||
$this->success(null, '公告已删除');
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
* POST /api/announcements/batch-delete
|
||||
*/
|
||||
public function batchDelete(): void
|
||||
{
|
||||
$role = $this->getUserRole();
|
||||
if (!in_array($role, ['admin', 'project_admin'], true)) {
|
||||
$this->error('仅管理员可删除公告', 403);
|
||||
}
|
||||
|
||||
$input = $this->getJsonInput();
|
||||
$ids = array_filter(array_map('intval', (array) ($input['ids'] ?? [])));
|
||||
if (empty($ids)) {
|
||||
$this->error('请选择要删除的公告');
|
||||
}
|
||||
|
||||
$db = Database::getInstance();
|
||||
$deleted = 0;
|
||||
foreach ($ids as $id) {
|
||||
$row = $db->fetch("SELECT id, project_id FROM {$db->table('announcements')} WHERE id = ?", [$id]);
|
||||
if (!$row) {
|
||||
continue;
|
||||
}
|
||||
if ($role === 'project_admin') {
|
||||
$user = $this->getCurrentUser();
|
||||
$projectIds = array_map('intval', $user['project_ids'] ?? []);
|
||||
if ($row['project_id'] === null || !in_array((int) $row['project_id'], $projectIds, true)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
$db->execute("DELETE FROM {$db->table('announcements')} WHERE id = ?", [$id]);
|
||||
$deleted++;
|
||||
}
|
||||
|
||||
$this->success(['deleted' => $deleted], "已删除 {$deleted} 条公告");
|
||||
}
|
||||
|
||||
/**
|
||||
* 公告详情
|
||||
* GET /api/announcements/{id}
|
||||
*/
|
||||
public function detail(int $id): void
|
||||
{
|
||||
$db = Database::getInstance();
|
||||
$row = $db->fetch("SELECT * FROM {$db->table('announcements')} WHERE id = ?", [$id]);
|
||||
if (!$row) {
|
||||
$this->error('公告不存在', 404);
|
||||
}
|
||||
$this->success($row);
|
||||
}
|
||||
}
|
||||
@@ -749,6 +749,50 @@ class PublicController extends Controller
|
||||
$this->success(['valid' => false, 'message' => '卡密状态异常'], 'ok');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取公告列表(公开/客户端)
|
||||
* GET /api/public/announcements?target=client&project_id=1&limit=10
|
||||
*/
|
||||
public function announcements(): void
|
||||
{
|
||||
$db = Database::getInstance();
|
||||
$target = trim((string) ($_GET['target'] ?? 'all'));
|
||||
$projectId = !empty($_GET['project_id']) ? (int) $_GET['project_id'] : null;
|
||||
$limit = min(max((int) ($_GET['limit'] ?? 10), 1), 50);
|
||||
|
||||
$where = "WHERE status = 1
|
||||
AND (start_at IS NULL OR start_at <= NOW())
|
||||
AND (end_at IS NULL OR end_at >= NOW())";
|
||||
$params = [];
|
||||
|
||||
if (in_array($target, ['admin', 'agent', 'client'], true)) {
|
||||
$where .= " AND (target = 'all' OR target = ?)";
|
||||
$params[] = $target;
|
||||
}
|
||||
|
||||
if ($projectId) {
|
||||
$where .= ' AND (project_id IS NULL OR project_id = ?)';
|
||||
$params[] = $projectId;
|
||||
}
|
||||
|
||||
$list = $db->fetchAll(
|
||||
"SELECT id, title, content, type, target, project_id, is_top, is_popup, link_url, created_at
|
||||
FROM {$db->table('announcements')}
|
||||
{$where}
|
||||
ORDER BY is_top DESC, id DESC
|
||||
LIMIT {$limit}",
|
||||
$params
|
||||
);
|
||||
|
||||
// 仅返回弹窗公告给客户端(方便一次拉取)
|
||||
$popup = array_values(array_filter($list, static fn (array $r): bool => (int) $r['is_popup'] === 1));
|
||||
|
||||
$this->success([
|
||||
'list' => $list,
|
||||
'popup' => $popup,
|
||||
], 'ok');
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询订单状态
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
-- 公告推送表
|
||||
CREATE TABLE IF NOT EXISTS `ca_announcements` (
|
||||
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`title` VARCHAR(200) NOT NULL COMMENT '公告标题',
|
||||
`content` TEXT NOT NULL COMMENT '公告内容',
|
||||
`type` ENUM('system','update','promo','notice') NOT NULL DEFAULT 'notice' COMMENT '类型: system=系统, update=更新, promo=活动, notice=通知',
|
||||
`target` ENUM('all','admin','agent','client') NOT NULL DEFAULT 'all' COMMENT '推送对象: all=全部, admin=管理端, agent=代理端, client=客户端',
|
||||
`project_id` BIGINT UNSIGNED DEFAULT NULL COMMENT '关联项目ID(空=全部项目)',
|
||||
`is_top` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否置顶: 0=否, 1=是',
|
||||
`is_popup` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '客户端是否弹窗: 0=否, 1=是',
|
||||
`link_url` VARCHAR(500) DEFAULT '' COMMENT '跳转链接(可空)',
|
||||
`status` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '状态: 0=草稿/下线, 1=发布中',
|
||||
`start_at` DATETIME DEFAULT NULL COMMENT '生效时间(空=立即)',
|
||||
`end_at` DATETIME DEFAULT NULL COMMENT '结束时间(空=永久)',
|
||||
`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`),
|
||||
KEY `idx_status` (`status`),
|
||||
KEY `idx_target` (`target`),
|
||||
KEY `idx_is_top` (`is_top`),
|
||||
KEY `idx_project_id` (`project_id`),
|
||||
KEY `idx_start_end` (`start_at`, `end_at`),
|
||||
KEY `idx_created_at` (`created_at`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='公告推送表';
|
||||
@@ -386,4 +386,33 @@ CREATE TABLE `ca_project_versions` (
|
||||
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='项目版本/安装包表';
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='项目版本/安装包表';
|
||||
|
||||
-- ============================================
|
||||
-- 14. 公告推送表
|
||||
-- ============================================
|
||||
DROP TABLE IF EXISTS `ca_announcements`;
|
||||
CREATE TABLE `ca_announcements` (
|
||||
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`title` VARCHAR(200) NOT NULL COMMENT '公告标题',
|
||||
`content` TEXT NOT NULL COMMENT '公告内容',
|
||||
`type` ENUM('system','update','promo','notice') NOT NULL DEFAULT 'notice' COMMENT '类型: system=系统, update=更新, promo=活动, notice=通知',
|
||||
`target` ENUM('all','admin','agent','client') NOT NULL DEFAULT 'all' COMMENT '推送对象: all=全部, admin=管理端, agent=代理端, client=客户端',
|
||||
`project_id` BIGINT UNSIGNED DEFAULT NULL COMMENT '关联项目ID(空=全部项目)',
|
||||
`is_top` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否置顶: 0=否, 1=是',
|
||||
`is_popup` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '客户端是否弹窗: 0=否, 1=是',
|
||||
`link_url` VARCHAR(500) DEFAULT '' COMMENT '跳转链接(可空)',
|
||||
`status` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '状态: 0=草稿/下线, 1=发布中',
|
||||
`start_at` DATETIME DEFAULT NULL COMMENT '生效时间(空=立即)',
|
||||
`end_at` DATETIME DEFAULT NULL COMMENT '结束时间(空=永久)',
|
||||
`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`),
|
||||
KEY `idx_status` (`status`),
|
||||
KEY `idx_target` (`target`),
|
||||
KEY `idx_is_top` (`is_top`),
|
||||
KEY `idx_project_id` (`project_id`),
|
||||
KEY `idx_start_end` (`start_at`, `end_at`),
|
||||
KEY `idx_created_at` (`created_at`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='公告推送表';
|
||||
@@ -18,6 +18,7 @@ use App\Controllers\BlacklistController;
|
||||
use App\Controllers\NotificationController;
|
||||
use App\Controllers\InstallationController;
|
||||
use App\Controllers\ProjectVersionController;
|
||||
use App\Controllers\AnnouncementController;
|
||||
use App\Middleware\AuthMiddleware;
|
||||
use App\Middleware\RateLimitMiddleware;
|
||||
use App\Middleware\ApiKeyMiddleware;
|
||||
@@ -43,6 +44,9 @@ $router->group('api/public', function ($router) {
|
||||
// 卡密查询
|
||||
$router->get('cards/query', [PublicController::class, 'queryCard']);
|
||||
|
||||
// 公告推送(客户端/商城)
|
||||
$router->get('announcements', [PublicController::class, 'announcements']);
|
||||
|
||||
// 支付方式(前台展示用)
|
||||
$router->get('payment/options', [PublicController::class, 'paymentOptions']);
|
||||
|
||||
@@ -204,6 +208,15 @@ $router->group('api', function ($router) {
|
||||
$router->put('versions/{id}/latest', [ProjectVersionController::class, 'setLatest']);
|
||||
$router->delete('versions/{id}', [ProjectVersionController::class, 'delete']);
|
||||
|
||||
// 公告推送管理 (admin / project_admin 发布; 代理只读不可见菜单)
|
||||
$router->get('announcements', [AnnouncementController::class, 'list']);
|
||||
$router->get('announcements/stats', [AnnouncementController::class, 'list']);
|
||||
$router->get('announcements/{id}', [AnnouncementController::class, 'detail']);
|
||||
$router->post('announcements', [AnnouncementController::class, 'create']);
|
||||
$router->put('announcements/{id}', [AnnouncementController::class, 'update']);
|
||||
$router->delete('announcements/{id}', [AnnouncementController::class, 'delete']);
|
||||
$router->post('announcements/batch-delete', [AnnouncementController::class, 'batchDelete']);
|
||||
|
||||
// 黑名单管理(仅管理员)
|
||||
$router->group('blacklists', function ($router) {
|
||||
$router->get('', [BlacklistController::class, 'list']);
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import request from './index'
|
||||
|
||||
/**
|
||||
* 公告推送 API
|
||||
*/
|
||||
const announcementApi = {
|
||||
list(params) {
|
||||
return request.get('/announcements', { params })
|
||||
},
|
||||
detail(id) {
|
||||
return request.get(`/announcements/${id}`)
|
||||
},
|
||||
create(data) {
|
||||
return request.post('/announcements', data)
|
||||
},
|
||||
update(id, data) {
|
||||
return request.put(`/announcements/${id}`, data)
|
||||
},
|
||||
remove(id) {
|
||||
return request.delete(`/announcements/${id}`)
|
||||
},
|
||||
batchDelete(ids) {
|
||||
return request.post('/announcements/batch-delete', { ids })
|
||||
},
|
||||
/** 公开接口(客户端/商城) */
|
||||
public(params) {
|
||||
return request.get('/public/announcements', { params })
|
||||
}
|
||||
}
|
||||
|
||||
export default announcementApi
|
||||
@@ -89,6 +89,12 @@ const routes = [
|
||||
component: () => import('@/views/ProjectVersions.vue'),
|
||||
meta: { title: '版本推送', icon: 'Upload' }
|
||||
},
|
||||
{
|
||||
path: 'announcements',
|
||||
name: 'Announcements',
|
||||
component: () => import('@/views/Announcements.vue'),
|
||||
meta: { title: '公告推送', icon: 'Bell' }
|
||||
},
|
||||
{
|
||||
path: 'coupons',
|
||||
name: 'Coupons',
|
||||
|
||||
@@ -0,0 +1,370 @@
|
||||
<template>
|
||||
<div class="announcements-page">
|
||||
<el-card shadow="never" class="main-card">
|
||||
<div class="page-header">
|
||||
<div>
|
||||
<div class="page-title">公告推送</div>
|
||||
<div class="page-sub">发布系统通知/更新/活动公告,客户端与商城可拉取;支持置顶与弹窗</div>
|
||||
</div>
|
||||
<div class="header-actions">
|
||||
<el-button type="primary" :icon="Plus" @click="openCreate">发布公告</el-button>
|
||||
<el-button type="danger" :icon="Delete" :disabled="!selected.length" @click="batchRemove">
|
||||
批量删除 ({{ selected.length }})
|
||||
</el-button>
|
||||
<el-button :icon="Refresh" circle @click="refresh" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="toolbar">
|
||||
<el-input v-model="filters.keyword" placeholder="标题/内容" clearable style="width: 200px" @clear="handleSearch" @keyup.enter="handleSearch" />
|
||||
<el-select v-model="filters.type" placeholder="全部类型" clearable style="width: 120px" @change="handleSearch">
|
||||
<el-option label="系统" value="system" />
|
||||
<el-option label="更新" value="update" />
|
||||
<el-option label="活动" value="promo" />
|
||||
<el-option label="通知" value="notice" />
|
||||
</el-select>
|
||||
<el-select v-model="filters.target" placeholder="推送对象" clearable style="width: 120px" @change="handleSearch">
|
||||
<el-option label="全部" value="all" />
|
||||
<el-option label="管理端" value="admin" />
|
||||
<el-option label="代理端" value="agent" />
|
||||
<el-option label="客户端" value="client" />
|
||||
</el-select>
|
||||
<el-select v-model="filters.status" placeholder="状态" clearable style="width: 110px" @change="handleSearch">
|
||||
<el-option label="发布中" :value="1" />
|
||||
<el-option label="已下线" :value="0" />
|
||||
</el-select>
|
||||
<el-button type="primary" :icon="Search" @click="handleSearch">搜索</el-button>
|
||||
</div>
|
||||
|
||||
<el-table :data="list" v-loading="loading" stripe border row-key="id" class="data-table" @selection-change="onSelect" :max-height="520">
|
||||
<el-table-column type="selection" width="50" align="center" fixed="left" />
|
||||
<el-table-column prop="id" label="ID" width="70" align="center" />
|
||||
<el-table-column prop="title" label="标题" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.is_top == 1" type="warning" size="small" style="margin-right:6px">置顶</el-tag>
|
||||
<span class="title-text">{{ row.title }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="type" label="类型" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="typeTag(row.type)" size="small">{{ typeLabel(row.type) }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="target" label="对象" width="90" align="center">
|
||||
<template #default="{ row }">{{ targetLabel(row.target) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="is_popup" label="弹窗" width="80" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.is_popup == 1 ? 'danger' : 'info'" size="small">{{ row.is_popup == 1 ? '是' : '否' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="status" label="状态" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.status == 1 ? 'success' : 'info'" size="small">{{ row.status == 1 ? '发布中' : '下线' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="created_at" label="发布时间" width="170">
|
||||
<template #default="{ row }">{{ formatBj(row.created_at) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="180" fixed="right" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-button size="small" type="primary" link @click="openEdit(row)">编辑</el-button>
|
||||
<el-button size="small" :type="row.status == 1 ? 'warning' : 'success'" link @click="toggleStatus(row)">
|
||||
{{ row.status == 1 ? '下线' : '上线' }}
|
||||
</el-button>
|
||||
<el-button size="small" type="danger" link @click="removeOne(row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<div class="pagination-wrapper">
|
||||
<el-pagination
|
||||
v-model:current-page="page"
|
||||
v-model:page-size="pageSize"
|
||||
:page-sizes="[10, 20, 50]"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="fetchList"
|
||||
@current-change="fetchList"
|
||||
/>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<!-- 创建/编辑 -->
|
||||
<el-dialog v-model="dialogVisible" :title="isEdit ? '编辑公告' : '发布公告'" width="640px" :close-on-click-modal="false" destroy-on-close>
|
||||
<el-form ref="formRef" :model="form" :rules="rules" label-width="90px">
|
||||
<el-form-item label="标题" prop="title">
|
||||
<el-input v-model="form.title" maxlength="200" show-word-limit placeholder="公告标题" />
|
||||
</el-form-item>
|
||||
<el-form-item label="内容" prop="content">
|
||||
<el-input v-model="form.content" type="textarea" :rows="6" maxlength="2000" show-word-limit placeholder="公告正文,支持换行" />
|
||||
</el-form-item>
|
||||
<el-form-item label="类型">
|
||||
<el-select v-model="form.type" style="width: 160px">
|
||||
<el-option label="通知" value="notice" />
|
||||
<el-option label="系统" value="system" />
|
||||
<el-option label="更新" value="update" />
|
||||
<el-option label="活动" value="promo" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="推送对象">
|
||||
<el-select v-model="form.target" style="width: 160px">
|
||||
<el-option label="全部" value="all" />
|
||||
<el-option label="管理端" value="admin" />
|
||||
<el-option label="代理端" value="agent" />
|
||||
<el-option label="客户端" value="client" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="关联项目">
|
||||
<el-select v-model="form.project_id" placeholder="全部项目" clearable style="width: 200px">
|
||||
<el-option v-for="p in projects" :key="p.id" :label="p.name" :value="p.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="选项">
|
||||
<el-checkbox v-model="form.is_top" :true-value="1" :false-value="0">置顶</el-checkbox>
|
||||
<el-checkbox v-model="form.is_popup" :true-value="1" :false-value="0" style="margin-left:16px">客户端弹窗</el-checkbox>
|
||||
<el-checkbox v-model="form.status" :true-value="1" :false-value="0" style="margin-left:16px">立即发布</el-checkbox>
|
||||
</el-form-item>
|
||||
<el-form-item label="跳转链接">
|
||||
<el-input v-model="form.link_url" placeholder="选填,https://..." />
|
||||
</el-form-item>
|
||||
<el-form-item label="起止时间">
|
||||
<el-date-picker
|
||||
v-model="timeRange"
|
||||
type="datetimerange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始(空=立即)"
|
||||
end-placeholder="结束(空=永久)"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="submitting" @click="submit">{{ isEdit ? '保存' : '发布' }}</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { Plus, Delete, Refresh, Search } from '@element-plus/icons-vue'
|
||||
import request from '@/api'
|
||||
import announcementApi from '@/api/announcements'
|
||||
|
||||
const list = ref([])
|
||||
const loading = ref(false)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(20)
|
||||
const total = ref(0)
|
||||
const selected = ref([])
|
||||
const projects = ref([])
|
||||
|
||||
const filters = ref({ keyword: '', type: '', target: '', status: '' })
|
||||
|
||||
const dialogVisible = ref(false)
|
||||
const isEdit = ref(false)
|
||||
const editingId = ref(null)
|
||||
const submitting = ref(false)
|
||||
const formRef = ref(null)
|
||||
const timeRange = ref(null)
|
||||
const form = ref({
|
||||
title: '',
|
||||
content: '',
|
||||
type: 'notice',
|
||||
target: 'all',
|
||||
project_id: null,
|
||||
is_top: 0,
|
||||
is_popup: 0,
|
||||
status: 1,
|
||||
link_url: ''
|
||||
})
|
||||
const rules = {
|
||||
title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
|
||||
content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
|
||||
}
|
||||
|
||||
function formatBj(value) {
|
||||
if (!value || value === '0000-00-00 00:00:00') return '-'
|
||||
const raw = String(value).trim()
|
||||
if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(raw)) return raw
|
||||
const d = new Date(raw.includes('T') || raw.includes('+') || raw.includes('Z') ? raw : raw.replace(' ', 'T') + '+08:00')
|
||||
if (Number.isNaN(d.getTime())) return raw
|
||||
const pad = n => String(n).padStart(2, '0')
|
||||
const bj = new Date(d.getTime() + 8 * 3600 * 1000)
|
||||
return `${bj.getUTCFullYear()}-${pad(bj.getUTCMonth() + 1)}-${pad(bj.getUTCDate())} ${pad(bj.getUTCHours())}:${pad(bj.getUTCMinutes())}:${pad(bj.getUTCSeconds())}`
|
||||
}
|
||||
|
||||
function typeLabel(t) {
|
||||
return ({ system: '系统', update: '更新', promo: '活动', notice: '通知' })[t] || t
|
||||
}
|
||||
function typeTag(t) {
|
||||
return ({ system: 'primary', update: 'success', promo: 'danger', notice: 'info' })[t] || 'info'
|
||||
}
|
||||
function targetLabel(t) {
|
||||
return ({ all: '全部', admin: '管理端', agent: '代理端', client: '客户端' })[t] || t
|
||||
}
|
||||
|
||||
async function fetchProjects() {
|
||||
try {
|
||||
const res = await request.get('/projects/all')
|
||||
let data = res.data.list || res.data || []
|
||||
projects.value = Array.isArray(data) ? data : []
|
||||
} catch {
|
||||
projects.value = []
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchList() {
|
||||
loading.value = true
|
||||
try {
|
||||
const params = {
|
||||
page: page.value,
|
||||
page_size: pageSize.value,
|
||||
keyword: filters.value.keyword || '',
|
||||
type: filters.value.type || '',
|
||||
target: filters.value.target || '',
|
||||
status: filters.value.status === '' ? '' : filters.value.status
|
||||
}
|
||||
Object.keys(params).forEach(k => {
|
||||
if (params[k] === '' || params[k] === null || params[k] === undefined) delete params[k]
|
||||
})
|
||||
const res = await announcementApi.list(params)
|
||||
list.value = res.data.list || []
|
||||
total.value = res.data.total || 0
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function refresh() {
|
||||
page.value = 1
|
||||
fetchList()
|
||||
}
|
||||
function handleSearch() {
|
||||
refresh()
|
||||
}
|
||||
function onSelect(rows) {
|
||||
selected.value = rows
|
||||
}
|
||||
|
||||
function resetForm() {
|
||||
form.value = {
|
||||
title: '', content: '', type: 'notice', target: 'all', project_id: null,
|
||||
is_top: 0, is_popup: 0, status: 1, link_url: ''
|
||||
}
|
||||
timeRange.value = null
|
||||
}
|
||||
|
||||
function openCreate() {
|
||||
isEdit.value = false
|
||||
editingId.value = null
|
||||
resetForm()
|
||||
dialogVisible.value = true
|
||||
}
|
||||
|
||||
function openEdit(row) {
|
||||
isEdit.value = true
|
||||
editingId.value = row.id
|
||||
form.value = {
|
||||
title: row.title,
|
||||
content: row.content,
|
||||
type: row.type,
|
||||
target: row.target,
|
||||
project_id: row.project_id ? Number(row.project_id) : null,
|
||||
is_top: Number(row.is_top) || 0,
|
||||
is_popup: Number(row.is_popup) || 0,
|
||||
status: Number(row.status) || 0,
|
||||
link_url: row.link_url || ''
|
||||
}
|
||||
timeRange.value = row.start_at || row.end_at ? [row.start_at, row.end_at] : null
|
||||
dialogVisible.value = true
|
||||
}
|
||||
|
||||
async function submit() {
|
||||
if (!formRef.value) return
|
||||
await formRef.value.validate(async valid => {
|
||||
if (!valid) return
|
||||
submitting.value = true
|
||||
try {
|
||||
const payload = {
|
||||
...form.value,
|
||||
start_at: timeRange.value?.[0] || null,
|
||||
end_at: timeRange.value?.[1] || null
|
||||
}
|
||||
if (isEdit.value) {
|
||||
await announcementApi.update(editingId.value, payload)
|
||||
ElMessage.success('更新成功')
|
||||
} else {
|
||||
await announcementApi.create(payload)
|
||||
ElMessage.success('公告发布成功')
|
||||
}
|
||||
dialogVisible.value = false
|
||||
fetchList()
|
||||
} catch {} finally {
|
||||
submitting.value = false
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
async function toggleStatus(row) {
|
||||
try {
|
||||
const next = row.status == 1 ? 0 : 1
|
||||
await announcementApi.update(row.id, { status: next })
|
||||
ElMessage.success(next === 1 ? '已上线' : '已下线')
|
||||
fetchList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
async function removeOne(row) {
|
||||
try {
|
||||
await ElMessageBox.confirm(`确定删除公告「${row.title}」?`, '提示', { type: 'warning' })
|
||||
await announcementApi.remove(row.id)
|
||||
ElMessage.success('已删除')
|
||||
fetchList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
async function batchRemove() {
|
||||
if (!selected.value.length) return
|
||||
try {
|
||||
await ElMessageBox.confirm(`确定删除选中的 ${selected.value.length} 条公告?`, '批量删除', { type: 'warning' })
|
||||
await announcementApi.batchDelete(selected.value.map(r => r.id))
|
||||
ElMessage.success('批量删除成功')
|
||||
selected.value = []
|
||||
fetchList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
fetchProjects()
|
||||
fetchList()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.announcements-page { max-width: 1600px; margin: 0 auto; }
|
||||
.main-card { border-radius: 16px; border: 1px solid #f0f0f4; }
|
||||
.main-card:deep(.el-card__body) { padding: 24px; }
|
||||
.page-header { display: flex; justify-content: space-between; align-items: flex-start; margin-bottom: 16px; flex-wrap: wrap; gap: 12px; }
|
||||
.page-title { font-size: 18px; font-weight: 700; color: #1d1d1f; }
|
||||
.page-sub { font-size: 13px; color: #9ca3af; margin-top: 4px; }
|
||||
.header-actions { display: flex; gap: 10px; align-items: center; }
|
||||
.header-actions :deep(.el-button) { border-radius: 10px; font-weight: 500; }
|
||||
.toolbar { display: flex; flex-wrap: wrap; gap: 10px; margin-bottom: 16px; }
|
||||
.toolbar :deep(.el-button) { border-radius: 10px; }
|
||||
.data-table { border-radius: 12px; overflow: hidden; }
|
||||
.data-table:deep(.el-table__header th) { background: #f8f9fb; font-weight: 600; color: #374151; font-size: 13px; border-color: #f0f0f4; }
|
||||
.data-table:deep(.el-table__body td) { font-size: 13px; color: #374151; border-color: #f5f5f7; }
|
||||
.title-text { color: #1d1d1f; font-weight: 500; }
|
||||
.pagination-wrapper { margin-top: 16px; display: flex; justify-content: flex-end; }
|
||||
@media (max-width: 768px) {
|
||||
.main-card:deep(.el-card__body) { padding: 14px; }
|
||||
.header-actions { width: 100%; flex-wrap: wrap; }
|
||||
}
|
||||
</style>
|
||||
@@ -71,6 +71,10 @@
|
||||
<el-icon><Upload /></el-icon>
|
||||
<span>版本推送</span>
|
||||
</el-menu-item>
|
||||
<el-menu-item index="/announcements" v-if="canManage">
|
||||
<el-icon><Bell /></el-icon>
|
||||
<span>公告推送</span>
|
||||
</el-menu-item>
|
||||
</el-sub-menu>
|
||||
|
||||
<!-- 代理业务 -->
|
||||
@@ -477,6 +481,7 @@ const parentMap = {
|
||||
'/authorizations': [{ path: '/dashboard', title: '业务管理' }],
|
||||
'/installations': [{ path: '/dashboard', title: '业务管理' }],
|
||||
'/project-versions': [{ path: '/dashboard', title: '业务管理' }],
|
||||
'/announcements': [{ path: '/dashboard', title: '业务管理' }],
|
||||
'/orders': [{ path: '/dashboard', title: '订单与代理' }],
|
||||
'/coupons': [{ path: '/dashboard', title: '订单与代理' }],
|
||||
'/blacklist': [{ path: '/dashboard', title: '订单与代理' }],
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
<li><b>安装统计</b>:记录安装次数、存活/已删除、最后上线时间</li>
|
||||
<li><b>版本推送</b>:上传安装包并推送客户端下载,支持强制更新提示</li>
|
||||
<li><b>自动发卡</b>:App/IPTV 支付成功后从未用卡池自动取卡并绑定机器码</li>
|
||||
<li><b>公告推送</b>:管理端发布通知,客户端可拉取列表/弹窗公告</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in new issue
Block a user