交通字段简化 + 照片多图/裁剪/双存储后端 + 界面重构
交通字段 - 飞机只记航班号、火车只记车次,不再收座位号 / 线路 / 承运人 / 登机口 (多人同乘一趟时座位号本来就无意义) - trip_nodes 的历史列保留但不再写入也不再渲染,编辑一次即被显式清成 NULL - 节点表单按出行方式切换号码标签(航班号 / 车次 / 班次 / 线路 / 航次) 照片 - 一个节点可传多张照片,前端支持逐张裁剪(Cropper.js,只把裁过的走 base64) - MIME 由自建的 src/Mime.php 按内容识别:getimagesize → 魔数嗅探 → 扩展名映射, 刻意不依赖 fileinfo —— 线上同时装着 PHP 7.4(没装该扩展)与 8.1 - 单张体积上限、可传张数在设置页可调 双存储后端 - 本站 uploads/ 或阿里云 OSS,在「存储设置」页配 endpoint / 桶名 / 前缀 / 内网开关; OSS 配置不完整时静默回退本地,避免管理员填错就把上传整个弄挂 - OSS 鉴权支持 ECS 实例 RAM 角色换 STS 临时凭证(临时凭证缓存在 /tmp,不落 Web 目录), 也支持直接填 AccessKey - OSS V1 签名手写实现,不引 SDK(本项目无 composer / 无 autoload) 媒体代理 - 照片与活动封面一律经 media/show、media/cover 代理输出,先校验家庭归属再吐字节 - 页面里不出现 OSS 域名,也不出现本地真实路径;桶保持私有 - 响应带 nosniff,并关闭 display_errors,免得 PHP 报错混进图片正文把图弄坏 数据库 - 新增迁移机制(src/Migrate.php + tools/migrate.php,仅 CLI 可跑) - 建 app_settings 表;attachments 增加 storage / object_key / mime_type / size_bytes / width / height / is_image 与 idx_storage - MySQL 8 不支持「加列时带 IF NOT EXISTS」,迁移一律先查 information_schema 界面 - 顶栏只留品牌与「新建活动」,其余入口收进右上角下拉菜单(details/summary,零 JS 可开合) - 新增「存储设置」页:当前生效存储、数据库结构版本、是否 ECS 运行环境三张状态卡, 外加测试连接与角色探测 - 样式表整体重写 验证 - 模板渲染检查 234 项、SQL 列名静态检查、模板到 CSS 的类覆盖检查、内联 JS 语法检查全通过 - 已部署到 trip.yangyq.net 并完成线上验证:双 PHP(8.1 / 7.4)14 条路由渲染字节数完全一致、 26 项内容断言全部通过、照片代理取件与磁盘原件逐字节一致(69/69 字节)
This commit is contained in:
+94
-22
@@ -1,9 +1,16 @@
|
||||
<?php $__isLoggedIn = \App\Auth::check(); ?>
|
||||
<?php
|
||||
$__isLoggedIn = \App\Auth::check();
|
||||
$__user = $__isLoggedIn ? \App\Auth::user() : null;
|
||||
$__isAdmin = $__isLoggedIn && \App\Auth::isAdmin();
|
||||
$__name = (string)($__user['name'] ?? ($_SESSION['user_name'] ?? ''));
|
||||
$__avatar = (string)($__user['avatar'] ?? '');
|
||||
$__initial = $__name !== '' ? mb_substr($__name, 0, 1) : '·';
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
|
||||
<title><?= e($pageTitle ?? '家庭出行记录') ?></title>
|
||||
<link rel="stylesheet" href="/assets/style.css">
|
||||
<link rel="stylesheet" href="/assets/vendor/cropper/cropper.min.css">
|
||||
@@ -23,24 +30,73 @@
|
||||
<body>
|
||||
<?php if ($__isLoggedIn): ?>
|
||||
<header class="topbar">
|
||||
<a href="<?= url('activities/index') ?>" class="brand">🏠 家庭出行记录</a>
|
||||
<nav>
|
||||
<a href="<?= url('activities/index') ?>">活动列表</a>
|
||||
<a href="<?= url('activities/create') ?>" class="btn-primary">+ 新建活动</a>
|
||||
<?php if (\App\Auth::isAdmin()): ?>
|
||||
<a href="<?= url('node_types/index') ?>">节点类型</a>
|
||||
<a href="<?= url('vehicles/index') ?>">车辆</a>
|
||||
<a href="<?= url('travel_modes/index') ?>">出行方式</a>
|
||||
<a href="<?= url('role_tags/index') ?>">角色标签</a>
|
||||
<a href="<?= url('users/index') ?>">用户管理</a>
|
||||
<?php endif; ?>
|
||||
<span class="user-info">
|
||||
<a href="<?= url('users/edit', ['id' => \App\Auth::id()]) ?>" style="color:#555; text-decoration:none;">
|
||||
<?= e($_SESSION['user_name'] ?? '') ?>
|
||||
</a>
|
||||
</span>
|
||||
<a href="<?= url('auth/logout') ?>" class="logout-link">退出</a>
|
||||
</nav>
|
||||
<a href="<?= url('activities/index') ?>" class="brand">
|
||||
<span class="brand-mark">🧭</span>
|
||||
<span class="brand-text">家庭出行记录</span>
|
||||
</a>
|
||||
|
||||
<div class="topbar-right">
|
||||
<a href="<?= url('activities/create') ?>" class="btn-primary btn-sm topbar-new">+ 新建活动</a>
|
||||
|
||||
<?php /* 原生 details 做下拉:不依赖 JS,键盘可用,点外部失焦由 JS 兜底 */ ?>
|
||||
<details class="menu" id="user-menu">
|
||||
<summary class="menu-trigger" aria-label="打开菜单">
|
||||
<?php if ($__avatar !== ''): ?>
|
||||
<img class="avatar-xs" src="<?= e(media_avatar($__avatar)) ?>" alt="">
|
||||
<?php else: ?>
|
||||
<span class="avatar-xs avatar-initial"><?= e($__initial) ?></span>
|
||||
<?php endif; ?>
|
||||
<span class="menu-name"><?= e($__name) ?></span>
|
||||
<span class="menu-caret" aria-hidden="true">▾</span>
|
||||
</summary>
|
||||
|
||||
<div class="menu-panel">
|
||||
<div class="menu-head">
|
||||
<div class="menu-head-name"><?= e($__name) ?></div>
|
||||
<div class="menu-head-role"><?= $__isAdmin ? '管理员' : '家庭成员' ?></div>
|
||||
</div>
|
||||
|
||||
<a class="menu-item" href="<?= url('activities/index') ?>">
|
||||
<span class="menu-icon">📋</span> 活动列表
|
||||
</a>
|
||||
<a class="menu-item" href="<?= url('activities/create') ?>">
|
||||
<span class="menu-icon">➕</span> 新建活动
|
||||
</a>
|
||||
<?php if (\App\Auth::id()): ?>
|
||||
<a class="menu-item" href="<?= url('users/edit', ['id' => \App\Auth::id()]) ?>">
|
||||
<span class="menu-icon">🙋</span> 我的资料
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ($__isAdmin): ?>
|
||||
<div class="menu-sep">管理</div>
|
||||
<a class="menu-item" href="<?= url('travel_modes/index') ?>">
|
||||
<span class="menu-icon">🚄</span> 出行方式
|
||||
</a>
|
||||
<a class="menu-item" href="<?= url('vehicles/index') ?>">
|
||||
<span class="menu-icon">🚗</span> 车辆
|
||||
</a>
|
||||
<a class="menu-item" href="<?= url('node_types/index') ?>">
|
||||
<span class="menu-icon">🏷️</span> 节点类型
|
||||
</a>
|
||||
<a class="menu-item" href="<?= url('role_tags/index') ?>">
|
||||
<span class="menu-icon">🎭</span> 角色标签
|
||||
</a>
|
||||
<a class="menu-item" href="<?= url('users/index') ?>">
|
||||
<span class="menu-icon">👥</span> 用户管理
|
||||
</a>
|
||||
<a class="menu-item" href="<?= url('settings/index') ?>">
|
||||
<span class="menu-icon">🗄️</span> 存储设置
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="menu-sep"></div>
|
||||
<a class="menu-item menu-item-danger" href="<?= url('auth/logout') ?>">
|
||||
<span class="menu-icon">🚪</span> 退出登录
|
||||
</a>
|
||||
</div>
|
||||
</details>
|
||||
</div>
|
||||
</header>
|
||||
<?php endif; ?>
|
||||
|
||||
@@ -52,7 +108,23 @@
|
||||
</main>
|
||||
|
||||
<?php if ($__isLoggedIn): ?>
|
||||
<footer class="footer">家庭出行记录 · V1.0</footer>
|
||||
<footer class="footer">家庭出行记录</footer>
|
||||
<script>
|
||||
// 原生 details 不会因为点击面板外部而收起,这里补一句(不依赖它也能用)
|
||||
document.addEventListener('click', function (ev) {
|
||||
var menu = document.getElementById('user-menu');
|
||||
if (menu && menu.open && !menu.contains(ev.target)) {
|
||||
menu.open = false;
|
||||
}
|
||||
});
|
||||
// Esc 收起
|
||||
document.addEventListener('keydown', function (ev) {
|
||||
var menu = document.getElementById('user-menu');
|
||||
if (ev.key === 'Escape' && menu && menu.open) {
|
||||
menu.open = false;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<?php endif; ?>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user