补齐未接入代码的功能域:参与人 / 评论 / 花销与分摊
数据库里早就建好了 comments、node_members + role_tags、expenses +
expense_splits 三组表,但一直没有代码接入。本次把这三块连上业务,
并新增「节点详情页」作为聚合入口。
新增
- src/Access.php 统一归属校验。此前每个控制器各写各的 family_id
条件,容易漏;现在 activity()/node()/target() 一处收敛,
requireAdmin() 统一管理员判断。
- src/Comments.php 两级平铺:parent_id 只允许指向顶层,写「回复的回复」
时规范化回顶层;删顶层会连同回复一起删。
- src/Members.php 参与人 + 角色标签 + 情绪 + 签到。情绪目录 17 项,
全部选用 Emoji 11.0(2018)及以前的码位,避免旧系统
字体缺字形显示成空白方块。
- src/Expenses.php 花销与分摊。分摊按「分」为单位 intdiv 平均,
余数归最后一人,保证 SUM(share_amount) = total_amount。
- templates/nodes/show.php 节点详情页:基本信息 + 参与人 + 花销 + 讨论 + 附件入口。
- 角色标签管理、评论区、参与人区、花销区各自的模板与控制器。
修复
- 越权:往别人活动的节点上插节点、把别家用户加成参与人,都只校验了
「节点存在」,没校验「用户与节点同家庭」。现统一走 Access。
- 删活动时节点附件文件删不掉:附件在 /uploads/attachments/ 下,却调了
只认 /uploads/covers/ 的删除函数,判定不通过 → 文件永久残留。改为
统一的 deleteUploadFile(),两个目录都认。
- 删有引用记录的用户会 500(activities.created_by / attachments.uploader_id /
comments.author_id / expenses.payer_user_id 这几处没有级联,也没做前置检查)。
其他
- 活动/节点列表补上附件、评论、参与人、花销四个计数(一次 GROUP BY 查完)。
- 首页布局新增一条迁移易踩的规避:新列上的索引必须排在 ALTER TABLE 之后。
- 新增 .gitignore:config.php(含数据库口令)与 uploads/ 下用户上传的
头像封面不入库,只保留 uploads/.htaccess 那条禁止执行脚本的规则。
- 新增 config.example.php 作为新环境的配置模板。
本批不改数据库结构,不需要任何数据迁移。
本地与线上验证
- php -l 全绿(PHP 8.4 本地 / 线上 7.4.30 与 8.1.7 双版本)。
- 模板渲染检查 180 项全通过。
- 线上端到端 153 项全通过:登录、活动增删改查、节点流转、
参与人/角色标签/情绪/签到、评论、花销与分摊、权限、级联清理、
全站页面无 PHP 报错泄漏、跑完基线逐表核对且既有 id 集合逐字未变。
- 顺带写了 trip_sql_column_check.py:拿真实库表结构静态校验全项目 SQL 的
列名引用。本次就是靠它之外的 e2e 抓到 travel_modes 并没有 line_name
(该列属于 trip_nodes),一个列名写错导致节点详情页整页 Fatal。
This commit is contained in:
@@ -0,0 +1,143 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
require __DIR__ . '/src/Database.php';
|
||||
require __DIR__ . '/src/Auth.php';
|
||||
require __DIR__ . '/src/helpers.php';
|
||||
require __DIR__ . '/src/Comments.php';
|
||||
require __DIR__ . '/src/Members.php';
|
||||
require __DIR__ . '/src/Expenses.php';
|
||||
require __DIR__ . '/src/Access.php';
|
||||
require __DIR__ . '/src/Controllers/AuthController.php';
|
||||
require __DIR__ . '/src/Controllers/AttachmentController.php';
|
||||
require __DIR__ . '/src/Controllers/ActivityController.php';
|
||||
require __DIR__ . '/src/Controllers/NodeController.php';
|
||||
require __DIR__ . '/src/Controllers/UserController.php';
|
||||
require __DIR__ . '/src/Controllers/NodeTypeController.php';
|
||||
require __DIR__ . '/src/Controllers/TravelModeController.php';
|
||||
require __DIR__ . '/src/Controllers/VehicleController.php';
|
||||
require __DIR__ . '/src/Controllers/RoleTagController.php';
|
||||
require __DIR__ . '/src/Controllers/MemberController.php';
|
||||
require __DIR__ . '/src/Controllers/CommentController.php';
|
||||
require __DIR__ . '/src/Controllers/ExpenseController.php';
|
||||
|
||||
use App\Auth;
|
||||
use App\Controllers\AuthController;
|
||||
use App\Controllers\ActivityController;
|
||||
use App\Controllers\AttachmentController;
|
||||
use App\Controllers\NodeController;
|
||||
use App\Controllers\UserController;
|
||||
use App\Controllers\NodeTypeController;
|
||||
use App\Controllers\TravelModeController;
|
||||
use App\Controllers\VehicleController;
|
||||
use App\Controllers\RoleTagController;
|
||||
use App\Controllers\MemberController;
|
||||
use App\Controllers\CommentController;
|
||||
use App\Controllers\ExpenseController;
|
||||
|
||||
session_start();
|
||||
date_default_timezone_set('Asia/Shanghai');
|
||||
|
||||
$route = $_GET['r'] ?? 'activities/index';
|
||||
|
||||
// 白名单:无需登录即可访问
|
||||
$publicRoutes = ['auth/login', 'auth/doLogin'];
|
||||
|
||||
// 未登录时,强制跳转登录页
|
||||
if (!in_array($route, $publicRoutes, true) && !Auth::check()) {
|
||||
redirect('auth/login');
|
||||
}
|
||||
|
||||
$map = [
|
||||
// 认证
|
||||
'auth/login' => [AuthController::class, 'login'],
|
||||
'auth/doLogin' => [AuthController::class, 'doLogin'],
|
||||
'auth/logout' => [AuthController::class, 'logout'],
|
||||
|
||||
// 活动
|
||||
'activities/index' => [ActivityController::class, 'index'],
|
||||
'activities/create' => [ActivityController::class, 'create'],
|
||||
'activities/store' => [ActivityController::class, 'store'],
|
||||
'activities/edit' => [ActivityController::class, 'edit'],
|
||||
'activities/update' => [ActivityController::class, 'update'],
|
||||
'activities/destroy' => [ActivityController::class, 'destroy'],
|
||||
'activities/show' => [ActivityController::class, 'show'],
|
||||
|
||||
// 节点附件
|
||||
'attachments/node' => [AttachmentController::class, 'node'],
|
||||
'attachments/upload' => [AttachmentController::class, 'upload'],
|
||||
'attachments/destroy' => [AttachmentController::class, 'destroy'],
|
||||
'activities/uploadCover' => [ActivityController::class, 'uploadCover'],
|
||||
|
||||
// 节点
|
||||
'nodes/create' => [NodeController::class, 'create'],
|
||||
'nodes/store' => [NodeController::class, 'store'],
|
||||
'nodes/show' => [NodeController::class, 'show'],
|
||||
'nodes/edit' => [NodeController::class, 'edit'],
|
||||
'nodes/update' => [NodeController::class, 'update'],
|
||||
'nodes/destroy' => [NodeController::class, 'destroy'],
|
||||
'nodes/status' => [NodeController::class, 'status'],
|
||||
'nodes/fromPlan' => [NodeController::class, 'fromPlan'],
|
||||
|
||||
// 节点参与人
|
||||
'members/store' => [MemberController::class, 'store'],
|
||||
'members/destroy' => [MemberController::class, 'destroy'],
|
||||
'members/addAll' => [MemberController::class, 'addAll'],
|
||||
|
||||
// 评论(活动级 + 节点级)
|
||||
'comments/store' => [CommentController::class, 'store'],
|
||||
'comments/destroy' => [CommentController::class, 'destroy'],
|
||||
|
||||
// 花销与分摊
|
||||
'expenses/store' => [ExpenseController::class, 'store'],
|
||||
'expenses/destroy' => [ExpenseController::class, 'destroy'],
|
||||
|
||||
// 角色标签
|
||||
'role_tags/index' => [RoleTagController::class, 'index'],
|
||||
'role_tags/create' => [RoleTagController::class, 'create'],
|
||||
'role_tags/store' => [RoleTagController::class, 'store'],
|
||||
'role_tags/edit' => [RoleTagController::class, 'edit'],
|
||||
'role_tags/update' => [RoleTagController::class, 'update'],
|
||||
'role_tags/destroy' => [RoleTagController::class, 'destroy'],
|
||||
|
||||
// 用户
|
||||
'users/index' => [UserController::class, 'index'],
|
||||
'users/create' => [UserController::class, 'create'],
|
||||
'users/store' => [UserController::class, 'store'],
|
||||
'users/edit' => [UserController::class, 'edit'],
|
||||
'users/update' => [UserController::class, 'update'],
|
||||
'users/destroy' => [UserController::class, 'destroy'],
|
||||
'users/uploadAvatar' => [UserController::class, 'uploadAvatar'],
|
||||
|
||||
// 节点类型
|
||||
'node_types/index' => [NodeTypeController::class, 'index'],
|
||||
'node_types/create' => [NodeTypeController::class, 'create'],
|
||||
'node_types/store' => [NodeTypeController::class, 'store'],
|
||||
'node_types/edit' => [NodeTypeController::class, 'edit'],
|
||||
'node_types/update' => [NodeTypeController::class, 'update'],
|
||||
'node_types/destroy' => [NodeTypeController::class, 'destroy'],
|
||||
|
||||
// 出行方式
|
||||
'travel_modes/index' => [TravelModeController::class, 'index'],
|
||||
'travel_modes/create' => [TravelModeController::class, 'create'],
|
||||
'travel_modes/store' => [TravelModeController::class, 'store'],
|
||||
'travel_modes/edit' => [TravelModeController::class, 'edit'],
|
||||
'travel_modes/update' => [TravelModeController::class, 'update'],
|
||||
'travel_modes/destroy' => [TravelModeController::class, 'destroy'],
|
||||
|
||||
// 车辆
|
||||
'vehicles/index' => [VehicleController::class, 'index'],
|
||||
'vehicles/create' => [VehicleController::class, 'create'],
|
||||
'vehicles/store' => [VehicleController::class, 'store'],
|
||||
'vehicles/edit' => [VehicleController::class, 'edit'],
|
||||
'vehicles/update' => [VehicleController::class, 'update'],
|
||||
'vehicles/destroy' => [VehicleController::class, 'destroy'],
|
||||
];
|
||||
|
||||
if (!isset($map[$route])) {
|
||||
http_response_code(404);
|
||||
exit('404 页面不存在: ' . htmlspecialchars($route));
|
||||
}
|
||||
|
||||
[$class, $method] = $map[$route];
|
||||
(new $class())->$method();
|
||||
Reference in New Issue
Block a user