diff --git a/README.md b/README.md
index 77516c8..8dde30e 100644
--- a/README.md
+++ b/README.md
@@ -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` | 当前线上版本:搜索框去内框 + 最近动态首项直角修复 |
## 七、上传限制(现状记录,不在本次改动范围)
diff --git a/custom/public/assets/css/qq-pages.css b/custom/public/assets/css/qq-pages.css
index e276395..090a30f 100644
--- a/custom/public/assets/css/qq-pages.css
+++ b/custom/public/assets/css/qq-pages.css
@@ -550,10 +550,10 @@
font-size: 12px;
color: var(--color-text-light-2);
}
-/* 热力图:只保留「里面那个框」。
- 做法——外层卡片彻底不画框(描边/底色/圆角/内边距全归零),
- 框改由热力图元素自己画(#user-heatmap),这样只有一层,
- 而且是紧贴内容的那一层。 */
+/* 浏览器计算样式确认:内圈来自 .vch__container 的 box-shadow 描边,
+ #user-heatmap 的 border 会额外画出外圈,因此这里只保留组件的内圈。
+ 局部色阶变量不保证能覆盖其他主题的格子规则;颜色需单独视觉验收。
+ 外包装不留左右缩进,让内圈与下方三栏外沿对齐;保留 SVG overflow。 */
.qq-dash-card.qq-dash-heat {
padding: 0;
border: 0 !important;
@@ -564,10 +564,21 @@
}
.qq-dash-heat #user-heatmap {
- padding: 12px 16px 6px;
- border: 1px solid var(--color-secondary);
- border-radius: 12px;
- background: var(--color-box-body);
+ --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 {
@@ -589,15 +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-card.qq-dash-feed,
.qq-dash-feed #activity-feed,
.qq-dash-feed .flex-item:first-child {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
+ border-top-left-radius: 0 !important;
+ border-top-right-radius: 0 !important;
}
.qq-dash-feed .flex-item-main {
diff --git a/custom/public/assets/css/qq-ui.css b/custom/public/assets/css/qq-ui.css
index 060c4cf..3af8bdb 100644
--- a/custom/public/assets/css/qq-ui.css
+++ b/custom/public/assets/css/qq-ui.css
@@ -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);
diff --git a/custom/templates/custom/header.tmpl b/custom/templates/custom/header.tmpl
index 340486a..eb0f7ee 100644
--- a/custom/templates/custom/header.tmpl
+++ b/custom/templates/custom/header.tmpl
@@ -4,9 +4,9 @@
注意:只做外观增强,不引入任何外部依赖,全部资源随 custom/ 一起发布
*/}}
-
-
-
+
+
+
diff --git a/custom/templates/home.tmpl b/custom/templates/home.tmpl
index ed1ba58..fd7aefd 100644
--- a/custom/templates/home.tmpl
+++ b/custom/templates/home.tmpl
@@ -60,8 +60,8 @@
开源协议
- SQLite
- 零依赖存储
+ MySQL
+ 独立数据库存储
1 台
diff --git a/docs/DEPLOY.md b/docs/DEPLOY.md
index 15f0334..fad0dec 100644
--- a/docs/DEPLOY.md
+++ b/docs/DEPLOY.md
@@ -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,圆外无白框
diff --git a/docs/TODO.md b/docs/TODO.md
index ddc6cbe..8750580 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -7,9 +7,9 @@
| 项目 | 值 |
| --- | --- |
| 线上地址 | |
-| 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`(搜索框去内框 + 最近动态首项直角修复) |
| 源码仓库 | (private) |
| 回滚方式 | `./scripts/rollback.sh /var/backups/gitea-custom-<时间戳>.tar.gz` |
diff --git a/scripts/audit_colors.py b/scripts/audit_colors.py
index e94d999..9d4e923 100644
--- a/scripts/audit_colors.py
+++ b/scripts/audit_colors.py
@@ -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):
diff --git a/scripts/check_preview.py b/scripts/check_preview.py
index b51b19c..abf3448 100644
--- a/scripts/check_preview.py
+++ b/scripts/check_preview.py
@@ -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
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 65c1c88..f50ab7b 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -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 </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"
diff --git a/scripts/rollback.sh b/scripts/rollback.sh
index c56db3f..a8be967 100755
--- a/scripts/rollback.sh
+++ b/scripts/rollback.sh
@@ -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"