Compare commits

..

10 Commits

Author SHA1 Message Date
QQ b58753fc35 fix: polish dashboard layout and harden deployment rollback 2026-11-04 10:22:44 +08:00
QQ c9a93eb2c0 fix(dash): 搜索框内层方框 + 最近动态首条直角
1) 搜索框框套框:Fomantic 的 input[type=search]:focus 特异性高于
   .qq-dash-search input,聚焦时把 border/background 又画回来了。
   改为 !important + appearance:none + :focus-visible 全清,只留胶囊外框。
2) 最近动态第一条:卡片 12px 圆角会把首条行裁成圆角,
   给 .qq-dash-card.qq-dash-feed / #activity-feed / 首条 flex-item 置 0。
样式表 ?v=24
2026-11-03 23:29:07 +08:00
QQ d7c81adb0e style(heat): 只保留里面那层框——外框彻底关掉,框画在 #user-heatmap 上 2026-11-03 23:15:31 +08:00
QQ 41cd7d62a7 fix(css): 补上 .qq-quick-d 漏掉的右花括号(这才是框失效的真因)
排查发现 qq-pages.css 第 537 行起的 .qq-quick-d 规则没有闭合,
后面的 .qq-dash-heat / .qq-dash-feed 等规则全被浏览器当成 CSS 嵌套,
编译成 .qq-quick-d .qq-dash-heat —— 永远匹配不到任何元素。
所以最近几次热力图改动线上根本没生效。

这次:
1. 补回花括号,规则回到顶层作用域
2. 热力图改成「单框」:外层卡片 padding 归零、描边保留,
   内层 #user-heatmap 自己留 12px/16px 呼吸空间
样式表 ?v=21
2026-11-03 23:13:53 +08:00
QQ 244d2c8f52 style(heat): 去掉外面那层卡片框,只留热力图自带的框
原因:dashboard.tmpl 把 user/heatmap 子模板包在 <section class="qq-dash-card qq-dash-heat"> 里,
.qq-dash-card 画了 1px 描边 + 圆角 + 底色;而热力图组件自己又渲染了一层带框的盘子。
两层叠在一起就是「框套框」。

现在把外层卡片的描边/底色/内边距全部关掉(.qq-dash-card.qq-dash-heat),
组件那层框原样保留,宽高与 aspect-ratio 一律不动,格子不会被拉长。

样式表 ?v=20
2026-11-03 23:11:27 +08:00
QQ 22b95cb59a style(dashboard): 欢迎语 → 通栏热力图 → 三栏
QQ 要的顺序:热力图放在快捷导航/搜索栏/快捷入口上面,欢迎语在热力图上面。

- dashboard.tmpl: <h1.qq-dash-hello> 与 heatmap 段移到 .qq-dash-grid 之前,
  热力图独占一行通栏;网格里只剩左导航 / 中栏 / 右快捷入口
- .qq-dash-hello: 24px、margin 0 0 14px(回到页头样式)
- .qq-dash-heat: margin 0 0 18px,作为通栏卡片
- 预览 mock 同步;样式表 ?v=19
2026-11-03 23:09:31 +08:00
QQ bfee576b7e style(dashboard): 问候语移到中栏最上方,夹在快捷导航与快捷入口之间
- dashboard.tmpl: <h1 class=qq-dash-hello> 从页头移回 .qq-dash-main 第一行
- .qq-dash-hello: min-height 用 --qq-row(34px) + align-items:center,
  和左栏 summary、右栏 panel-head 同一行高,三栏首行继续顶部对齐
- margin 18px -> 12px,紧贴下面的搜索框
- 预览 mock 同步;样式表 ?v=18
2026-11-03 21:52:08 +08:00
QQ 39655d6cab revert(heat): 热力图恢复 v1.2.1-live 的样式
QQ 选定 v1.2.1-live:.qq-dash-heat 回到 padding:14px 16px 8px,
即热力图仍然装在我们的卡片里(带描边与内边距)。
其余所有改动(右栏快捷入口、胶囊搜索框、动态流内边距、问候语位置、
页脚三段布局)保持不变。

样式表 ?v=17
2026-11-03 21:45:35 +08:00
QQ 3a3c06936f style(heat): 热力图独立成块,不再套在我们的卡片里
QQ 要的是「热力图自己一个框,外面不要再有框」。
之前两版理解反了:一直在想怎么去掉里面那个,其实该去掉的是外面这层卡片。

.qq-dash-card.qq-dash-heat 现在 padding:0 / border:0 / 背景透明 / 无阴影,
只留组件自带的那个盘子,直接坐在页面底色上。
样式表 ?v=16
2026-11-03 14:34:29 +08:00
QQ e45d73bec9 style(heat): 只抹掉热力图内层的描边/底色,不动宽度约束
上一版把内层整段压平,SVG 按整列铺开、方格被拉成长条。
这次限定在 #user-heatmap 的两层包装 div 上,只覆盖
border / box-shadow / background / outline,
width、aspect-ratio、padding 全部保留,方格比例不受影响。
样式表 ?v=15
2026-11-03 14:32:39 +08:00
13 changed files with 308 additions and 135 deletions

View File

@ -3,7 +3,7 @@
> 目标实例:`https://git.qyhhh.top`(`Gitea 1.21.11`,二进制 `/usr/local/bin/gitea`,运行用户 `git:git`)
> 本仓库是**外观定制的工作目录(staging)**。所有改动先在这里做出来、经确认后再复制进 `/var/lib/gitea/custom`。
当前状态:**`v1.0-live` 已上线**(2026-11-03 部署到 `https://git.qyhhh.top`,`DEFAULT_THEME = qq-auto`,旧主题全部保留可切回)。
当前状态:**`v1.3.13-live` 已上线**(2026-11-03 部署到 `https://git.qyhhh.top`,`DEFAULT_THEME = qq-auto`,旧主题全部保留可切回)。
## 一、铁律(不可违反)
@ -64,8 +64,8 @@
# 改配色只需动 scripts/build_theme.py 顶部的常量,然后:
python3 scripts/build_theme.py && python3 scripts/audit_colors.py
# 2) 打候选版本,等批准
git tag v1.0-rc1
# 2) 打候选版本,等批准(按实际版本号替换 X.Y.Z)
git tag vX.Y.Z-rc1
# 3) 批准后部署(先备份,再同步、修权限、重启)
./scripts/deploy.sh # 预演,安全
@ -78,12 +78,12 @@ git tag v1.0-rc1
## 六、版本标签约定
| `v1.0-rc2` | 品牌定名 QQGit(APP_NAME 已改,页签标题实测生效),口号「自己的代码,自己的地方。」 |
| 标签 | 含义 |
| --- | --- |
| `v0.0-baseline` | 线上原始状态 + 官方 1.21.11 模板快照 |
| `v1.0-rc2` | 工作目录候选版:Logo 全套 + 三主题 + 模板钩子 + 预览页,**未上线** |
| `v1.0-live` | 已部署到线上并通过验收(当前线上版本) |
| `vX.Y.Z-rcN` | 已完成本地检查、等待批准部署的候选版本 |
| `vX.Y.Z-live` | 已部署到线上并通过验收的版本 |
| `v1.3.13-live` | 当前线上版本:搜索框去内框 + 最近动态首项直角修复 |
## 七、上传限制(现状记录,不在本次改动范围)

View File

@ -408,15 +408,15 @@
}
/* 中栏 */
/* 页头问候语:横跨整页、左对齐,位于三栏之上 */
/* 问候语:顶部通栏,位于热力图上方 */
.qq-dash-hello {
display: flex;
align-items: baseline;
flex-wrap: wrap;
gap: 6px;
box-sizing: border-box;
margin: 0 0 18px;
font-size: 22px;
margin: 0 0 14px;
font-size: 24px;
font-weight: 650;
line-height: 1.25;
letter-spacing: -0.01em;
@ -460,12 +460,21 @@
opacity: 0.72;
}
.qq-dash-search input {
/* 输入框本身不画任何框:外层胶囊已经是唯一的一层框。
Gitea 主题会给 input 描边+焦点阴影,这里逐项压掉(含浏览器原生 search 外观)。 */
.qq-dash-search input,
.qq-dash-search input[type="search"] {
flex: 1 1 auto;
min-width: 0;
height: 100%;
border: 0;
background: transparent;
-webkit-appearance: none;
appearance: none;
padding: 0 !important;
margin: 0 !important;
border: 0 !important;
border-radius: 0 !important;
background: transparent !important;
box-shadow: none !important;
color: var(--color-text);
font-size: 13px;
}
@ -475,8 +484,11 @@
opacity: 0.8;
}
.qq-dash-search input:focus {
outline: none;
.qq-dash-search input:focus,
.qq-dash-search input:focus-visible {
outline: 0 !important;
border: 0 !important;
box-shadow: none !important;
}
.qq-dash-card {
@ -538,19 +550,41 @@
font-size: 12px;
color: var(--color-text-light-2);
}
/* 浏览器计算样式确认:内圈来自 .vch__container 的 box-shadow 描边,
#user-heatmap 的 border 会额外画出外圈,因此这里只保留组件的内圈。
局部色阶变量不保证能覆盖其他主题的格子规则;颜色需单独视觉验收。
外包装不留左右缩进,让内圈与下方三栏外沿对齐;保留 SVG overflow。 */
.qq-dash-card.qq-dash-heat {
padding: 0;
border: 0 !important;
border-radius: 0;
background: transparent !important;
box-shadow: none !important;
margin: 0 0 18px;
}
/* 热力图卡片:官方模板自带 divider,卡片里不需要 */
.qq-dash-heat {
padding: 14px 16px 8px;
.qq-dash-heat #user-heatmap {
--color-primary-light-4: #dbeafe;
--color-primary-light-2: #93c5fd;
--color-primary: #3b82f6;
--color-primary-dark-2: #2563eb;
--color-primary-dark-4: #1d4ed8;
box-sizing: border-box;
padding: 12px 1px 6px; /* 为组件向外绘制的 1px 阴影描边留位,对齐三栏外沿 */
border: 0 !important;
border-radius: 0;
background: transparent !important;
box-shadow: none !important;
}
.qq-dash-heat #user-heatmap .vch__wrapper {
overflow: visible;
}
.qq-dash-heat .divider {
display: none;
}
.qq-dash-heat #user-heatmap {
margin: 0;
}
/* 动态流:Gitea 1.21 用的是 .flex-list / .flex-item(不是老的 .ui.feed),
@ -566,7 +600,19 @@
}
.qq-dash-feed .flex-item:first-child {
border-top: 0;
border-top: 1px solid var(--color-secondary);
}
/* 「最近动态」外卡保留圆角;第一条动态与标题栏无缝相接,自己不画上圆角。 */
.qq-dash-card.qq-dash-feed {
border-radius: 12px;
overflow: hidden;
}
.qq-dash-feed #activity-feed,
.qq-dash-feed .flex-item:first-child {
border-top-left-radius: 0 !important;
border-top-right-radius: 0 !important;
}
.qq-dash-feed .flex-item-main {
@ -737,3 +783,4 @@
border-bottom: 1px solid var(--color-secondary);
}
}

View File

@ -55,6 +55,10 @@ samp,
/* ---------------------------------------------------------------- 顶栏:细线 + 轻磨砂 */
#navbar {
/* backdrop-filter 创建独立层叠上下文;将整个导航层抬到正文和 sticky 侧栏之上。
仅提高菜单自身 z-index 无法越过父层;30 仍低于原生模态遮罩。 */
position: relative;
z-index: 30;
border-bottom: 1px solid var(--color-secondary);
backdrop-filter: saturate(150%) blur(8px);
-webkit-backdrop-filter: saturate(150%) blur(8px);

View File

@ -4,9 +4,9 @@
注意:只做外观增强,不引入任何外部依赖,全部资源随 custom/ 一起发布
*/}}
<link rel="preload" href="{{AssetUrlPrefix}}/fonts/jetbrains-mono-latin-400-normal.woff2" as="font" type="font/woff2" crossorigin="anonymous">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/qq-ui.css?v=14">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/qq-fx.css?v=14">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/qq-pages.css?v=14">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/qq-ui.css?v=29">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/qq-fx.css?v=26">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/qq-pages.css?v=28">
<meta name="theme-color" content="#60A5FA" media="(prefers-color-scheme: light)">
<meta name="theme-color" content="#0D1117" media="(prefers-color-scheme: dark)">

View File

@ -60,8 +60,8 @@
<span>开源协议</span>
</div>
<div class="qq-lp-stat">
<strong>SQLite</strong>
<span>零依赖存储</span>
<strong>MySQL</strong>
<span>独立数据库存储</span>
</div>
<div class="qq-lp-stat">
<strong>1 台</strong>

View File

@ -9,11 +9,15 @@
<div class="qq-dash-shell">
{{template "base/alert" .}}
{{/* 问候语单独做成页头:左置顶,横跨整页;下面三栏再在它下面顶部对齐 */}}
{{/* 顶部通栏:欢迎语在上,贡献热力图在下;三栏在它们下面 */}}
<h1 class="qq-dash-hello">
{{.SignedUser.Name}}<span class="qq-dash-hi">,欢迎回来</span>
</h1>
<section class="qq-dash-card qq-dash-heat qq-dash-heat-top">
{{template "user/heatmap" .}}
</section>
<div class="qq-dash-grid">
<aside class="qq-dash-side">
@ -67,10 +71,6 @@
</div>
</section>
<section class="qq-dash-card qq-dash-heat">
{{template "user/heatmap" .}}
</section>
<section class="qq-dash-card qq-dash-feed">
<div class="qq-panel-head">最近动态</div>
{{template "user/dashboard/feeds" .}}

View File

@ -5,7 +5,7 @@
## 一、前提
1. 已在本地/镜像里打开 `preview/index.html`,日夜两种模式都看过,认可配色与留白。
2. 仓库已打标签 `v1.0-rc1`(`git tag -l` 可查)。
2. 仓库已按实际版本打候选标签 `vX.Y.Z-rcN`(`git tag -l` 可查)。
3. QQ 明确说过「可以部署」。
## 二、预演(随时可做,零风险)
@ -30,12 +30,15 @@ cd ~/projects/Gitea-font
## 四、回滚
部署脚本会完整备份 `custom/`(包含三套 `theme-qq*.css`)和 `app.ini`,并在重启或 HTTP 健康检查失败时自动回滚。人工回滚统一使用:
```bash
sudo tar xzf /var/backups/gitea-custom-<时间戳>.tar.gz -C /
sudo chown -R git:git /var/lib/gitea/custom
sudo systemctl restart gitea
./scripts/rollback.sh --list
./scripts/rollback.sh /var/backups/gitea-custom-<时间戳>.tar.gz
```
`rollback.sh` 会先校验归档、再备份当前状态、停止服务,并通过 `rsync --delete` 精确恢复。旧版本部署脚本生成的备份缺少 QQ 主题,默认拒绝;只有确认承担主题缺失风险时才可附加 `--allow-incomplete`。
## 五、部署后自查清单
- [ ] `https://git.qyhhh.top/` 首页 logo 变成蓝白 Git-Q,圆外无白框

View File

@ -7,9 +7,9 @@
| 项目 | 值 |
| --- | --- |
| 线上地址 | <https://git.qyhhh.top> |
| Gitea 版本 | 1.21.11(`bindata, sqlite`) |
| Gitea 版本 | 1.21.11(生产数据库:MySQL) |
| 生效主题 | `DEFAULT_THEME = qq-auto`(浅色 `qq-light` / 深色 `qq-dark` / 跟随系统 `qq-auto`) |
| 当前标签 | `v1.3.3-live`(右栏去重 + 热力图单层框) |
| 当前标签 | `v1.3.13-live`(搜索框去内框 + 最近动态首项直角修复) |
| 源码仓库 | <https://github.com/newbieQQ/QQGit>(private) |
| 回滚方式 | `./scripts/rollback.sh /var/backups/gitea-custom-<时间戳>.tar.gz` |

View File

@ -29,14 +29,19 @@
<input type="search" placeholder="搜索仓库…" style="max-width:180px;margin-right:10px">
<span class="avatar">Q</span>
</nav>
<div role="main" aria-label="仪表盘" class="page-content dashboard feeds qq-dash">
<div class="qq-dash-shell">
<h1 class="qq-dash-hello">newbie<span class="qq-dash-hi">,欢迎回来</span></h1>
<div class="qq-dash-grid">
<section class="qq-dash-card qq-dash-heat qq-dash-heat-top">
<div class="qq-heatmap-mock">
<div class="qq-heatmap-cells"></div>
<div class="qq-heatmap-legend"><span>少</span><i></i><i></i><i></i><i></i><i></i><span>多</span></div>
</div>
</section>
<div class="qq-dash-grid">
<aside class="qq-dash-side">
<details class="qq-quicknav">
<summary>
@ -72,6 +77,7 @@
<main class="qq-dash-main">
<form class="qq-dash-search" onsubmit="return false">
<span>⌕</span>
<input type="search" placeholder="前往仓库…(输入关键字回车搜索)">
@ -98,12 +104,6 @@
</div>
</section>
<section class="qq-dash-card qq-dash-heat">
<div class="qq-heatmap-mock">
<div class="qq-heatmap-cells"></div>
<div class="qq-heatmap-legend"><span>少</span><i></i><i></i><i></i><i></i><i></i><span>多</span></div>
</div>
</section>
<section class="qq-dash-card qq-dash-feed">
<div class="qq-panel-head">最近动态</div>

View File

@ -15,7 +15,14 @@ CSS_DIR = ROOT / "custom" / "public" / "assets" / "css"
HEX_RE = re.compile(r"#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b")
GREEN_RANGE = (60, 170) # 色相区间:绿 → 黄绿
FILES = ["theme-qq-auto.css", "theme-qq-light.css", "theme-qq-dark.css", "qq-ui.css"]
FILES = [
"theme-qq-auto.css",
"theme-qq-light.css",
"theme-qq-dark.css",
"qq-ui.css",
"qq-pages.css",
"qq-fx.css",
]
def hue_of(h):

View File

@ -13,7 +13,7 @@ OWN = {'--qq-font-mono', '--disc', '--mark'}
def vars_in(p):
out = set()
for v in re.findall(r'--[a-z0-9-]+', pathlib.Path(p).read_text()):
for v in re.findall(r'--[a-z0-9-]+', pathlib.Path(p).read_text(encoding="utf-8")):
if v.strip('-') and not v.endswith('-'):
out.add(v)
return out
@ -32,15 +32,15 @@ def main():
print(f'{name:5s} 缺失变量: {missing if missing else "无"}')
ok = ok and not missing
tmpl = (ROOT / 'custom/templates/home.tmpl').read_text()
tmpl = (ROOT / 'custom/templates/home.tmpl').read_text(encoding="utf-8")
classes = sorted({c for group in re.findall(r'class="([^"]+)"', tmpl) for c in group.split()})
ui = (CSS / 'qq-ui.css').read_text()
ui = (CSS / 'qq-ui.css').read_text(encoding="utf-8")
for cls in ('qq-home-cards', 'qq-home-card', 'qq-footer', 'page-content'):
has = ('.' + cls) in ui
print(f'qq-ui 含 .{cls}: {has}')
ok = ok and has
auto = (CSS / 'theme-qq-auto.css').read_text().replace(' ', '')
auto = (CSS / 'theme-qq-auto.css').read_text(encoding="utf-8").replace(' ', '')
has_media = '@media(prefers-color-scheme:dark)' in auto
print('theme-qq-auto 含日夜媒体查询:', has_media)
ok = ok and has_media

View File

@ -1,20 +1,9 @@
#!/usr/bin/env bash
# =============================================================================
# deploy.sh —— 把工作目录里验收通过的 custom/ 拷进线上 Gitea
# deploy.sh —— 把工作目录里验收通过的 custom/ 同步到线上 Gitea
#
# 默认:只做「预演」(dry-run),打印将要发生的一切,不动线上任何文件。
# 真正执行:必须显式加 --yes。
#
# 用法:
# ./scripts/deploy.sh # 预演,安全
# ./scripts/deploy.sh --yes # 真部署(备份 → 复制 → chown → 重启)
# ./scripts/deploy.sh --yes --patch-ini # 同时把 app.ini 的 [ui] 主题列表换成 qq 系列
#
# 铁律:
# 1. 任何写入前先备份 /var/lib/gitea/custom 与 /etc/gitea/app.ini,备份落在
# /var/backups/gitea-custom-<时间戳>.tar.gz(含恢复脚本说明)。
# 2. 只覆盖 custom/,绝不触碰 /usr/local/bin/gitea 与数据库。
# 3. 只有 QQ 明确同意后才能加 --yes 运行。
# 默认:只做预演,打印动作,不修改线上文件。
# 真正执行:必须显式加 --yes;只有 QQ 明确同意后才能运行。
# =============================================================================
set -euo pipefail
@ -29,101 +18,143 @@ DO_IT=0
PATCH_INI=0
for arg in "$@"; do
case "$arg" in
--yes) DO_IT=1 ;;
--yes) DO_IT=1 ;;
--patch-ini) PATCH_INI=1 ;;
-h|--help) sed -n '2,20p' "$0"; exit 0 ;;
-h|--help) sed -n '2,8p' "$0"; exit 0 ;;
*) echo "未知参数: $arg" >&2; exit 2 ;;
esac
done
say() { printf '\033[36m==>\033[0m %s\n' "$*"; }
warn() { printf '\033[33m[!]\033[0m %s\n' "$*"; }
fail() { printf '\033[31m[错误]\033[0m %s\n' "$*" >&2; exit 1; }
[ -d "$SRC_CUSTOM" ] || { echo "找不到 $SRC_CUSTOM" >&2; exit 1; }
[ -d "$SRC_CUSTOM" ] || fail "找不到 $SRC_CUSTOM"
for required in \
templates/base/footer_content.tmpl \
public/assets/css/qq-pages.css \
public/assets/css/theme-qq-auto.css \
public/assets/css/theme-qq-light.css \
public/assets/css/theme-qq-dark.css; do
[ -f "$SRC_CUSTOM/$required" ] || fail "源码缺少关键文件:custom/$required"
done
# ---------------------------------------------------------------- 1. 内容清单
say "源目录:$SRC_CUSTOM"
find "$SRC_CUSTOM" -type f | sed "s|$SRC_CUSTOM/| custom/|" | sort
if [ "$DO_IT" -eq 0 ]; then
say "预演:下面这些动作会在加 --yes 后真正执行"
echo " 1) tar 备份 $DST_CUSTOM 与 $APP_INI -> $BACKUP"
echo " 2) rsync 复制 custom/ -> $DST_CUSTOM/"
echo " 3) chown -R git:git $DST_CUSTOM"
echo " 4) systemctl restart gitea"
[ "$PATCH_INI" -eq 1 ] && echo " 5) 改写 $APP_INI 的 [ui] DEFAULT_THEME / THEMES(先备份 .bak-$STAMP)"
say "预演:加 --yes 后会执行"
echo " 1) 完整备份 $DST_CUSTOM 与 $APP_INI -> $BACKUP"
echo " 2) 校验备份含 app.ini、QQ 主题与关键模板"
echo " 3) rsync --delete-delay 同步 custom/(保留线上额外的 theme-*.css)"
echo " 4) 修正权限、重启并执行 HTTP 健康检查"
echo " 5) 任一步骤失败时调用 rollback.sh 精确回滚"
[ "$PATCH_INI" -eq 1 ] && echo " 6) 同步改写 $APP_INI 的 [ui] DEFAULT_THEME / THEMES"
echo
warn "线上未做任何修改。确认外观无误后,再由 QQ 批准执行:./scripts/deploy.sh --yes"
warn "线上未做任何修改。获得 QQ 明确批准后才能执行:./scripts/deploy.sh --yes"
exit 0
fi
# ---------------------------------------------------------------- 2. 备份
say "备份到 $BACKUP"
say "完整备份到 $BACKUP"
sudo mkdir -p /var/backups
sudo tar czf "$BACKUP" -C / \
--exclude='custom/public/assets/css/theme-qq*.css' \
var/lib/gitea/custom etc/gitea/app.ini
sudo tar czf "$BACKUP" -C / var/lib/gitea/custom etc/gitea/app.ini
sudo chmod 600 "$BACKUP"
say "备份完成:$(sudo du -h "$BACKUP" | cut -f1)"
sudo tar tzf "$BACKUP" >/dev/null
for required in \
var/lib/gitea/custom/templates/base/footer_content.tmpl \
var/lib/gitea/custom/public/assets/css/qq-pages.css \
var/lib/gitea/custom/public/assets/css/theme-qq-auto.css \
var/lib/gitea/custom/public/assets/css/theme-qq-light.css \
var/lib/gitea/custom/public/assets/css/theme-qq-dark.css \
etc/gitea/app.ini; do
sudo tar tzf "$BACKUP" | grep -Fx "$required" >/dev/null || fail "备份缺少关键文件:$required"
done
say "备份校验通过:$(sudo du -h "$BACKUP" | cut -f1)"
# ---------------------------------------------------------------- 3. 复制
say "复制 custom/ -> $DST_CUSTOM/"
rollback_on_failure() {
trap - ERR
warn "部署验证失败,立即从 $BACKUP 精确回滚"
"$REPO_DIR/scripts/rollback.sh" --yes "$BACKUP" || {
printf '\033[31m[严重]\033[0m 自动回滚失败,请立即人工处理。备份:%s\n' "$BACKUP" >&2
exit 1
}
fail "部署失败,已恢复到部署前状态"
}
trap 'rollback_on_failure' ERR
say "同步 custom/ -> $DST_CUSTOM/"
sudo mkdir -p "$DST_CUSTOM"
sudo rsync -a --exclude='.git*' "$SRC_CUSTOM/" "$DST_CUSTOM/"
# theme-*.css 可能是管理员另外安装的旧主题;保护它们不被 --delete 删除,
# 同名 QQ 主题仍会从源码正常更新。
if ! sudo rsync -a --delete-delay \
--exclude='.git*' \
--filter='protect public/assets/css/theme-*.css' \
"$SRC_CUSTOM/" "$DST_CUSTOM/"; then
rollback_on_failure
fi
sudo chown -R git:git "$DST_CUSTOM"
say "复制完成"
# ---------------------------------------------------------------- 4. app.ini 可选
if [ "$PATCH_INI" -eq 1 ]; then
say "改写 $APP_INI 的 [ui] 段"
sudo cp -a "$APP_INI" "$APP_INI.bak-$STAMP"
sudo python3 - "$APP_INI" <<'PY'
import sys, re, pathlib
if ! sudo python3 - "$APP_INI" <<'PY'
import pathlib
import sys
p = pathlib.Path(sys.argv[1])
txt = p.read_text()
txt = p.read_text(encoding="utf-8")
themes = ["auto", "gitea", "arc-green", "gitea-gruvbox",
"github-auto", "github-light", "github-dark", "github-soft-dark",
"qq-auto", "qq-light", "qq-dark"]
lines = txt.splitlines()
out, in_ui = [], False
seen = set()
for ln in lines:
s = ln.strip()
if s.startswith("[") and s.endswith("]"):
in_ui = (s == "[ui]")
for line in lines:
stripped = line.strip()
if stripped.startswith("[") and stripped.endswith("]"):
in_ui = stripped == "[ui]"
if in_ui:
if s.lower().startswith("default_theme"):
out.append("DEFAULT_THEME = qq-auto"); seen.add("default"); continue
if s.lower().startswith("themes"):
out.append("THEMES = " + ",".join(themes)); seen.add("themes"); continue
out.append(ln)
if stripped.lower().startswith("default_theme"):
out.append("DEFAULT_THEME = qq-auto")
seen.add("default")
continue
if stripped.lower().startswith("themes"):
out.append("THEMES = " + ",".join(themes))
seen.add("themes")
continue
out.append(line)
if "default" not in seen or "themes" not in seen:
# [ui] 段里缺字段:插到段首
res = []
for ln in out:
res.append(ln)
if ln.strip() == "[ui]":
if "default" not in seen: res.append("DEFAULT_THEME = qq-auto")
if "themes" not in seen: res.append("THEMES = " + ",".join(themes))
out = res
p.write_text("\n".join(out) + "\n")
print("app.ini [ui] 已更新")
updated = []
for line in out:
updated.append(line)
if line.strip() == "[ui]":
if "default" not in seen:
updated.append("DEFAULT_THEME = qq-auto")
if "themes" not in seen:
updated.append("THEMES = " + ",".join(themes))
out = updated
p.write_text("\n".join(out) + "\n", encoding="utf-8")
PY
say "app.ini 已更新(原文件备份为 $APP_INI.bak-$STAMP)"
then
rollback_on_failure
fi
fi
# ---------------------------------------------------------------- 5. 重启
say "重启 gitea"
sudo systemctl restart gitea
sleep 2
systemctl is-active gitea && say "gitea 运行中"
command -v curl >/dev/null && curl -s -o /dev/null -w "HTTP %{http_code}\n" https://git.qyhhh.top/ || true
say "重启 Gitea"
if ! sudo systemctl restart gitea; then
rollback_on_failure
fi
cat <<EOF
healthy=0
for _ in 1 2 3 4 5; do
if systemctl is-active --quiet gitea && \
(! command -v curl >/dev/null || curl -fsS -o /dev/null https://git.qyhhh.top/); then
healthy=1
break
fi
sleep 2
done
[ "$healthy" -eq 1 ] || rollback_on_failure
部署完成。回滚方式:
sudo tar xzf $BACKUP -C /
sudo chown -R git:git $DST_CUSTOM
sudo systemctl restart gitea
EOF
say "部署完成,Gitea 运行正常"
echo "回滚命令:./scripts/rollback.sh $BACKUP"

View File

@ -1,17 +1,44 @@
#!/usr/bin/env bash
# =============================================================================
# rollback.sh —— 从 /var/backups 的 tar 包还原线上 custom/ 与 app.ini
# rollback.sh —— 从 /var/backups 的完整快照精确还原线上 custom/ 与 app.ini
#
# ./scripts/rollback.sh # 列出可用备份
# ./scripts/rollback.sh <备份文件> # 还原指定备份(会再问一次 y/N)
# ./scripts/rollback.sh --list # 同上,列出
# ./scripts/rollback.sh --list
# ./scripts/rollback.sh <备份文件> # 交互确认
# ./scripts/rollback.sh --yes <备份文件> # 自动确认(供 deploy.sh 失败回滚)
# ./scripts/rollback.sh --allow-incomplete <旧备份> # 允许缺少 QQ 主题的历史备份
# =============================================================================
set -euo pipefail
BACKUP_DIR="/var/backups"
DST_CUSTOM="/var/lib/gitea/custom"
APP_INI="/etc/gitea/app.ini"
STAMP="$(date +%Y%m%d-%H%M%S)"
DO_IT=0
ALLOW_INCOMPLETE=0
BACKUP=""
if [ "${1:-}" = "" ] || [ "${1:-}" = "--list" ]; then
say() { printf '\033[36m==>\033[0m %s\n' "$*"; }
warn() { printf '\033[33m[!]\033[0m %s\n' "$*"; }
fail() { printf '\033[31m[错误]\033[0m %s\n' "$*" >&2; exit 1; }
for arg in "$@"; do
case "$arg" in
--yes) DO_IT=1 ;;
--allow-incomplete) ALLOW_INCOMPLETE=1 ;;
--list) ;;
-h|--help)
sed -n '2,9p' "$0"
exit 0
;;
-*) fail "未知参数:$arg" ;;
*)
[ -z "$BACKUP" ] || fail "只能指定一个备份文件"
BACKUP="$arg"
;;
esac
done
if [ -z "$BACKUP" ]; then
echo "可用备份(新的在上):"
ls -1t "$BACKUP_DIR"/gitea-custom-*.tar.gz 2>/dev/null || echo " (没有找到备份)"
echo
@ -19,15 +46,69 @@ if [ "${1:-}" = "" ] || [ "${1:-}" = "--list" ]; then
exit 0
fi
BACKUP="$1"
[ -f "$BACKUP" ] || { echo "备份不存在:$BACKUP" >&2; exit 1; }
[ -f "$BACKUP" ] || fail "备份不存在:$BACKUP"
echo "将把 $BACKUP 解包覆盖 /var/lib/gitea/custom 与 /etc/gitea/app.ini"
read -r -p "确认还原?(y/N) " ans
[ "$ans" = "y" ] || [ "$ans" = "Y" ] || { echo "已取消"; exit 0; }
say "校验备份完整性"
sudo tar tzf "$BACKUP" >/dev/null
if sudo tar tzf "$BACKUP" | grep -E '(^/|(^|/)\.\.(/|$))' >/dev/null; then
fail "备份包含不安全路径,拒绝解包"
fi
for required in \
var/lib/gitea/custom/templates/base/footer_content.tmpl \
var/lib/gitea/custom/public/assets/css/qq-pages.css \
etc/gitea/app.ini; do
sudo tar tzf "$BACKUP" | grep -Fx "$required" >/dev/null || fail "备份缺少关键文件:$required"
done
sudo tar xzf "$BACKUP" -C /
missing_themes=0
for theme in theme-qq-auto.css theme-qq-light.css theme-qq-dark.css; do
if ! sudo tar tzf "$BACKUP" | grep -Fx "var/lib/gitea/custom/public/assets/css/$theme" >/dev/null; then
warn "备份缺少 $theme"
missing_themes=1
fi
done
if [ "$missing_themes" -eq 1 ] && [ "$ALLOW_INCOMPLETE" -ne 1 ]; then
fail "这是历史不完整备份。默认拒绝精确回滚;确认承担主题文件缺失风险后才可加 --allow-incomplete"
fi
if [ "$DO_IT" -ne 1 ]; then
echo "将精确还原 $BACKUP:"
echo " 1) 先完整备份当前 custom/ 与 app.ini"
echo " 2) 解包到临时目录并再次校验"
echo " 3) 停止 Gitea,以 rsync --delete 精确还原 custom/"
echo " 4) 还原 app.ini、权限并启动 Gitea"
read -r -p "确认还原?(y/N) " ans
[ "$ans" = "y" ] || [ "$ans" = "Y" ] || { echo "已取消"; exit 0; }
fi
TMP_DIR="$(mktemp -d)"
trap 'sudo rm -rf "$TMP_DIR"' EXIT
sudo tar xzf "$BACKUP" -C "$TMP_DIR"
SRC_CUSTOM="$TMP_DIR/var/lib/gitea/custom"
SRC_APP_INI="$TMP_DIR/etc/gitea/app.ini"
[ -d "$SRC_CUSTOM" ] || fail "解包后找不到 custom/"
[ -f "$SRC_APP_INI" ] || fail "解包后找不到 app.ini"
SAFETY_BACKUP="$BACKUP_DIR/gitea-pre-rollback-$STAMP.tar.gz"
say "回滚前保护当前状态:$SAFETY_BACKUP"
sudo tar czf "$SAFETY_BACKUP" -C / var/lib/gitea/custom etc/gitea/app.ini
sudo chmod 600 "$SAFETY_BACKUP"
say "停止 Gitea 并精确还原"
sudo systemctl stop gitea
sudo mkdir -p "$DST_CUSTOM"
sudo rsync -a --delete "$SRC_CUSTOM/" "$DST_CUSTOM/"
sudo cp -a "$SRC_APP_INI" "$APP_INI"
sudo chown -R git:git "$DST_CUSTOM"
sudo systemctl restart gitea
sudo systemctl start gitea
sleep 2
systemctl is-active gitea && echo "还原完成,gitea 运行中"
if ! systemctl is-active --quiet gitea; then
fail "Gitea 未能启动;回滚前状态保存在 $SAFETY_BACKUP"
fi
if command -v curl >/dev/null && ! curl -fsS -o /dev/null https://git.qyhhh.top/; then
fail "Gitea 已启动但站点健康检查失败;回滚前状态保存在 $SAFETY_BACKUP"
fi
say "还原完成,Gitea 运行正常"
echo "回滚前状态备份:$SAFETY_BACKUP"