服务公告与使用提醒
-这里汇总近期公告、维护安排和重要变更。使用前建议先查看最新公告,避免错过服务相关调整。
-diff --git a/docs/DEPLOYMENT.md b/docs/DEPLOYMENT.md index cb0d69a6..3a8d8924 100644 --- a/docs/DEPLOYMENT.md +++ b/docs/DEPLOYMENT.md @@ -56,6 +56,8 @@ php xcat createAdmin `cloudInit` 新建云业务/指标表、生成独立签名和加密密钥及 `runtime/engine.json`,不连接宿主机。按 CLI 提示创建管理员,邮箱应真实可用;核对 `super_admin` UID 包含有宿主机管理权限的管理员。 +公告纯文本升级也由 `cloudInit` 显式执行:为当前空的 `announcement` 旧表添加标题、类型、正文和发布状态,移除旧 `date` / `content` / `markdown` 字段,不包含历史富文本转换。若检测到旧表仍有记录,会在修改公告表结构前停止并提示,不自动删除旧记录。迁移可重复运行,不会覆盖新结构中的公告或重新发布已撤下的公告;HTTP 请求不执行数据库结构变更。手动升级须在维护窗口备份数据库、停止 PHP-FPM 等旧版本公告写入入口,拉取代码并执行 `php xcat cloudInit` 成功后再恢复服务,避免空表检查期间出现并发写入;在线更新器会自动停服务并执行该步骤。用户改从顶栏公告按钮查看已发布内容,原 `/user/announcement` 页面和旧管理端删除/AJAX 接口已移除;后台“撤下”不删除记录。 + 数据库或内省 URL 修改后重新导出并重启引擎(保留现有密钥): ```bash diff --git a/web/app/Command/CloudSetup.php b/web/app/Command/CloudSetup.php index 28476825..789d7e85 100644 --- a/web/app/Command/CloudSetup.php +++ b/web/app/Command/CloudSetup.php @@ -4,6 +4,7 @@ namespace App\Command; use App\Models\User; use App\Services\Config; +use App\Services\AnnouncementSchema; /** Explicit local initialization; never connects to or changes a hypervisor. */ final class CloudSetup @@ -20,6 +21,7 @@ final class CloudSetup if (!$connection->getSchemaBuilder()->hasTable('user') || !$connection->getSchemaBuilder()->hasTable('shop')) { throw new \RuntimeException('请先在全新业务数据库导入 web/sql/ss.sql'); } + AnnouncementSchema::upgrade($connection); self::retireLegacyBought($connection); $connection->unprepared(self::schema('cloud.sql')); $column = $connection->selectOne( diff --git a/web/app/Controllers/Admin/AnnController.php b/web/app/Controllers/Admin/AnnController.php index 1b4c6f46..73a9f95c 100644 --- a/web/app/Controllers/Admin/AnnController.php +++ b/web/app/Controllers/Admin/AnnController.php @@ -2,137 +2,114 @@ namespace App\Controllers\Admin; -use App\Models\Ann; use App\Controllers\AdminController; -use App\Services\AdminPermission; -use App\Utils\SafeDatatables as Datatables; -use App\Utils\DatatablesHelper; +use App\Services\AnnouncementService; +use App\Services\Cloud\CloudAccess; +use App\Services\Cloud\CloudError; class AnnController extends AdminController { public function index($request, $response, $args) { - $table_config['total_column'] = array("op" => "操作", "id" => "ID", - "date" => "日期", "content" => "内容"); - $table_config['default_show_column'] = array("op", "id", - "date", "content"); - $table_config['ajax_url'] = 'announcement/ajax'; - return $this->view()->assign('table_config', $table_config)->display('admin/announcement/index.tpl'); + try { + $actor = CloudAccess::actor(false); + AnnouncementService::authorize($actor); + } catch (CloudError $exception) { + return $response->withStatus($exception->httpStatus)->withHeader('Cache-Control', 'private, no-store'); + } + $page = null; + $error = ''; + $status = 200; + try { + $page = AnnouncementService::page($actor, $request->getQueryParams()); + } catch (CloudError $exception) { + $error = $exception->getMessage(); + $status = $exception->httpStatus; + } catch (\Throwable $exception) { + error_log('Announcement list failed: ' . get_class($exception)); + $error = '公告暂时无法读取,请确认已执行 cloudInit 后重试。'; + $status = 503; + } + return $this->render($response, 'admin/announcement/index.tpl', [ + 'announcements_page' => $page, 'announcements_error' => $error, + 'announcement_can_manage' => (bool) ($actor['is_super_admin'] && $actor['can_manage']), + ], $status); } public function create($request, $response, $args) { - return $this->view()->display('admin/announcement/create.tpl'); + try { + AnnouncementService::authorize(CloudAccess::actor(false), true); + } catch (CloudError $exception) { + return $response->withStatus($exception->httpStatus)->withHeader('Cache-Control', 'private, no-store'); + } + return $this->render($response, 'admin/announcement/create.tpl', [ + 'announcement' => ['id' => '', 'title' => '', 'type' => 'notice', 'type_label' => '通知', + 'body' => '', 'status' => 'published', 'published_at' => null, 'updated_at' => ''], + 'announcement_can_manage' => true, + ]); } public function add($request, $response, $args) { - - if (AdminPermission::isSuperAdmin()) { - - $ann = new Ann(); - $ann->date = date("Y-m-d H:i:s"); - $ann->content = $request->getParam('content'); - $ann->markdown = $request->getParam('markdown'); - - if (!$ann->save()) { - $rs['ret'] = 0; - $rs['msg'] = "添加失败"; - return $response->getBody()->write(json_encode($rs)); - } - - - $rs['ret'] = 1; - $rs['msg'] = "公告添加成功"; - - return $response->getBody()->write(json_encode($rs)); - - } else { - $rs['ret'] = 0; - $rs['msg'] = "你没有添加公告权限"; - return $response->getBody()->write(json_encode($rs)); - } + return $this->write($request, $response, null, false); } public function edit($request, $response, $args) { - $id = $args['id']; - $ann = Ann::find($id); - if ($ann == null) { + try { + $actor = CloudAccess::actor(false); + AnnouncementService::authorize($actor, true); + $announcement = AnnouncementService::detail($actor, (string) ($args['id'] ?? '')); + } catch (CloudError $exception) { + return $response->withStatus($exception->httpStatus)->withHeader('Cache-Control', 'private, no-store'); + } catch (\Throwable $exception) { + error_log('Announcement detail failed: ' . get_class($exception)); + return $response->withStatus(503)->withHeader('Cache-Control', 'private, no-store'); } - return $this->view()->assign('ann', $ann)->display('admin/announcement/edit.tpl'); + return $this->render($response, 'admin/announcement/edit.tpl', [ + 'announcement' => $announcement, 'announcement_can_manage' => true, + ]); } public function update($request, $response, $args) { - - if (AdminPermission::isSuperAdmin()) { - - $id = $args['id']; - $ann = Ann::find($id); - - $ann->content = $request->getParam('content'); - $ann->markdown = $request->getParam('markdown'); - $ann->date = date("Y-m-d H:i:s"); - - if (!$ann->save()) { - $rs['ret'] = 0; - $rs['msg'] = "修改失败"; - return $response->getBody()->write(json_encode($rs)); - } - - - $rs['ret'] = 1; - $rs['msg'] = "修改成功"; - return $response->getBody()->write(json_encode($rs)); - } else { - $rs['ret'] = 0; - $rs['msg'] = "你没有修改公告权限"; - return $response->getBody()->write(json_encode($rs)); - } + return $this->write($request, $response, (string) ($args['id'] ?? ''), false); } - public function delete($request, $response, $args) + public function status($request, $response, $args) { - - if (AdminPermission::isSuperAdmin()) { - - $id = $request->getParam('id'); - $ann = Ann::find($id); - - if (!$ann->delete()) { - $rs['ret'] = 0; - $rs['msg'] = "删除失败"; - return $response->getBody()->write(json_encode($rs)); - } - $rs['ret'] = 1; - $rs['msg'] = "删除成功"; - return $response->getBody()->write(json_encode($rs)); - } else { - $rs['ret'] = 0; - $rs['msg'] = "你没有删除公告权限"; - return $response->getBody()->write(json_encode($rs)); - } + return $this->write($request, $response, (string) ($args['id'] ?? ''), true); } - public function ajax($request, $response, $args) + private function write($request, $response, ?string $id, bool $statusOnly) { - $datatables = new Datatables(new DatatablesHelper()); - $datatables->query('Select id as op,id,date,content from announcement'); - - $datatables->edit('op', function ($data) { - if (!AdminPermission::isSuperAdmin()) { - return '只读'; + try { + $actor = CloudAccess::actor(false); + AnnouncementService::authorize($actor, true); + $input = $request->getParsedBody(); + if (!is_array($input)) { + throw new CloudError('公告请求格式不正确', 400); } - return '编辑 - 删除'; - }); - - $datatables->edit('DT_RowId', function ($data) { - return 'row_1_'.$data['id']; - }); + $announcement = $statusOnly + ? AnnouncementService::setStatus($actor, $id, $input) + : AnnouncementService::save($actor, $input, $id); + $message = $statusOnly ? ($announcement['status'] === 'published' ? '公告已发布' : '公告已撤下') : '公告已保存'; + return $response->withJson(['ret' => 1, 'msg' => $message, 'announcement' => $announcement]) + ->withHeader('Cache-Control', 'private, no-store'); + } catch (CloudError $exception) { + return $response->withJson(['ret' => 0, 'msg' => $exception->getMessage()], $exception->httpStatus) + ->withHeader('Cache-Control', 'private, no-store'); + } catch (\Throwable $exception) { + error_log('Announcement write failed: ' . get_class($exception)); + return $response->withJson(['ret' => 0, 'msg' => '公告保存失败,请稍后重试。'], 500) + ->withHeader('Cache-Control', 'private, no-store'); + } + } - $body = $response->getBody(); - $body->write($datatables->generate()); + private function render($response, string $template, array $data, int $status = 200) + { + $response->getBody()->write($this->view()->assign($data)->fetch($template)); + return $response->withStatus($status)->withHeader('Cache-Control', 'private, no-store'); } } diff --git a/web/app/Controllers/AnnouncementController.php b/web/app/Controllers/AnnouncementController.php new file mode 100644 index 00000000..ce6677ff --- /dev/null +++ b/web/app/Controllers/AnnouncementController.php @@ -0,0 +1,17 @@ +withJson(AnnouncementService::published( + $request->getAttribute('cloud_actor') ?? CloudAccess::actor(false), $request->getQueryParams() + ))->withHeader('Cache-Control', 'private, no-store'); + } +} diff --git a/web/app/Controllers/UserController.php b/web/app/Controllers/UserController.php index 909e63b3..958bc366 100644 --- a/web/app/Controllers/UserController.php +++ b/web/app/Controllers/UserController.php @@ -4,7 +4,6 @@ namespace App\Controllers; use App\Services\Auth; use App\Models\InviteCode; -use App\Models\Ann; use App\Models\Shop; use App\Models\Coupon; use App\Models\CloudInvoice; @@ -304,22 +303,6 @@ class UserController extends BaseController } } - public function announcement($request, $response, $args) - { - $twoMonthsAgo = date('Y-m-d H:i:s', strtotime('-2 months')); - - $Anns = Ann::where('date', '>=', $twoMonthsAgo) - ->orderBy('date', 'desc') - ->get(); - - return $this->view() - ->assign("anns", $Anns) - ->assign("latestAnn", $Anns->first()) - ->assign("cdn", $this->cdn) - ->assign("backup_cdn", $this->backup_cdn) - ->display('user/announcement.tpl'); - } - public function edit($request, $response, $args) { $enabled = $this->hasGoogleAuthenticator($this->user); diff --git a/web/app/Middleware/CloudApi.php b/web/app/Middleware/CloudApi.php index 225a2afe..b9c7acb9 100644 --- a/web/app/Middleware/CloudApi.php +++ b/web/app/Middleware/CloudApi.php @@ -20,6 +20,7 @@ final class CloudApi || preg_match('#^/api/v1/admin/instances(?:/|$)#D', $path) === 1 || preg_match('#^/api/v1/admin/operations(?:/|$)#D', $path) === 1 || preg_match('#^/api/v1/ssh-keys(?:/|$)#D', $path) === 1 + || $path === '/api/v1/announcements' || $path === '/api/v1/vms/page'; $actor = CloudAccess::actor(!$databaseOnly); if (AdminCsrf::requiresProtection($request->getMethod())) { diff --git a/web/app/Middleware/SuperAdmin.php b/web/app/Middleware/SuperAdmin.php index f59a1023..dc46c948 100644 --- a/web/app/Middleware/SuperAdmin.php +++ b/web/app/Middleware/SuperAdmin.php @@ -33,7 +33,7 @@ class SuperAdmin $response->getBody()->write($payload); return $response - ->withStatus(419) + ->withStatus(419, 'Authentication Timeout') ->withHeader('Content-Type', 'application/json; charset=utf-8'); } diff --git a/web/app/Models/Ann.php b/web/app/Models/Ann.php index 8783229f..46240c49 100644 --- a/web/app/Models/Ann.php +++ b/web/app/Models/Ann.php @@ -2,12 +2,6 @@ namespace App\Models; -/** - * Ann Model - */ - -use App\Utils\Tools; - class Ann extends Model { protected $connection = "default"; diff --git a/web/app/Services/AnnouncementSchema.php b/web/app/Services/AnnouncementSchema.php new file mode 100644 index 00000000..3dfc0bc9 --- /dev/null +++ b/web/app/Services/AnnouncementSchema.php @@ -0,0 +1,55 @@ +getSchemaBuilder(); + if (!$schema->hasTable('announcement')) { + throw new \RuntimeException('缺少 announcement 表,请先导入 web/sql/ss.sql'); + } + $legacy = array_values(array_filter(['date', 'content', 'markdown'], + static fn (string $column): bool => $schema->hasColumn('announcement', $column))); + // Check before any DDL: this rollout only retires an EMPTY legacy table. + if ($legacy !== [] && $connection->table('announcement')->exists()) { + throw new \RuntimeException('旧公告表仍有数据,已停止升级且未修改公告表;请先备份并明确处理旧公告后重试'); + } + $mysql = $connection->getDriverName() === 'mysql'; + $columns = ['title', 'type', 'status', 'body', 'published_at', 'updated_at']; + foreach ($columns as $column) { + if ($schema->hasColumn('announcement', $column)) { + continue; + } + $schema->table('announcement', static function ($table) use ($column, $mysql): void { + if ($column === 'title') { + $field = $table->string('title', 120)->default(''); + if ($mysql) $field->charset('utf8mb4')->collation('utf8mb4_unicode_ci'); + } elseif ($column === 'type') { + $table->string('type', 20)->default('notice'); + } elseif ($column === 'status') { + $table->string('status', 20)->default('withdrawn'); + } elseif ($column === 'body') { + $field = $table->longText('body'); + if ($mysql) $field->charset('utf8mb4')->collation('utf8mb4_unicode_ci'); + } elseif ($column === 'published_at') { + $table->dateTime($column)->nullable(); + } else { + $table->dateTime($column); + } + }); + } + if (!$schema->hasIndex('announcement', 'announcement_published')) { + $schema->table('announcement', static function ($table): void { + $table->index(['status', 'published_at', 'id'], 'announcement_published'); + }); + } + if ($legacy !== []) { + $schema->table('announcement', static function ($table) use ($legacy): void { + $table->dropColumn($legacy); + }); + } + } +} diff --git a/web/app/Services/AnnouncementService.php b/web/app/Services/AnnouncementService.php new file mode 100644 index 00000000..156dbde1 --- /dev/null +++ b/web/app/Services/AnnouncementService.php @@ -0,0 +1,199 @@ + '通知', 'maintenance' => '维护', 'incident' => '故障']; + private const COLUMNS = ['id', 'title', 'type', 'body', 'status', 'published_at', 'updated_at']; + + public static function page(array $actor, array $input = []): array + { + self::authorize($actor); + $filters = self::filters($input, true); + $query = Ann::query(); + if ($filters['type'] !== 'all') { + $query->where('type', $filters['type']); + } + if ($filters['status'] !== 'all') { + $query->where('status', $filters['status']); + } + if ($filters['q'] !== '') { + $pattern = '%' . str_replace(['!', '%', '_'], ['!!', '!%', '!_'], $filters['q']) . '%'; + $query->where(static function ($query) use ($pattern): void { + $query->whereRaw("title LIKE ? ESCAPE '!'", [$pattern]) + ->orWhereRaw("body LIKE ? ESCAPE '!'", [$pattern]); + }); + } + return self::listing($query, $filters) + ['filters' => $filters]; + } + + public static function published(array $actor, array $input = []): array + { + self::authorize($actor, false, false); + $filters = self::filters($input, false); + return self::listing(Ann::query()->where('status', 'published'), $filters); + } + + public static function detail(array $actor, string $id): array + { + self::authorize($actor); + return self::dto(self::find($id)); + } + + public static function save(array $actor, array $input, ?string $id = null): array + { + self::authorize($actor, true); + $values = self::validate($input); + return (new Ann())->getConnection()->transaction(static function () use ($id, $values): array { + $ann = $id === null ? new Ann() : self::find($id, true); + $now = date('Y-m-d H:i:s'); + if ($id === null) { + $ann->published_at = null; + } else { + // A stale editor must not republish an announcement withdrawn by + // another administrator. Existing status changes are explicit. + $values['status'] = (string) $ann->status; + } + if ($values['status'] === 'published' && ($id === null || $ann->status !== 'published')) { + $ann->published_at = $now; + } + foreach ($values as $field => $value) { + $ann->$field = $value; + } + $ann->updated_at = $now; + $ann->save(); + return self::dto($ann); + }); + } + + public static function setStatus(array $actor, string $id, array $input): array + { + self::authorize($actor, true); + $status = self::choice($input, 'status', ['published', 'withdrawn']); + return (new Ann())->getConnection()->transaction(static function () use ($id, $status): array { + $ann = self::find($id, true); + if ($ann->status !== $status) { + if ($status === 'published' && (trim((string) $ann->title) === '' || trim((string) $ann->body) === '')) { + throw new CloudError('请先填写公告标题和正文', 400); + } + $ann->status = $status; + $ann->updated_at = date('Y-m-d H:i:s'); + if ($status === 'published') { + $ann->published_at = $ann->updated_at; + } + $ann->save(); + } + return self::dto($ann); + }); + } + + public static function authorize(array $actor, bool $write = false, bool $admin = true): void + { + if ((int) ($actor['user_id'] ?? 0) < 1) { + throw new CloudError('请先登录', 401); + } + if (($admin && !($actor['is_admin'] ?? false)) + || ($write && (!($actor['is_super_admin'] ?? false) || !($actor['can_manage'] ?? false)))) { + throw new CloudError($write ? '只有超级管理员可以管理公告' : '需要管理员权限', 403); + } + } + + private static function listing($query, array &$filters): array + { + $total = (clone $query)->count(); + $totalPages = max(1, (int) ceil($total / $filters['per_page'])); + $filters['page'] = min($filters['page'], $totalPages); + $items = $query->orderByDesc('published_at')->orderByDesc('id') + ->offset(($filters['page'] - 1) * $filters['per_page'])->limit($filters['per_page']) + ->get(self::COLUMNS)->map(static fn ($row): array => self::dto($row))->all(); + return ['items' => $items, 'pagination' => ['page' => $filters['page'], 'per_page' => $filters['per_page'], + 'total' => $total, 'total_pages' => $totalPages], 'generated_at' => time()]; + } + + private static function filters(array $input, bool $admin): array + { + $page = self::integer($input['page'] ?? 1, '页码', 1, 1000000); + $perPage = self::integer($input['per_page'] ?? ($admin ? 20 : 10), '每页条数', 1, 100); + if (!in_array($perPage, $admin ? [20, 50, 100] : [10, 20, 50], true)) { + throw new CloudError('每页条数不受支持', 400); + } + if (!$admin) { + return ['page' => $page, 'per_page' => $perPage]; + } + return ['q' => self::text($input['q'] ?? '', '关键词', 80, false), + 'type' => self::choice($input, 'type', ['all', 'notice', 'maintenance', 'incident'], 'all'), + 'status' => self::choice($input, 'status', ['all', 'published', 'withdrawn'], 'all'), + 'page' => $page, 'per_page' => $perPage]; + } + + private static function validate(array $input): array + { + return ['title' => self::text($input['title'] ?? null, '标题', 120), + 'type' => self::choice($input, 'type', array_keys(self::TYPES)), + 'body' => self::text($input['body'] ?? null, '正文', 20000), + 'status' => self::choice($input, 'status', ['published', 'withdrawn'])]; + } + + private static function text($value, string $label, int $limit, bool $required = true): string + { + if (!is_string($value) || !mb_check_encoding($value, 'UTF-8') + || preg_match('/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/', $value)) { + throw new CloudError($label . '格式不正确', 400); + } + $value = trim(str_replace(["\r\n", "\r"], "\n", $value)); + if (($required && $value === '') || mb_strlen($value, 'UTF-8') > $limit + || ($label === '标题' && str_contains($value, "\n"))) { + throw new CloudError($label . '不能为空且最多 ' . $limit . ' 个字符', 400); + } + return $value; + } + + private static function choice(array $input, string $key, array $allowed, ?string $default = null): string + { + $value = $input[$key] ?? $default; + if (!is_string($value) || !in_array($value, $allowed, true)) { + throw new CloudError('公告' . ($key === 'type' ? '类型' : '状态') . '不正确', 400); + } + return $value; + } + + private static function integer($value, string $label, int $min, int $max): int + { + if ((!is_int($value) && !is_string($value)) || !preg_match('/^[0-9]+$/D', (string) $value) + || strlen((string) $value) > 9 || (int) $value < $min || (int) $value > $max) { + throw new CloudError($label . '不正确', 400); + } + return (int) $value; + } + + private static function find(string $id, bool $lock = false): Ann + { + if (!preg_match('/^[1-9][0-9]{0,9}$/D', $id) || (int) $id > 2147483647) { + throw new CloudError('公告编号不正确', 400); + } + $query = Ann::query()->where('id', $id); + if ($lock) { + $query->lockForUpdate(); + } + $ann = $query->first(self::COLUMNS); + if ($ann === null) { + throw new CloudError('公告不存在', 404); + } + return $ann; + } + + private static function dto(Ann $ann): array + { + $type = (string) $ann->type; + return ['id' => (string) $ann->id, 'title' => (string) $ann->title, + 'type' => $type, 'type_label' => self::TYPES[$type] ?? '通知', 'body' => (string) $ann->body, + 'status' => (string) $ann->status, + 'published_at' => $ann->published_at === null ? null : (string) $ann->published_at, + 'updated_at' => (string) $ann->updated_at]; + } +} diff --git a/web/config/routes.php b/web/config/routes.php index 7361bb81..95035112 100644 --- a/web/config/routes.php +++ b/web/config/routes.php @@ -100,7 +100,6 @@ $app->group('/user', function () { $this->get('/cloud/ssh-keys', 'App\Controllers\CloudPageController:sshKeys'); $this->get('/cloud/invoices', 'App\Controllers\CloudPageController:invoices'); $this->get('/cloud/invoices/{id:[0-9]+}', 'App\Controllers\CloudPageController:invoiceDetail'); - $this->get('/announcement', 'App\Controllers\UserController:announcement'); $this->get('/invite', 'App\Controllers\UserController:invite'); $this->get('/shop', 'App\Controllers\CloudPageController:legacyShop'); $this->post('/coupon_check', 'App\Controllers\UserController:CouponCheck'); @@ -196,8 +195,7 @@ $app->group('/admin', function () { $this->post('/announcement', 'App\Controllers\Admin\AnnController:add')->add(new SuperAdmin()); $this->get('/announcement/{id}/edit', 'App\Controllers\Admin\AnnController:edit')->add(new SuperAdmin()); $this->put('/announcement/{id}', 'App\Controllers\Admin\AnnController:update')->add(new SuperAdmin()); - $this->delete('/announcement', 'App\Controllers\Admin\AnnController:delete')->add(new SuperAdmin()); - $this->post('/announcement/ajax', 'App\Controllers\Admin\AnnController:ajax'); + $this->post('/announcement/{id}/status', 'App\Controllers\Admin\AnnController:status')->add(new SuperAdmin()); // Survey Manage $this->get('/survey', 'App\Controllers\Admin\SurveyController:index'); diff --git a/web/config/routes_cloud.php b/web/config/routes_cloud.php index 1e9c50db..0dccdaa8 100644 --- a/web/config/routes_cloud.php +++ b/web/config/routes_cloud.php @@ -3,6 +3,7 @@ $app->get('/api/v1/session', 'App\Controllers\CloudApiController:session'); $app->post('/api/internal/cloud/session-introspection', 'App\Controllers\CloudInternalController:introspection'); $app->group('/api/v1', function () { + $this->get('/announcements', 'App\Controllers\AnnouncementController:index'); $this->get('/plans', 'App\Controllers\CloudApiController:plans'); $this->map(['GET', 'POST'], '/orders', 'App\Controllers\CloudApiController:orders'); $this->get('/orders/by-request/{key:[A-Za-z0-9_.-]+}', diff --git a/web/public/cloud/account.css b/web/public/cloud/account.css index 1119d5e1..c27cbacd 100644 --- a/web/public/cloud/account.css +++ b/web/public/cloud/account.css @@ -185,9 +185,9 @@ body.vu-body .vu-theme-toggle:hover { } /* Cards, summaries and responsive grids */ -body.vu-body :where(.vu-card, .vu-hero-main, .vu-announcement-hero-main, +body.vu-body :where(.vu-card, .vu-hero-main, .vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main, - .vu-profile-hero-main, .vu-support-hero-main, .vu-announcement-summary, + .vu-profile-hero-main, .vu-support-hero-main, .vu-edit-summary, .vu-support-summary, .vu-stat, .vu-pay-balance, .vu-profile-account, .vu-invite-balance) { min-width: 0; @@ -199,7 +199,7 @@ body.vu-body :where(.vu-card, .vu-hero-main, .vu-announcement-hero-main, box-shadow: var(--vu-shadow); } -body.vu-body :where(.vu-hero, .vu-announcement-hero, .vu-edit-hero, +body.vu-body :where(.vu-hero, .vu-edit-hero, .vu-invite-hero, .vu-pay-hero, .vu-profile-hero, .vu-support-hero) { display: grid; grid-template-columns: minmax(0, 1.75fr) minmax(270px, .8fr); @@ -207,7 +207,7 @@ body.vu-body :where(.vu-hero, .vu-announcement-hero, .vu-edit-hero, margin-bottom: 22px; } -body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main, +body.vu-body :where(.vu-hero-main, .vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main, .vu-support-hero-main) { position: relative; @@ -216,7 +216,7 @@ body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-mai background: var(--vu-panel); } -body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main, +body.vu-body :where(.vu-hero-main, .vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main, .vu-support-hero-main)::after { position: absolute; @@ -230,10 +230,10 @@ body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-mai box-shadow: 0 0 0 34px rgba(21, 157, 169, .045); pointer-events: none; } -body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main, +body.vu-body :where(.vu-hero-main, .vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main, .vu-support-hero-main) > * { position: relative; z-index: 1; } -body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main, +body.vu-body :where(.vu-hero-main, .vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main, .vu-support-hero-main) h2 { margin: 17px 0 10px; @@ -241,7 +241,7 @@ body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-mai line-height: 1.24; letter-spacing: -.7px; } -body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main, +body.vu-body :where(.vu-hero-main, .vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main, .vu-support-hero-main) p { max-width: 720px; @@ -291,7 +291,7 @@ body.vu-body :where(.vu-content-grid, .vu-shop-grid) { grid-template-columns: repeat(auto-fit, minmax(290px, 1fr)); gap: 20px; } -body.vu-body :where(.vu-announcement-layout, .vu-edit-layout, .vu-invite-layout, +body.vu-body :where(.vu-edit-layout, .vu-invite-layout, .vu-pay-layout, .vu-profile-layout, .vu-support-detail-layout, .vu-support-editor-layout) { display: grid; @@ -300,7 +300,7 @@ body.vu-body :where(.vu-announcement-layout, .vu-edit-layout, .vu-invite-layout, gap: 20px; margin-bottom: 22px; } -body.vu-body :where(.vu-content-stack, .vu-announcement-list, .vu-announcement-side, +body.vu-body :where(.vu-content-stack, .vu-edit-main, .vu-edit-side, .vu-invite-main, .vu-invite-side, .vu-pay-main, .vu-pay-side, .vu-profile-main, .vu-support-thread) { min-width: 0; } body.vu-body :where(.vu-edit-main, .vu-invite-main, .vu-pay-main, .vu-profile-main) > .vu-card + .vu-card { margin-top: 20px; } @@ -339,12 +339,6 @@ body.vu-body :where(.vu-muted, .vu-form-message, .vu-inline-message, .vu-profile font-size: 13px; } body.vu-body .vu-date { font-weight: 700; } -body.vu-body :where(.vu-ann-content, .vu-announcement-content) { - color: var(--vu-text-soft); - line-height: 1.8; - overflow-wrap: anywhere; -} - /* Forms: checkbox/radio are deliberately excluded from text-input sizing. */ body.vu-body :where(.vu-form, .vu-support-form) { display: grid; gap: 18px; } body.vu-body :where(.vu-form-row, .vu-form-grid, .vu-invite-wallet-grid) { @@ -1188,9 +1182,9 @@ body.venix-auth .auth-modal-actions { } @media (max-width: 900px) { - body.vu-body :where(.vu-hero, .vu-announcement-hero, .vu-edit-hero, + body.vu-body :where(.vu-hero, .vu-edit-hero, .vu-invite-hero, .vu-pay-hero, .vu-profile-hero, .vu-support-hero), - body.vu-body :where(.vu-announcement-layout, .vu-edit-layout, .vu-invite-layout, + body.vu-body :where(.vu-edit-layout, .vu-invite-layout, .vu-pay-layout, .vu-profile-layout, .vu-support-detail-layout, .vu-support-editor-layout) { grid-template-columns: 1fr; } } @@ -1204,9 +1198,9 @@ body.venix-auth .auth-modal-actions { } body.vu-body .vu-top-actions { width: 100%; } body.vu-body .vu-top-actions > :where(.vu-btn, .vu-theme-toggle) { flex: 1 1 auto; } - body.vu-body :where(.vu-card, .vu-hero-main, .vu-announcement-hero-main, + body.vu-body :where(.vu-card, .vu-hero-main, .vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main, - .vu-profile-hero-main, .vu-support-hero-main, .vu-announcement-summary, + .vu-profile-hero-main, .vu-support-hero-main, .vu-edit-summary, .vu-support-summary, .vu-stat, .vu-pay-balance, .vu-profile-account, .vu-invite-balance) { padding: 21px; border-radius: 12px; } body.vu-body :where(.vu-form-row, .vu-form-grid, .vu-invite-wallet-grid, diff --git a/web/public/cloud/announcements.js b/web/public/cloud/announcements.js new file mode 100644 index 00000000..a5f0976b --- /dev/null +++ b/web/public/cloud/announcements.js @@ -0,0 +1,194 @@ +// User announcements are independent of the VM session and engine bootstrap. +const dialog = document.getElementById('panel-announcements-drawer'); +const byId = id => document.getElementById(id); +const state = { + items: [], pagination: null, request: null, serial: 0, loading: false, + stale: false, receivedAt: '', opener: null, scroll: null, +}; + +function element(tag, className = '', value) { + const node = document.createElement(tag); + node.className = className; + if (value !== undefined) node.textContent = String(value); + return node; +} + +function setMessage(message, tone = '') { + const node = byId('panel-announcements-state'); + node.textContent = message; + node.className = `panel-announcements-state${tone ? ` is-${tone}` : ''}`; + node.setAttribute('role', tone === 'error' ? 'alert' : 'status'); +} + +function dateText(value) { + // The API supplies the publication time in the site's timezone. Do not parse + // an unzoned SQL date as UTC or substitute a browser-generated publication time. + return typeof value === 'string' && /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(value) ? value : '时间未记录'; +} + +function renderItems() { + const list = byId('panel-announcements-list'); + list.replaceChildren(); + for (const item of state.items) { + const article = element('article', 'panel-announcements-item'); + article.dataset.announcementId = String(item.id); + const meta = element('div', 'panel-announcements-meta'); + const type = ['notice', 'maintenance', 'incident'].includes(item.type) ? item.type : 'notice'; + const fallback = { notice: '通知', maintenance: '维护', incident: '故障' }[type]; + meta.append(element('span', `panel-announcements-type is-${type}`, item.type_label || fallback)); + const published = element('time', '', `发布于 ${dateText(item.published_at)}`); + if (dateText(item.published_at) !== '时间未记录') published.dateTime = item.published_at.replace(' ', 'T'); + meta.append(published); + if (item.updated_at && item.updated_at !== item.published_at) { + meta.append(element('span', '', `更新于 ${dateText(item.updated_at)}`)); + } + article.append(meta, element('h3', '', item.title || '站点公告'), element('p', 'panel-announcements-body', item.body ?? '')); + list.append(article); + } + if (!state.items.length) list.append(element('p', 'panel-announcements-empty', '暂无已发布的公告。')); +} + +function renderControls() { + byId('panel-announcements-refresh').disabled = state.loading; + const more = byId('panel-announcements-more'); + more.hidden = !state.pagination || state.pagination.page >= state.pagination.total_pages; + more.disabled = state.loading || state.stale; + byId('panel-announcements-count').textContent = state.pagination + ? `已加载 ${state.items.length} / ${state.pagination.total} 条${state.stale ? '(旧内容)' : ''}` : ''; + byId('panel-announcements-list').setAttribute('aria-busy', String(state.loading)); +} + +async function requestPage(page, controller) { + const timeout = setTimeout(() => controller.abort('timeout'), 15000); + try { + const response = await fetch(`/api/v1/announcements?page=${page}&per_page=10`, { + headers: { Accept: 'application/json' }, credentials: 'same-origin', + cache: 'no-store', signal: controller.signal, + }); + if (response.status === 401) throw new Error('登录已过期,请重新登录后查看公告。'); + if (response.status === 403) throw new Error('当前账号无法读取公告。'); + let payload; + try { payload = await response.json(); } + catch { throw new Error('公告服务返回异常,请稍后重试。'); } + if (!response.ok || payload?.ret === 0) { + throw new Error(typeof payload?.detail === 'string' ? payload.detail : `公告读取失败 (${response.status})。`); + } + const pagination = payload?.pagination; + if (!Array.isArray(payload?.items) || !pagination + || ![pagination.page, pagination.per_page, pagination.total, pagination.total_pages].every(Number.isInteger) + || pagination.page < 1 || pagination.per_page !== 10 || pagination.total < 0 || pagination.total_pages < 1) { + throw new Error('公告数据格式无效,请稍后重试。'); + } + return payload; + } catch (error) { + if (controller.signal.reason === 'timeout') throw new Error('公告读取超时,请稍后重试。'); + throw error; + } finally { clearTimeout(timeout); } +} + +async function load(page = 1) { + if (!dialog?.open) return; + if (page !== 1 && (state.loading || state.stale || !state.pagination)) return; + state.request?.abort(); + const controller = new AbortController(); state.request = controller; + const serial = ++state.serial; + state.loading = true; + if (page === 1 && state.pagination) state.stale = true; + setMessage(page === 1 + ? (state.pagination ? `正在刷新;下方暂显示 ${state.receivedAt} 读取的旧内容。` : '正在读取最新公告…') + : '正在加载更多公告…', state.stale ? 'stale' : ''); + renderControls(); + try { + const payload = await requestPage(page, controller); + if (controller.signal.aborted || serial !== state.serial || !dialog.open) return; + const published = payload.items.filter(item => item && item.status === 'published'); + // Offset pagination can repeat an item if a new notice is published between + // requests. Keep one record per ID without changing server publication order. + const replaces = page === 1 || payload.pagination.page === 1; + const combined = replaces ? published : [...state.items, ...published]; + const seen = new Set(); + state.items = combined.filter(item => { + const id = String(item.id); + if (seen.has(id)) return false; + seen.add(id); return true; + }); + state.pagination = payload.pagination; state.stale = false; + state.receivedAt = new Date().toLocaleTimeString('zh-CN', { hour12: false }); + renderItems(); + setMessage(`读取于 ${state.receivedAt};按发布时间倒序显示。`); + if (replaces) byId('panel-announcements-scroll').scrollTop = 0; + } catch (error) { + if (serial !== state.serial || (controller.signal.aborted && controller.signal.reason !== 'timeout')) return; + state.stale = Boolean(state.pagination); + setMessage(`${error.message}${state.pagination ? ` 下方保留 ${state.receivedAt} 读取的旧内容,请刷新确认最新公告。` : ''}`, 'error'); + } finally { + if (serial === state.serial) { state.request = null; state.loading = false; renderControls(); } + } +} + +function historyData(changes = {}) { + return { ...(history.state && typeof history.state === 'object' ? history.state : {}), ...changes }; +} + +function close() { + state.request?.abort(); state.request = null; state.serial += 1; state.loading = false; + if (dialog.open) dialog.close(); + document.documentElement.classList.remove('panel-announcements-open'); + document.body.style.removeProperty('--panel-announcements-scroll-top'); + if (state.scroll) { window.scrollTo({ left: state.scroll.x, top: state.scroll.y, behavior: 'instant' }); state.scroll = null; } + document.querySelectorAll('[data-announcements-open]').forEach(button => button.setAttribute('aria-expanded', 'false')); + if (state.opener?.isConnected) state.opener.focus({ preventScroll: true }); + state.opener = null; + if (history.state?.panelAnnouncementsScroll) history.replaceState(historyData({ panelAnnouncementsScroll: undefined }), '', location.href); + renderControls(); +} + +function open(opener) { + if (dialog.open) return; + state.opener = opener || document.querySelector('[data-announcements-open]'); + state.scroll = { x: window.scrollX, y: window.scrollY }; + document.body.style.setProperty('--panel-announcements-scroll-top', `${-state.scroll.y}px`); + document.documentElement.classList.add('panel-announcements-open'); + dialog.showModal(); + byId('panel-announcements-close').focus({ preventScroll: true }); + document.querySelectorAll('[data-announcements-open]').forEach(button => button.setAttribute('aria-expanded', 'true')); + // Always refresh page one on reopening: a previously published notice may + // have been withdrawn. Do not treat the old in-memory list as current data. + void load(1); +} + +if (dialog) { + document.addEventListener('click', event => { + const trigger = event.target.closest('[data-announcements-open]'); + if (!trigger || event.defaultPrevented || event.button !== 0 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) return; + event.preventDefault(); open(trigger); + }); + byId('panel-announcements-close').addEventListener('click', close); + byId('panel-announcements-refresh').addEventListener('click', () => { void load(1); }); + byId('panel-announcements-more').addEventListener('click', () => { void load(state.pagination.page + 1); }); + dialog.addEventListener('cancel', event => { event.preventDefault(); close(); }); + dialog.addEventListener('click', event => { + if (event.target !== dialog) return; + const rect = dialog.getBoundingClientRect(); + if (event.clientX < rect.left || event.clientX > rect.right || event.clientY < rect.top || event.clientY > rect.bottom) close(); + }); + window.addEventListener('popstate', () => { if (dialog.open) close(); }); + window.addEventListener('pagehide', () => { + state.request?.abort(); state.serial += 1; state.loading = false; + if (state.scroll) history.replaceState(historyData({ panelAnnouncementsScroll: state.scroll }), '', location.href); + }); + window.addEventListener('pageshow', event => { if (event.persisted && dialog.open) close(); }); + const stored = history.state?.panelAnnouncementsScroll; + if (stored && Number.isFinite(stored.x) && Number.isFinite(stored.y)) { + requestAnimationFrame(() => { + window.scrollTo({ left: stored.x, top: stored.y, behavior: 'instant' }); + history.replaceState(historyData({ panelAnnouncementsScroll: undefined }), '', location.href); + }); + } + const url = new URL(location.href); + if (url.searchParams.get('announcements') === '1') { + url.searchParams.delete('announcements'); + history.replaceState(historyData(), '', url); + open(); + } +} diff --git a/web/public/cloud/client.css b/web/public/cloud/client.css index 912b0f3e..c93442f8 100644 --- a/web/public/cloud/client.css +++ b/web/public/cloud/client.css @@ -28,6 +28,49 @@ .panel-admin-link { margin-bottom: 2px; } .panel-logout-link:hover { color: #ffc1c8 !important; background: rgba(208, 66, 80, .1) !important; } .panel-topbar-logout { text-decoration: none; } +/* Announcements share the user shell without loading administrator styles. */ +.panel-announcements-close.button { flex: 0 0 44px; width: 44px; height: 44px; min-height: 44px; padding: 0; font-size: 22px; } +.panel-announcements-trigger.button { position: relative; flex: 0 0 30px; width: 30px; height: 30px; min-height: 30px; padding: 0; border: 0; border-radius: 50%; background: transparent; box-shadow: none; color: #597386; font-size: 18px; line-height: 1; } +.panel-announcements-trigger.button:not(:disabled):hover { background: #e9f8f7; color: #118e9a; transform: none; } +.panel-announcements-trigger.button:focus-visible { outline: 2px solid #16a6ad; outline-offset: 2px; } +@media (pointer: coarse) { + /* Keep the icon as compact as the avatar; only the invisible hit area grows. */ + .panel-announcements-trigger.button::after { content: ""; position: absolute; inset: -7px; border-radius: 50%; } +} +.panel-announcements-link { display: inline-block; width: fit-content; padding: 0; border: 0; background: transparent; color: #0f8f9a; font: inherit; font-size: 12px; font-weight: 700; text-align: left; cursor: pointer; } +.panel-announcements-link:hover { text-decoration: underline; } +html.panel-announcements-open { overflow: hidden; overscroll-behavior: none; scroll-behavior: auto !important; } +html.panel-announcements-open body { position: fixed; top: var(--panel-announcements-scroll-top, 0px); left: 0; right: 0; width: 100%; overflow: hidden; } +.panel-announcements-drawer { position: fixed; inset: 0 0 0 auto; width: min(540px, 100%); max-width: 100%; height: 100vh; height: 100dvh; max-height: none; margin: 0; padding: 0; border: 0; background: #fff; color: #25384e; box-shadow: -12px 0 48px rgba(19,42,65,.16); overflow: hidden; } +.panel-announcements-drawer[open] { display: flex; flex-direction: column; } +.panel-announcements-drawer::backdrop { background: rgba(16,29,44,.46); } +.panel-announcements-header { display: flex; flex: 0 0 auto; align-items: flex-start; justify-content: space-between; gap: 14px; padding: 22px 24px 18px; border-bottom: 1px solid #e5edf2; } +.panel-announcements-header > div { min-width: 0; } +.panel-announcements-header h2 { margin: 0 0 7px; font-size: 19px; line-height: 1.5; font-weight: 800; } +.panel-announcements-header p { margin: 0; color: #7a8c9d; font-size: 12px; line-height: 1.7; } +.panel-announcements-toolbar { display: flex; flex: 0 0 auto; align-items: flex-start; justify-content: space-between; gap: 12px; padding: 14px 24px; border-bottom: 1px solid #e5edf2; background: #f8fbfc; } +.panel-announcements-toolbar .button { flex: 0 0 auto; min-height: 44px; } +.panel-announcements-state { margin: 0; color: #647d90; font-size: 12px; line-height: 1.8; overflow-wrap: anywhere; } +.panel-announcements-state.is-stale { color: #91601e; } +.panel-announcements-state.is-error { color: #ba4350; } +.panel-announcements-scroll { min-height: 0; flex: 1 1 auto; overflow-y: auto; overscroll-behavior-y: contain; padding: 0 24px max(20px, env(safe-area-inset-bottom)); } +.panel-announcements-item { padding: 22px 0; border-bottom: 1px solid #e5edf2; } +.panel-announcements-item h3 { margin: 9px 0 8px; color: #2b4358; font-size: 16px; font-weight: 800; line-height: 1.6; overflow-wrap: anywhere; } +.panel-announcements-meta { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; color: #8495a4; font-size: 11px; line-height: 1.7; } +.panel-announcements-type { display: inline-flex; align-items: center; padding: 2px 8px; border-radius: 5px; background: #e8f7f7; color: #148c98; font-size: 11px; font-weight: 700; } +.panel-announcements-type.is-maintenance { background: #fff4e5; color: #946421; } +.panel-announcements-type.is-incident { background: #fff0f1; color: #b94b57; } +.panel-announcements-body { margin: 12px 0 0; white-space: pre-wrap; overflow-wrap: anywhere; color: #4d6375; font-size: 13px; line-height: 1.9; } +.panel-announcements-empty { padding: 32px 0; margin: 0; color: #8495a4; font-size: 13px; text-align: center; } +.panel-announcements-pagination { display: grid; justify-items: center; gap: 10px; padding-top: 20px; } +.panel-announcements-pagination p { margin: 0; color: #8495a4; font-size: 12px; } +.panel-announcements-pagination .button { min-height: 44px; } +@media (max-width: 600px) { + .panel-announcements-drawer { width: 100%; } + .panel-announcements-header { padding: 18px 16px 16px; } + .panel-announcements-toolbar { padding: 12px 16px; } + .panel-announcements-scroll { padding-inline: 16px; } +} .admin-menu-options { max-height: min(70vh, 520px); overflow-y: auto; } .admin-menu-options a { min-height: 34px; display: flex; align-items: center; padding: 7px 10px; border-radius: 7px; color: #536b7e; font-size: 12px; font-weight: 700; text-decoration: none; } .admin-menu-options a:hover { background: #edf6f6; color: #117f88; } diff --git a/web/public/theme/venix/css/admin-home.css b/web/public/theme/venix/css/admin-home.css index 6e6b200d..6702cb7e 100644 --- a/web/public/theme/venix/css/admin-home.css +++ b/web/public/theme/venix/css/admin-home.css @@ -1021,6 +1021,12 @@ html.admin-instance-detail-open body { background: #c81e28; } +.admin-ann-body { + white-space: pre-wrap; + overflow-wrap: anywhere; + font: inherit; +} + #editormd.admin-editor, #editormd.admin-editor.editormd, .admin-editor .editormd { diff --git a/web/public/theme/venix/js/admin-announcements.js b/web/public/theme/venix/js/admin-announcements.js new file mode 100644 index 00000000..236b3094 --- /dev/null +++ b/web/public/theme/venix/js/admin-announcements.js @@ -0,0 +1,172 @@ +(function () { + 'use strict'; + + var root = document.querySelector('[data-admin-announcements]'); + if (!root) return; + var canManage = window.ADMIN_CAN_MANAGE === true && root.dataset.annCanManage === '1'; + var form = document.getElementById('announcement-form'); + var feedback = document.getElementById('announcement-feedback'); + var busy = false; + var unconfirmed = false; + var controller = null; + var leaving = false; + + function inform(message, state) { + if (!feedback) return; + feedback.textContent = message; + feedback.className = 'admin-config-status' + (state ? ' is-' + state : ''); + } + + function controls() { + var locked = !canManage || busy || unconfirmed; + root.querySelectorAll('[data-ann-write], [data-ann-status-button]').forEach(function (button) { + button.disabled = locked; + }); + if (form) { + form.elements.namedItem('title').readOnly = locked; + form.elements.namedItem('body').readOnly = locked; + form.elements.namedItem('type').disabled = locked; + } + } + + function formValue() { + if (!form) return ''; + return JSON.stringify(['title', 'type', 'body'].map(function (name) { + return form.elements.namedItem(name).value; + })); + } + + var savedValue = formValue(); + + function countCharacters() { + root.querySelectorAll('[data-ann-counter]').forEach(function (field) { + var counter = document.getElementById(field.dataset.annCounter); + if (counter) counter.textContent = field.value.length + ' / ' + field.maxLength + ' 字'; + }); + } + + function uncertainResult() { + unconfirmed = true; + inform('请求结果未确认,请刷新页面核对后再操作;不要重复提交。', 'error'); + } + + async function write(url, method, payload) { + // admin-csrf.js adds the existing X-Admin-CSRF-Token header. + controller = new AbortController(); + var timeout = window.setTimeout(function () { controller.abort(); }, 30000); + try { + var response = await window.fetch(url, { + method: method, + credentials: 'same-origin', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', + 'X-Requested-With': 'XMLHttpRequest' + }, + body: payload, + signal: controller.signal + }); + var result = await response.json(); + if (!response.ok || !result || result.ret !== 1) { + if (response.status >= 500 || !result || result.ret !== 0) { + uncertainResult(); + } else { + inform(typeof result.msg === 'string' ? result.msg : '操作未完成,请检查输入与权限。', 'error'); + } + return null; + } + if (!result.announcement || !/^[1-9][0-9]*$/.test(String(result.announcement.id)) + || ['published', 'withdrawn'].indexOf(result.announcement.status) === -1) { + uncertainResult(); + return null; + } + return result; + } catch (error) { + uncertainResult(); + return null; + } finally { + window.clearTimeout(timeout); + controller = null; + } + } + + if (form) { + form.addEventListener('input', function () { + countCharacters(); + if (canManage && !busy && !unconfirmed) inform(formValue() === savedValue ? '尚未修改' : '有未保存的修改'); + }); + form.addEventListener('change', function () { + if (canManage && !busy && !unconfirmed) inform(formValue() === savedValue ? '尚未修改' : '有未保存的修改'); + }); + form.addEventListener('submit', async function (event) { + event.preventDefault(); + if (!canManage || busy || unconfirmed || !form.reportValidity()) return; + var title = form.elements.namedItem('title').value; + var body = form.elements.namedItem('body').value; + if (!title.trim() || !body.trim()) { + inform('标题和正文不能为空或只有空格。', 'error'); + return; + } + var payload = new URLSearchParams(); + payload.set('title', title); + payload.set('type', form.elements.namedItem('type').value); + payload.set('body', body); + payload.set('status', form.elements.namedItem('status').value); + busy = true; + controls(); + inform('正在保存…'); + var result = await write(form.getAttribute('action'), form.dataset.method, payload); + if (result && !leaving) { + savedValue = formValue(); + inform(result.msg || '公告已保存', 'success'); + window.location.assign('/admin/announcement'); + return; + } + busy = false; + controls(); + }); + } + + root.addEventListener('click', async function (event) { + var button = event.target.closest('[data-ann-status-button]'); + if (!button || !root.contains(button)) return; + event.preventDefault(); + if (!canManage || busy || unconfirmed || button.disabled) return; + var id = button.dataset.annId; + var next = button.dataset.annNextStatus; + if (!/^[1-9][0-9]*$/.test(id) || ['published', 'withdrawn'].indexOf(next) === -1) return; + if (form && formValue() !== savedValue) { + inform('请先保存修改,再发布或撤下公告。', 'error'); + return; + } + var prompt = next === 'published' ? '确认发布此公告?发布后用户可见。' + : '确认撤下此公告?用户将不再看到它,后台仍保留内容。'; + if (!window.confirm(prompt)) return; + busy = true; + controls(); + inform(next === 'published' ? '正在发布…' : '正在撤下…'); + var payload = new URLSearchParams(); + payload.set('status', next); + var result = await write('/admin/announcement/' + id + '/status', 'POST', payload); + if (result && !leaving) { + inform(result.msg || '公告状态已更新', 'success'); + window.location.reload(); + return; + } + busy = false; + controls(); + }); + + window.addEventListener('pagehide', function () { + leaving = true; + if (controller) controller.abort(); + }); + window.addEventListener('pageshow', function (event) { + leaving = false; + if (event.persisted && busy) uncertainResult(); + controls(); + countCharacters(); + }); + countCharacters(); + controls(); +})(); diff --git a/web/resources/views/venix/admin/announcement/create.tpl b/web/resources/views/venix/admin/announcement/create.tpl index 12ea652a..1f6b8774 100644 --- a/web/resources/views/venix/admin/announcement/create.tpl +++ b/web/resources/views/venix/admin/announcement/create.tpl @@ -1,116 +1,6 @@ -{assign var=admin_title value='添加公告'} +{assign var=admin_title value='发布公告'} {assign var=admin_active value='announcement'} -{assign var=admin_extra_css value=''} +{assign var=announcement_mode value='create'} {include file='admin/static_header.tpl'} - -
使用 Markdown 编写公告,提交后会同步通知。
-修改公告后会重新推送更新通知。
-{if $ann_is_create}填写标题与正文,发布后将在用户公告中显示。{else}正文按纯文本显示;保存修改不会改变当前发布状态。{/if}
+当前为只读模式,仅超级管理员可以发布、修改或撤下公告。
{/if} + + +管理用户中心展示的系统公告,支持编辑、删除和快速搜索。
-| ID | -时间 | -内容 | -操作 | -
|---|---|---|---|
| 公告加载中 | -|||
发布通知、维护与故障公告;撤下后保留记录,不再向用户展示。