diff --git a/.cursor/rules/build-scripts.mdc b/.cursor/rules/build-scripts.mdc
index 6d78454..199efaa 100644
--- a/.cursor/rules/build-scripts.mdc
+++ b/.cursor/rules/build-scripts.mdc
@@ -5,7 +5,8 @@ alwaysApply: true
# 编译与构建脚本
-Go 单二进制 + `go:embed` 前端；产物在 `dist/`。
+本分支（`rebuild/gitea-ssr`）：Go 单二进制 + `go:embed` 的 **templates** 与 **public/assets**（由 `web_src` 构建）；产物在 `dist/`。
+对照 SPA 仅在 `main` 分支。
## 运行编译（优先用封装命令，不要猜命令）
@@ -18,15 +19,16 @@ Go 单二进制 + `go:embed` 前端；产物在 `dist/`。
Windows 上**不要**让用户直接 `.\build.ps1`（默认 ExecutionPolicy 会拦截）；应通过 `build.bat`（内部 `-ExecutionPolicy Bypass`）调用。
-常用 target：`build`（默认）、`dev`、`run`、`frontend`、`clean`、`build-all`、`build-windows`、`build-linux`、`tidy`、`help`。
+常用 target：`build`（默认）、`dev`、`run`、`web-src`、`clean`、`build-all`、`build-windows`、`build-linux`、`tidy`、`help`。
## 修改构建脚本时的约定
1. **双轨同步**：`build.ps1` 与 `Makefile` 目标与行为保持一致；改其一须同步另一份。
2. **`build.bat` 仅用 ASCII 注释**：`.bat` 会被 cmd 按 GBK 解析，UTF-8 中文注释会导致整行乱码、`powershell` 无法执行。
3. **`build.ps1` 可用 UTF-8**：由 PowerShell 执行，中文注释无妨。
-4. **构建顺序**：先 `frontend` 内 `npm run build`，再 `go build -trimpath -ldflags "-s -w -X main.version=..." -o dist/jiang13 ./cmd/jiang13`。
+4. **构建顺序**：先 `web_src` 内 `npm run build`（产出 `public/assets`），再 `go build -trimpath -ldflags "-s -w -X main.version=..." -o dist/jiang13 ./cmd/jiang13`。
5. **入口包**：`./cmd/jiang13`；Windows 产物带 `.exe`。
+6. **本分支无 `frontend/`**：勿再添加 SPA 构建步骤；需要对照 UI 时 `git checkout main`。
## 新增 target 检查清单
diff --git a/.cursor/rules/rebuild-gitea-ssr.mdc b/.cursor/rules/rebuild-gitea-ssr.mdc
index 38bd0de..8318764 100644
--- a/.cursor/rules/rebuild-gitea-ssr.mdc
+++ b/.cursor/rules/rebuild-gitea-ssr.mdc
@@ -21,9 +21,14 @@ alwaysApply: true
对齐 [Gitea](https://github.com/go-gitea/gitea) 职责划分：
- `routers/web` — HTML 页面路由
+- `routers/api` — JSON API（原 `handler/`）
+- `routers/setup.go` — 路由总装
- `templates/` — 模板
- `web_src/` → `public/assets/` — 渐进增强 CSS/JS
-- 现有 `service/`、`model/` 可复用业务逻辑
+- `models/`、`services/` — 数据与业务
+- `modules/auth`、`modules/webrender`、`modules/seo` — 横切
+
+本分支**已删除** `frontend/` 与 `embed_static/`；勿再恢复 SPA 生产回落。
细节见 [`docs/rebuild-spec/08-gitea-ssr-architecture.md`](docs/rebuild-spec/08-gitea-ssr-architecture.md)。
diff --git a/.dockerignore b/.dockerignore
index 96abb60..ac6b70b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,17 +4,17 @@
.idea
.vscode
.cursor
+.trae
# 运行时数据与本地配置
data/
app.ini
tmp-cookie.txt
-# 编译产物与前端缓存
+# 编译产物与依赖缓存
dist/
-frontend/node_modules/
-frontend/dist/
-embed_static/static/spa/
+web_src/node_modules/
+public/assets/
node_modules/
.vite/
diff --git a/.gitignore b/.gitignore
index 0f5d4c2..c5e2f31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,22 +4,28 @@
# 本地配置（保留 app.ini.example）
/app.ini
-# 前端依赖与构建缓存
+# Node / 构建缓存
/node_modules/
-/frontend/node_modules/
-/frontend/dist/
-/embed_static/static/spa/
+/web_src/node_modules/
+.vite/
+*.tsbuildinfo
-# Go 编译产物
+# Go 编译产物（统一进 dist/；勿把二进制扔在仓库根目录）
/dist/
*.exe
+/jiang13
+/jiang13-*
+!/cmd/jiang13/
# 临时文件
tmp-cookie.txt
+*-err.txt
+*-out.txt
-# 编辑器 / OS
+# 编辑器 / AI 草稿 / OS
.idea/
.vscode/
+.trae/
*.swp
Thumbs.db
.DS_Store
diff --git a/Dockerfile b/Dockerfile
index 61cedfc..d9c8a00 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# 姜十三论坛 — 多阶段构建：Node 前端 → Go 单二进制 → Alpine 运行镜像
+# 姜十三论坛 — 多阶段构建：web_src → Go 单二进制 → Alpine 运行镜像
# 不使用 # syntax=docker/dockerfile:1，避免构建前额外拉取 docker.io/docker/dockerfile
#
# 国内网络：默认经 DaoCloud 拉取基础镜像，npm/go 走国内代理
@@ -8,14 +8,12 @@
ARG IMAGE_PREFIX=docker.m.daocloud.io/library/
ARG VERSION=dev
-# ── Stage 1: 前端构建（Vite → embed_static/static/spa）────────────────────
-FROM ${IMAGE_PREFIX}node:22-bookworm-slim AS frontend
-WORKDIR /src/frontend
-COPY frontend/package.json frontend/package-lock.json ./
-RUN npm config set registry https://registry.npmmirror.com \
- && npm ci
-COPY frontend/ ./
-RUN npm run build
+# ── Stage 1: SSR 渐进资源（web_src → public/assets）────────────────────────
+FROM ${IMAGE_PREFIX}node:22-bookworm-slim AS websrc
+WORKDIR /src/web_src
+COPY web_src/package.json ./
+COPY web_src/ ./
+RUN node build.mjs
# ── Stage 2: Go 编译（纯 Go SQLite，CGO_ENABLED=0）────────────────────────
FROM ${IMAGE_PREFIX}golang:1.26-bookworm AS builder
@@ -25,7 +23,7 @@ WORKDIR /src
COPY go.mod go.sum ./
RUN go mod download
COPY . .
-COPY --from=frontend /src/embed_static/static/spa ./embed_static/static/spa
+COPY --from=websrc /src/public/assets ./public/assets
RUN CGO_ENABLED=0 go build -trimpath \
-ldflags "-s -w -X main.version=${VERSION}" \
-o /out/jiang13 ./cmd/jiang13
diff --git a/LICENSE b/LICENSE
index 2ae8e80..3bbab44 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,4 @@
-MIT License
-
-Copyright (c) 2026 freefire
+Copyright (c) 2026 The Jiang13 Authors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +7,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Makefile b/Makefile
index 8acfd7b..c4df5dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
# 姜十三论坛 Jiang13 Forum - Makefile
-# Go 1.26 单二进制编译，与 Gitea 打包方式一致
+# Go 1.26 单二进制：templates SSR + web_src 渐进资源（本分支无 React SPA）
APP_NAME := jiang13
MAIN_PKG := ./cmd/jiang13
@@ -12,42 +12,39 @@ REGISTRY_IMAGE := hangzhang714128/jiang13-forum
GO := go
GOFLAGS := -trimpath
-.PHONY: all build build-windows build-linux build-darwin clean run dev tidy help frontend frontend-build web-src-build docker compose-up compose-down
+.PHONY: all build build-windows build-linux build-darwin build-all clean run dev tidy help web-src-build docker compose-up compose-down
all: build
web-src-build:
cd web_src && npm run build
-frontend-build:
- cd frontend && npm install && npm run build
-
## 编译当前平台二进制（纯 Go SQLite，无需 CGO）
-build: web-src-build frontend-build
+build: web-src-build
@mkdir -p $(BUILD_DIR)
CGO_ENABLED=0 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(APP_NAME) $(MAIN_PKG)
@echo "✓ 编译完成: $(BUILD_DIR)/$(APP_NAME)"
-## Windows amd64（先打包前端再 embed）
-build-windows: web-src-build frontend-build
+## Windows amd64
+build-windows: web-src-build
@mkdir -p $(BUILD_DIR)
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(APP_NAME).exe $(MAIN_PKG)
@echo "✓ Windows: $(BUILD_DIR)/$(APP_NAME).exe"
-## Linux amd64（先打包前端再 embed）
-build-linux: web-src-build frontend-build
+## Linux amd64
+build-linux: web-src-build
@mkdir -p $(BUILD_DIR)
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(APP_NAME)-linux-amd64 $(MAIN_PKG)
@echo "✓ Linux: $(BUILD_DIR)/$(APP_NAME)-linux-amd64"
-## macOS arm64 (Apple Silicon)（先打包前端再 embed）
-build-darwin: web-src-build frontend-build
+## macOS arm64 (Apple Silicon)
+build-darwin: web-src-build
@mkdir -p $(BUILD_DIR)
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(APP_NAME)-darwin-arm64 $(MAIN_PKG)
@echo "✓ macOS: $(BUILD_DIR)/$(APP_NAME)-darwin-arm64"
-## 跨平台全量编译（web-src + frontend 只跑一次）
-build-all: web-src-build frontend-build
+## 跨平台全量编译（web_src 只跑一次）
+build-all: web-src-build
@mkdir -p $(BUILD_DIR)
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(APP_NAME).exe $(MAIN_PKG)
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(APP_NAME)-linux-amd64 $(MAIN_PKG)
@@ -59,20 +56,13 @@ build-all: web-src-build frontend-build
tidy:
$(GO) mod tidy
-## 本地运行（仅后端，使用已 embed 的前端；数据目录与 dist 二进制一致）
-run:
+## 本地运行 SSR（先构建 web_src）
+run: web-src-build
@mkdir -p $(DEV_DATA_DIR)
- $(GO) run $(MAIN_PKG) --data $(DEV_DATA_DIR)
+ $(GO) run $(MAIN_PKG) --work-path . --data $(DEV_DATA_DIR)
-## 前端热更新开发（后端 :3000 + Vite :5173，Ctrl+C 同时退出；数据目录与 dist 二进制一致）
-dev:
- @echo "前端热更新: http://localhost:5173"
- @echo "后端 API : http://localhost:3000"
- @echo "数据目录 : $(DEV_DATA_DIR) (与 dist 二进制一致)"
- @mkdir -p $(DEV_DATA_DIR)
- @trap 'kill 0' INT; \
- $(GO) run $(MAIN_PKG) --dev --data $(DEV_DATA_DIR) & \
- cd frontend && (test -d node_modules || npm install) && npm run dev
+## 同 run（SPA 对照请 git checkout main）
+dev: run
## 清理编译产物
clean:
@@ -91,15 +81,15 @@ compose-down:
docker compose down
help:
- @echo "姜十三论坛编译命令:"
+ @echo "姜十三论坛编译命令 (rebuild/gitea-ssr):"
@echo " make web-src-build - 构建 SSR 渐进资源 (web_src)"
- @echo " make build - 编译当前平台"
+ @echo " make build - web_src + 编译当前平台"
@echo " make build-windows - 编译 Windows"
@echo " make build-linux - 编译 Linux"
@echo " make build-darwin - 编译 macOS"
@echo " make build-all - 编译全部平台"
- @echo " make run - 启动后端 SSR（:3000）"
- @echo " make dev - 后端 + 旧 SPA Vite 对照（:5173 + :3000）"
+ @echo " make run / make dev - 启动 SSR（:3000）"
@echo " make docker - 构建 Docker 镜像"
@echo " make compose-up - Docker Compose 启动"
@echo " make compose-down - Docker Compose 停止"
+ @echo " SPA 对照: git checkout main"
diff --git a/README.md b/README.md
index 6cd2576..4db81b9 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,8 @@
**能聊 · 好看 · 好装**
面向小圈子、团队与同好社群的轻量现代化论坛。
-编译为单个 Go 二进制，前端 SPA（单页应用）内嵌，内置 SQLite，拷到服务器即可运行。
+本分支（`rebuild/gitea-ssr`）：Go 模板真 SSR + `web_src` 渐进增强，单二进制 + SQLite。
+对照 React SPA 请见 `main` 分支。
@@ -13,7 +14,7 @@
[](LICENSE)
[](https://hub.docker.com/r/hangzhang714128/jiang13-forum)
[](go.mod)
-[](frontend/package.json)
+[](docs/rebuild-spec/08-gitea-ssr-architecture.md)
[](#)
[在线演示](https://bbs.iioio.com/) ·
@@ -31,8 +32,8 @@
-> **演示站点：** [https://bbs.iioio.com/](https://bbs.iioio.com/)
-> 项目积极开发中。管理后台已统一为 React SPA（`/admin`），欢迎提 Issue / PR 共建。
+> **演示站点：** [https://bbs.iioio.com/](https://bbs.iioio.com/)（现网多为 `main` SPA）
+> 本分支按 [Gitea 式 SSR 规格](docs/rebuild-spec/08-gitea-ssr-architecture.md) 重构；欢迎提 Issue / PR 共建。
@@ -142,7 +143,7 @@ make build
**手动分步（全平台）：**
```bash
-cd frontend && npm install && npm run build
+cd web_src && npm run build
cd .. && go build -trimpath -ldflags "-s -w" -o dist/jiang13 ./cmd/jiang13
```
@@ -325,80 +326,61 @@ C:\jiang13\jiang13.exe --service start
| 层级 | 技术 |
|------|------|
-| **后端** | Go 1.26 · Gin · GORM · SQLite |
-| **前端** | React 18 · TipTap · Radix UI · Tailwind CSS · TanStack Virtual |
-| **构建** | Vite → `go:embed` 内嵌 SPA，单二进制发布 |
+| **后端 / SSR** | Go 1.26 · Gin · GORM · SQLite · `html/template` |
+| **渐进资源** | `web_src/`（构建到 `public/assets/`，URL `/ssr-assets/`） |
+| **构建** | `web_src` → `go:embed` templates + assets，单二进制发布 |
| **认证** | bcrypt · JWT Cookie · 可选 OIDC Provider |
+| **对照 SPA** | 仅 `main` 分支（React 18 · TipTap · Vite） |
---
-## 前端开发
-
-日常改前端不需要重新完整构建，Vite 支持秒级热更新（HMR，热模块替换）：
+## 本地开发（SSR）
```bat
-build.bat -Target dev
+build.bat -Target run
```
```bash
-make dev
+make run
```
-浏览器访问 `http://localhost:5173`，API 自动代理到 `http://localhost:3000`。
+浏览器访问 `http://localhost:3000`。数据目录默认 `dist/data`。
-开发后端与 `dist/jiang13` 共用数据目录 `dist/data`（SQLite、上传、JWT 密钥等），避免 dev 与 dist 运行数据不一致。
+改模板 / Go 后重启进程；改 `web_src` 后需再跑 `build.bat -Target web-src`（或完整 `build`）。
-**何时需要完整构建：**
-
-- 修改 Go 代码或要发布单二进制 → `build.bat` / `make build`
-- 更新 README 界面截图 → 见下方「更新截图」
-
-> 直接访问 `:3000` 看到的是上次 build 嵌入的前端；开发时请用 `:5173`。
-
-### 更新截图
-
-默认从演示站抓取到 `docs/screenshots/`（需本机已安装 Playwright）：
-
-```bash
-npm install -D playwright
-npx playwright install chromium
-node scripts/capture-screenshots.mjs
-```
-
-| 环境变量 | 说明 | 默认 |
-|----------|------|------|
-| `J13_URL` | 抓取目标 | `https://bbs.iioio.com` |
-| `J13_POST_ID` | 详情页帖子 ID | `1` |
-| `J13_RICH_POST_ID` | 富文本展示帖 ID | `8` |
-| `J13_USER` / `J13_PASS` | 发帖页登录（可选） | `admin` / `admin123` |
-
-本地站点示例：`J13_URL=http://localhost:3000 node scripts/capture-screenshots.mjs`
+需要对照旧 SPA UI：`git checkout main` 或 `git worktree add ../jiang13-spa main`。
---
## 项目结构
```
-jiang13-forum/
-├── cmd/jiang13/ # 程序入口（含系统服务注册）
-├── config/ # app.ini 与命令行配置
-├── app.ini.example # 配置文件示例
-├── Dockerfile # 多阶段 Docker 构建
-├── docker-compose.yml # 单容器 Compose 部署
-├── docker-entrypoint.sh # 容器启动脚本（修正 /data 卷权限）
-├── .dockerignore
-├── model/ # GORM 模型与数据库迁移
-├── service/ # 业务逻辑
-├── handler/ # HTTP 处理器（前台 + 后台）
-├── middleware/ # JWT 鉴权等
-├── router/ # 路由注册
-├── embed_static/ # go:embed 内嵌的 SPA
-├── frontend/ # React 源码（Vite 构建）
-├── docs/screenshots/ # README 界面截图
-├── ROADMAP.md # 路线图与已知问题
-└── scripts/ # 开发辅助脚本（含截图）
+jiang13-forum/ # 分支 rebuild/gitea-ssr
+├── cmd/jiang13/ # 程序入口（含系统服务注册）
+├── config/ # app.ini 与命令行配置
+├── app.ini.example
+├── Dockerfile # web_src → Go → Alpine
+├── docker-compose.yml
+├── models/ # GORM 模型
+├── services/ # 业务逻辑
+├── routers/
+│ ├── setup.go # 路由总装
+│ ├── web/ # HTML SSR
+│ └── api/ # JSON API
+├── modules/
+│ ├── auth/ # JWT / 限流
+│ ├── webrender/ # 模板渲染
+│ └── seo/
+├── templates/ # Go html/template（embed）
+├── web_src/ # 渐进 CSS/JS 源码
+├── public/assets/ # web_src 构建产物（embed）
+├── docs/rebuild-spec/ # 产品规格与 SSR 架构
+├── docs/screenshots/
+└── ROADMAP.md
```
+> SPA 源码树仅存在于 `main`（`frontend/`、`embed_static/`）。
+
---
## 数据目录
@@ -424,7 +406,7 @@ data/
|------|------|
| ✅ 已可用 | 三栏布局、暗色主题、虚拟滚动、Feed 排序、楼层评论 |
| ✅ 发帖体验 | TipTap 富文本、图片上传、修订历史、回复可见等门控 |
-| ✅ 管理后台 | React SPA：仪表盘、置顶 / 精华、禁言、系统设置 |
+| ✅ 管理后台 | JSON API 已就绪；本分支管理 UI 为 SSR 占位（完整后台见 `main` SPA） |
| 📋 计划中 | 通知动态优化、邮件提醒 |
---
@@ -439,4 +421,4 @@ data/
## 许可证
-[MIT](LICENSE) — 自由使用、修改与分发。
+[MIT](LICENSE)（与 [Gitea](https://github.com/go-gitea/gitea) 相同的 Expat 文本格式）— 自由使用、修改与分发。
diff --git a/build.ps1 b/build.ps1
index 661d4c0..e1e7498 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,9 +1,10 @@
# Jiang13 Forum - Windows build script (replaces GNU Make)
# Usage: .\build.ps1
# .\build.ps1 -Target build-windows
+# Branch rebuild/gitea-ssr: Go templates SSR + web_src (no React SPA)
param(
- [ValidateSet('build', 'build-windows', 'build-linux', 'build-darwin', 'build-all', 'frontend', 'web-src', 'tidy', 'run', 'dev', 'clean', 'docker', 'compose-up', 'compose-down', 'help')]
+ [ValidateSet('build', 'build-windows', 'build-linux', 'build-darwin', 'build-all', 'web-src', 'tidy', 'run', 'dev', 'clean', 'docker', 'compose-up', 'compose-down', 'help')]
[string]$Target = 'build'
)
@@ -33,20 +34,6 @@ function Build-WebSrc {
}
}
-function Build-Frontend {
- Write-Host '[frontend] npm run build...' -ForegroundColor Cyan
- Push-Location frontend
- try {
- if (-not (Test-Path node_modules)) {
- npm install
- }
- npm run build
- if ($LASTEXITCODE -ne 0) { throw 'frontend build failed' }
- } finally {
- Pop-Location
- }
-}
-
function Build-Go([string]$OutFile, [string]$GoOS = '', [string]$GoArch = '') {
Ensure-Dir $BuildDir
if ($GoOS) { $env:GOOS = $GoOS } else { Remove-Item Env:GOOS -ErrorAction SilentlyContinue }
@@ -80,23 +67,22 @@ function Build-Go([string]$OutFile, [string]$GoOS = '', [string]$GoArch = '') {
switch ($Target) {
'help' {
- Write-Host '.\build.ps1 build current platform'
- Write-Host '.\build.ps1 -Target frontend SPA frontend only (legacy)'
- Write-Host '.\build.ps1 -Target web-src SSR progressive assets'
+ Write-Host '.\build.ps1 build current platform (web_src + go)'
+ Write-Host '.\build.ps1 -Target web-src SSR progressive assets only'
Write-Host '.\build.ps1 -Target build-windows'
Write-Host '.\build.ps1 -Target build-linux'
Write-Host '.\build.ps1 -Target build-all'
- Write-Host '.\build.ps1 -Target run backend (SSR on :3000)'
- Write-Host '.\build.ps1 -Target dev backend + Vite SPA对照'
+ Write-Host '.\build.ps1 -Target run SSR on :3000'
+ Write-Host '.\build.ps1 -Target dev same as run (SSR; SPA is on main)'
Write-Host '.\build.ps1 -Target tidy'
Write-Host '.\build.ps1 -Target clean'
- Write-Host '.\build.ps1 -Target docker build Docker image'
- Write-Host '.\build.ps1 -Target compose-up docker compose up -d --build'
- Write-Host '.\build.ps1 -Target compose-down docker compose down'
+ Write-Host '.\build.ps1 -Target docker'
+ Write-Host '.\build.ps1 -Target compose-up'
+ Write-Host '.\build.ps1 -Target compose-down'
Write-Host ''
Write-Host 'Note: Windows "make" is often Embarcadero MAKE, not GNU Make.'
+ Write-Host 'SPA reference: git checkout main (or origin/main).'
}
- 'frontend' { Build-Frontend }
'web-src' { Build-WebSrc }
'tidy' { go mod tidy }
'clean' {
@@ -105,54 +91,33 @@ switch ($Target) {
}
'run' {
Ensure-Dir $DevDataDir
- go run $MainPkg --data $DevDataDir
+ Build-WebSrc
+ go run $MainPkg --work-path . --data $DevDataDir
}
'dev' {
- $root = (Get-Location).Path
Ensure-Dir $DevDataDir
- Write-Host ''
- Write-Host '[dev] 前端开发 : http://localhost:5173 (Vite HMR)' -ForegroundColor Green
- Write-Host '[dev] 后端 API : http://localhost:3000 (Go)' -ForegroundColor Green
- Write-Host "[dev] 数据目录 : $DevDataDir (与 dist 二进制一致)" -ForegroundColor Green
- Write-Host '[dev] 提示 : 请访问 5173 端口，Vite 会自动代理 API 到 3000' -ForegroundColor Yellow
- Write-Host '[dev] 正在新窗口启动 Go 后端 (仅 API)...' -ForegroundColor Cyan
- Start-Process powershell -ArgumentList @(
- '-NoExit', '-Command',
- "Set-Location '$root'; Write-Host '[backend] Go API on :3000' -ForegroundColor Cyan; go run $MainPkg --dev --data '$DevDataDir'"
- ) | Out-Null
- Start-Sleep -Seconds 2
- Push-Location frontend
- try {
- if (-not (Test-Path node_modules)) { npm install }
- npm run dev
- } finally {
- Pop-Location
- }
+ Build-WebSrc
+ Write-Host '[dev] SSR: http://localhost:3000 (SPA 对照请 checkout main)' -ForegroundColor Green
+ go run $MainPkg --work-path . --data $DevDataDir
}
'build' {
Build-WebSrc
- Build-Frontend
Build-Go -OutFile $AppName
}
'build-windows' {
Build-WebSrc
- Build-Frontend
Build-Go -OutFile $AppName -GoOS 'windows' -GoArch 'amd64'
}
'build-linux' {
- Write-Host '[build-linux] will build web_src + SPA then go:embed' -ForegroundColor Yellow
Build-WebSrc
- Build-Frontend
Build-Go -OutFile "$AppName-linux-amd64" -GoOS 'linux' -GoArch 'amd64'
}
'build-darwin' {
Build-WebSrc
- Build-Frontend
Build-Go -OutFile "$AppName-darwin-arm64" -GoOS 'darwin' -GoArch 'arm64'
}
'build-all' {
Build-WebSrc
- Build-Frontend
Build-Go -OutFile $AppName -GoOS 'windows' -GoArch 'amd64'
Build-Go -OutFile "$AppName-linux-amd64" -GoOS 'linux' -GoArch 'amd64'
Build-Go -OutFile "$AppName-darwin-arm64" -GoOS 'darwin' -GoArch 'arm64'
@@ -166,12 +131,10 @@ switch ($Target) {
}
'compose-up' {
docker compose up -d --build
- if ($LASTEXITCODE -ne 0) { throw 'docker compose up failed' }
- Write-Host '[ok] compose started' -ForegroundColor Green
+ if ($LASTEXITCODE -ne 0) { throw 'compose up failed' }
}
'compose-down' {
docker compose down
- if ($LASTEXITCODE -ne 0) { throw 'docker compose down failed' }
- Write-Host '[ok] compose stopped' -ForegroundColor Green
+ if ($LASTEXITCODE -ne 0) { throw 'compose down failed' }
}
}
diff --git a/cmd/jiang13/main.go b/cmd/jiang13/main.go
index 1fd57d9..81f0ed2 100644
--- a/cmd/jiang13/main.go
+++ b/cmd/jiang13/main.go
@@ -1,11 +1,11 @@
-package main
+package main
import (
"fmt"
"log"
"os"
- "github.com/kardianos/service"
+ kardsvc "github.com/kardianos/service"
"git.iioio.com/freefire/jiang13-forum/config"
)
@@ -25,7 +25,7 @@ func main() {
}
prg := &program{cfg: cfg}
- svc, err := service.New(prg, svcCfg)
+ svc, err := kardsvc.New(prg, svcCfg)
if err != nil {
log.Fatalf("创建系统服务失败: %v", err)
}
diff --git a/cmd/jiang13/program.go b/cmd/jiang13/program.go
index b68391d..d10a03c 100644
--- a/cmd/jiang13/program.go
+++ b/cmd/jiang13/program.go
@@ -1,4 +1,4 @@
-package main
+package main
import (
"context"
@@ -9,11 +9,11 @@ import (
"os"
"time"
- "github.com/kardianos/service"
+ kardsvc "github.com/kardianos/service"
"git.iioio.com/freefire/jiang13-forum/config"
- "git.iioio.com/freefire/jiang13-forum/model"
- "git.iioio.com/freefire/jiang13-forum/router"
+ "git.iioio.com/freefire/jiang13-forum/models"
+ "git.iioio.com/freefire/jiang13-forum/routers"
)
const (
@@ -28,7 +28,7 @@ type program struct {
server *http.Server
}
-func (p *program) Start(s service.Service) error {
+func (p *program) Start(s kardsvc.Service) error {
if err := p.setup(); err != nil {
return err
}
@@ -40,7 +40,7 @@ func (p *program) Start(s service.Service) error {
return nil
}
-func (p *program) Stop(s service.Service) error {
+func (p *program) Stop(s kardsvc.Service) error {
log.Println("收到关机信号，正在优雅关闭...")
if p.server == nil {
return nil
@@ -63,7 +63,7 @@ func (p *program) setup() error {
return fmt.Errorf("打开日志文件失败: %w", err)
}
// 服务模式下 stdout 可能不可用，仅写文件；前台运行则双写
- if service.Interactive() {
+ if kardsvc.Interactive() {
log.SetOutput(io.MultiWriter(os.Stdout, logFile))
} else {
log.SetOutput(logFile)
@@ -75,11 +75,11 @@ func (p *program) setup() error {
log.Printf(" 版本: %s", version)
log.Println("========================================")
- if err := model.InitDB(cfg.DBPath()); err != nil {
+ if err := models.InitDB(cfg.DBPath()); err != nil {
return fmt.Errorf("数据库初始化失败: %w", err)
}
- engine, err := router.Setup(cfg)
+ engine, err := routers.Setup(cfg)
if err != nil {
return fmt.Errorf("路由初始化失败: %w", err)
}
@@ -98,9 +98,9 @@ func (p *program) setup() error {
return nil
}
-func buildServiceConfig(cfg *config.Config) (*service.Config, error) {
+func buildServiceConfig(cfg *config.Config) (*kardsvc.Config, error) {
// 服务只绑定工作目录与配置文件；端口/数据目录改 app.ini 后重启即可，无需重装服务
- return &service.Config{
+ return &kardsvc.Config{
Name: svcName,
DisplayName: svcDisplayName,
Description: svcDescription,
@@ -109,7 +109,7 @@ func buildServiceConfig(cfg *config.Config) (*service.Config, error) {
"--work-path", cfg.WorkPath,
"--config", cfg.ConfigFile,
},
- Option: service.KeyValue{
+ Option: kardsvc.KeyValue{
// systemd：异常退出后自动拉起
"Restart": "always",
// Windows：崩溃后重启
@@ -118,16 +118,16 @@ func buildServiceConfig(cfg *config.Config) (*service.Config, error) {
}, nil
}
-func runServiceControl(s service.Service, action string) error {
+func runServiceControl(s kardsvc.Service, action string) error {
if action == "status" {
st, err := s.Status()
if err != nil {
return err
}
switch st {
- case service.StatusRunning:
+ case kardsvc.StatusRunning:
fmt.Println("服务状态: 运行中 (running)")
- case service.StatusStopped:
+ case kardsvc.StatusStopped:
fmt.Println("服务状态: 已停止 (stopped)")
default:
fmt.Println("服务状态: 未知 (unknown)")
@@ -135,7 +135,7 @@ func runServiceControl(s service.Service, action string) error {
return nil
}
- if err := service.Control(s, action); err != nil {
+ if err := kardsvc.Control(s, action); err != nil {
return err
}
diff --git a/docs/rebuild-spec/02-features.md b/docs/rebuild-spec/02-features.md
index 3cc0313..d985f4f 100644
--- a/docs/rebuild-spec/02-features.md
+++ b/docs/rebuild-spec/02-features.md
@@ -3,7 +3,7 @@
> **读者**：实现与验收
> **前置**：[01-product.md](01-product.md)
> **交叉**：[05-business-rules.md](05-business-rules.md)、[06-pages-ux.md](06-pages-ux.md)
-> **源码对照**：[`frontend/src/App.tsx`](../../frontend/src/App.tsx)、[`router/router.go`](../../router/router.go)、[`README.md`](../../README.md)
+> **源码对照**：[`frontend/src/App.tsx`](（仅 main）frontend/src/App.tsx)、[`router/router.go`](../../routers/setup.go)、[`README.md`](../../README.md)
用复选框做验收；重构完成时应全部可勾选（或书面声明砍掉的功能）。
diff --git a/docs/rebuild-spec/03-data-model.md b/docs/rebuild-spec/03-data-model.md
index ed2f882..e7c7123 100644
--- a/docs/rebuild-spec/03-data-model.md
+++ b/docs/rebuild-spec/03-data-model.md
@@ -3,7 +3,7 @@
> **读者**：实现数据库与领域层的 AI
> **前置**：[01-product.md](01-product.md)
> **后续**：[04-api.md](04-api.md)、[05-business-rules.md](05-business-rules.md)
-> **源码**：[`model/models.go`](../../model/models.go)、[`model/oauth.go`](../../model/oauth.go)、[`model/gitea.go`](../../model/gitea.go)、[`model/level.go`](../../model/level.go)、[`model/db.go`](../../model/db.go)、[`model/user_view.go`](../../model/user_view.go)、[`service/settings.go`](../../service/settings.go)
+> **源码**：[`model/models.go`](../../models/models.go)、[`model/oauth.go`](../../models/oauth.go)、[`model/gitea.go`](../../models/gitea.go)、[`model/level.go`](../../models/level.go)、[`model/db.go`](../../models/db.go)、[`model/user_view.go`](../../models/user_view.go)、[`service/settings.go`](../../services/settings.go)
当前无独立 SQL migration；表由 GORM `AutoMigrate` 创建。新站可用正式 migration，但**字段语义应对齐**。
@@ -72,7 +72,7 @@ erDiagram
**非落库展示字段**：`level`（由 Exp 推导）、`badges`（附加）。
-视图结构：`UserPublic` / `UserSelf` / `UserAdmin`（见 [`model/user_view.go`](../../model/user_view.go)）。
+视图结构：`UserPublic` / `UserSelf` / `UserAdmin`（见 [`model/user_view.go`](../../models/user_view.go)）。
### 2.2 boards
@@ -278,7 +278,7 @@ Metric：`tenure_days` | `likes_received` | `creator_income`
## 4. 等级（Exp → Level）
-源：[`model/level.go`](../../model/level.go)
+源：[`model/level.go`](../../models/level.go)
| Level | 最低 Exp |
|-------|----------|
@@ -299,7 +299,7 @@ Metric：`tenure_days` | `likes_received` | `creator_income`
## 5. 内置自动徽章（seed）
-源：[`model/db.go`](../../model/db.go) `seedDefaultBadges`
+源：[`model/db.go`](../../models/db.go) `seedDefaultBadges`
| code | 名称 | metric | threshold |
|------|------|--------|-----------|
@@ -317,7 +317,7 @@ Metric：`tenure_days` | `likes_received` | `creator_income`
## 6. forum_settings 键与默认值
-源：[`service/settings.go`](../../service/settings.go)、[`service/permalink.go`](../../service/permalink.go)
+源：[`service/settings.go`](../../services/settings.go)、[`service/permalink.go`](../../services/permalink.go)
### 6.1 论坛限制
@@ -429,7 +429,7 @@ Metric：`tenure_days` | `likes_received` | `creator_income`
## 7. 升级兼容补丁（现网 InitDB）
-[`model/db.go`](../../model/db.go) 在 AutoMigrate 后：
+[`model/db.go`](../../models/db.go) 在 AutoMigrate 后：
- 空 `status` 的帖/评 → `published`
- 空 `post_type` → `normal`
@@ -449,4 +449,4 @@ Metric：`tenure_days` | `likes_received` | `creator_income`
...
```
-积分解锁 `block_key` = `sha256(innerHTML)[:16]`（hex），见 [`service/unlock.go`](../../service/unlock.go)。
+积分解锁 `block_key` = `sha256(innerHTML)[:16]`（hex），见 [`service/unlock.go`](../../services/unlock.go)。
diff --git a/docs/rebuild-spec/04-api.md b/docs/rebuild-spec/04-api.md
index 8a8340c..cad9958 100644
--- a/docs/rebuild-spec/04-api.md
+++ b/docs/rebuild-spec/04-api.md
@@ -2,7 +2,7 @@
> **读者**：实现后端 / BFF / 前端数据层的 AI
> **前置**：[03-data-model.md](03-data-model.md)
-> **源码**：[`router/router.go`](../../router/router.go)、[`frontend/src/api/client.ts`](../../frontend/src/api/client.ts)、[`frontend/src/api/types.ts`](../../frontend/src/api/types.ts)、[`middleware/auth.go`](../../middleware/auth.go)
+> **源码**：[`router/router.go`](../../routers/setup.go)、[`frontend/src/api/client.ts`](（仅 main）frontend/src/api/client.ts)、[`frontend/src/api/types.ts`](（仅 main）frontend/src/api/types.ts)、[`middleware/auth.go`](../../modules/auth/auth.go)
不要求 OpenAPI YAML；以下表格 + JSON 形状即为合约。新站可加 `/v1` 前缀，但**字段名建议保持**以便对照迁移。
@@ -54,7 +54,7 @@
| GET/POST | `/oauth/userinfo` | Bearer | 用户信息 |
| GET/POST | `/oauth/logout` | 视实现 | 登出 |
-细节以 [`service/oidc.go`](../../service/oidc.go) / [`handler/oidc.go`](../../handler/oidc.go) 为准。
+细节以 [`service/oidc.go`](../../services/oidc.go) / [`handler/oidc.go`](../../routers/api/oidc.go) 为准。
---
@@ -356,7 +356,7 @@
## 7. 核心类型速查（与前端对齐）
-详见 [`frontend/src/api/types.ts`](../../frontend/src/api/types.ts)。实现时至少对齐：
+详见 [`frontend/src/api/types.ts`](（仅 main）frontend/src/api/types.ts)。实现时至少对齐：
- `User` / `UserPublic` / `UserActivityStats`
- `Board` / `PostItem` / `PostDetailResponse` / `Comment`
@@ -373,4 +373,4 @@
中间件对未登录 / 过期 / 禁言返回 JSON error（并可能清 cookie）。前端统一 `throw new Error(data.error)`。新站应保持可区分的错误文案或错误码，避免前端无法提示。
-源：[`middleware/auth.go`](../../middleware/auth.go)。
+源：[`middleware/auth.go`](../../modules/auth/auth.go)。
diff --git a/docs/rebuild-spec/05-business-rules.md b/docs/rebuild-spec/05-business-rules.md
index 283e5f2..8a4ff45 100644
--- a/docs/rebuild-spec/05-business-rules.md
+++ b/docs/rebuild-spec/05-business-rules.md
@@ -2,13 +2,13 @@
> **读者**：实现领域逻辑的 AI（最易「看起来像但算错」）
> **前置**：[03-data-model.md](03-data-model.md)、[04-api.md](04-api.md)
-> **源码**：[`service/`](../../service/)、[`model/models.go`](../../model/models.go)
+> **源码**：[`service/`](../../services/)、[`model/models.go`](../../models/models.go)
---
## 1. 注册与引导
-源：[`handler/handlers.go`](../../handler/handlers.go) `APIRegisterConfig`、[`service/auth.go`](../../service/auth.go)
+源：[`handler/handlers.go`](../../routers/api/handlers.go) `APIRegisterConfig`、[`service/auth.go`](../../services/auth.go)
| 规则 | 细节 |
|------|------|
@@ -41,7 +41,7 @@ stateDiagram-v2
| 待审提醒 | 通知管理员（kind=`moderation`） |
| 游客评论 | 通常直接或按实现进入审核；勿假设与登录用户完全相同 |
-源：[`service/post.go`](../../service/post.go) `CanViewPost`、[`service/comment.go`](../../service/comment.go)。
+源：[`service/post.go`](../../services/post.go) `CanViewPost`、[`service/comment.go`](../../services/comment.go)。
---
@@ -68,7 +68,7 @@ stateDiagram-v2
| 评论成功 | +2 |
| 帖子被点赞 | +1（作者） |
-源：[`service/post.go`](../../service/post.go)、[`service/comment.go`](../../service/comment.go)、[`service/badge.go`](../../service/badge.go) `AddExp`。
+源：[`service/post.go`](../../services/post.go)、[`service/comment.go`](../../services/comment.go)、[`service/badge.go`](../../services/badge.go) `AddExp`。
等级门槛见 [03-data-model.md](03-data-model.md) §4。管理员设 level 时应同步 Exp 到门槛值。
@@ -76,7 +76,7 @@ stateDiagram-v2
## 5. 内容门控（红action）
-源：[`service/content.go`](../../service/content.go)、[`handler/api.go`](../../handler/api.go) `APIPostDetail`、[`service/unlock.go`](../../service/unlock.go)
+源：[`service/content.go`](../../services/content.go)、[`handler/api.go`](../../routers/api/api.go) `APIPostDetail`、[`service/unlock.go`](../../services/unlock.go)
### 5.1 出口顺序（详情）
@@ -148,7 +148,7 @@ stateDiagram-v2
## 7. 签到与每日抽奖
-源：[`service/points.go`](../../service/points.go)
+源：[`service/points.go`](../../services/points.go)
### 签到
@@ -225,4 +225,4 @@ stateDiagram-v2
| `board_pinned` | **不**抬升 | 抬升 |
| `featured` | 标记展示，不一定改变排序 | 同左 |
-具体 SQL/排序实现见 [`service/post.go`](../../service/post.go) ListItems。
+具体 SQL/排序实现见 [`service/post.go`](../../services/post.go) ListItems。
diff --git a/docs/rebuild-spec/06-pages-ux.md b/docs/rebuild-spec/06-pages-ux.md
index 3f86133..87d0a07 100644
--- a/docs/rebuild-spec/06-pages-ux.md
+++ b/docs/rebuild-spec/06-pages-ux.md
@@ -2,7 +2,7 @@
> **读者**：实现前台 / 后台 UI 的 AI
> **前置**：[02-features.md](02-features.md)
-> **源码**：[`frontend/src/App.tsx`](../../frontend/src/App.tsx)、[`frontend/src/pages/`](../../frontend/src/pages/)、[`frontend/src/components/`](../../frontend/src/components/)、[`frontend/src/layouts/`](../../frontend/src/layouts/)
+> **源码**：[`frontend/src/App.tsx`](（仅 main）frontend/src/App.tsx)、[`frontend/src/pages/`](（仅 main）frontend/src/pages/)、[`frontend/src/components/`](（仅 main）frontend/src/components/)、[`frontend/src/layouts/`](（仅 main）frontend/src/layouts/)
视觉可重设；**信息架构与关键操作流应对齐**。新站建议 SSR 直出同等信息，而不是先空壳再 fetch。
@@ -119,7 +119,7 @@
### 3.2 编辑器能力（应对齐）
-源：[`ArticleEditor.tsx`](../../frontend/src/components/ArticleEditor.tsx) 与 `editor/` 扩展
+源：[`ArticleEditor.tsx`](（仅 main）frontend/src/components/ArticleEditor.tsx) 与 `editor/` 扩展
- 标题 h2–h6（无 h1，避免与帖标题冲突）
- 粗体/斜体/删除线等基础标记
@@ -129,7 +129,7 @@
- 图片上传 + 图片组布局 + 浮动/清除浮动
- 表情 / 贴纸选择器（多套：bilibili/douyin/tieba/weibo 等静态资源）
- **登录可见** / **回复可见** / **积分可见**（价格 1–9999）节点
-- 富文本 ↔ Markdown 双模（门控块有 markdown 约定，见 [`utils/markdownContent.ts`](../../frontend/src/utils/markdownContent.ts)）
+- 富文本 ↔ Markdown 双模（门控块有 markdown 约定，见 [`utils/markdownContent.ts`](（仅 main）frontend/src/utils/markdownContent.ts)）
- Tab 缩进
未保存离开：`UnsavedChangesDialog`。
diff --git a/docs/rebuild-spec/07-config-ops.md b/docs/rebuild-spec/07-config-ops.md
index 7878f25..896e424 100644
--- a/docs/rebuild-spec/07-config-ops.md
+++ b/docs/rebuild-spec/07-config-ops.md
@@ -2,7 +2,7 @@
> **读者**：部署与运维、以及实现配置层的 AI
> **前置**：[README.md](README.md)
-> **源码**：[`app.ini.example`](../../app.ini.example)、[`config/`](../../config/)、[`README.md`](../../README.md)、[`handler/seo.go`](../../handler/seo.go)、[`handler/seo_bot.go`](../../handler/seo_bot.go)、[`embed_static/`](../../embed_static/)
+> **源码**：[`app.ini.example`](../../app.ini.example)、[`config/`](../../config/)、[`README.md`](../../README.md)、[`handler/seo.go`](../../routers/api/seo.go)、[`handler/seo_bot.go`](../../routers/api/seo_bot.go)、[`embed_static/`](（仅 main 分支）embed_static/)
运维形态可改；下列描述**现网**行为，便于迁移数据与对齐环境变量语义。
@@ -91,8 +91,8 @@ data/
| 机制 | 说明 |
|------|------|
-| SPA 壳注入 | [`embed_static`](../../embed_static/) 注入 title / branding JSON，**无帖文 DOM** |
-| 爬虫 HTML | User-Agent 命中时 [`seo_bot.go`](../../handler/seo_bot.go) 返回简易 HTML |
+| SPA 壳注入 | `embed_static`（仅 `main` 分支） 注入 title / branding JSON，**无帖文 DOM** |
+| 爬虫 HTML | User-Agent 命中时 [`seo_bot.go`](../../routers/api/seo_bot.go) 返回简易 HTML |
| robots.txt / sitemap.xml | 动态生成 |
重构验收：用普通浏览器「查看网页源代码」应能看到帖文正文，而不仅是空 div + script。
@@ -110,7 +110,7 @@ data/
- `/board/2.html`
- `/page/about.html`
-路由应同时接受无后缀与有后缀形式。解析逻辑见 [`service/permalink.go`](../../service/permalink.go)。
+路由应同时接受无后缀与有后缀形式。解析逻辑见 [`service/permalink.go`](../../services/permalink.go)。
---
diff --git a/docs/rebuild-spec/08-gitea-ssr-architecture.md b/docs/rebuild-spec/08-gitea-ssr-architecture.md
index 2fb8743..27436d7 100644
--- a/docs/rebuild-spec/08-gitea-ssr-architecture.md
+++ b/docs/rebuild-spec/08-gitea-ssr-architecture.md
@@ -35,19 +35,29 @@ git worktree add ../jiang13-spa main
---
-## 目录职责（演进中）
+## 目录职责（本分支已落地）
```text
-routers/web/ # 返回 HTML 的页面路由
-templates/ # Go 模板源文件（嵌入）
-web_src/ # CSS/JS 源码
-public/assets/ # web_src 构建产物（嵌入，URL 前缀 `/ssr-assets/`）
-modules/ # 横切（模板渲染等）
-docs/rebuild-spec/ # 产品规格
-.cursor/rules/ # AI 开发规则
+cmd/jiang13/ # 入口
+config/ # 配置
+models/ # GORM 模型（原 model/）
+services/ # 业务逻辑（原 service/）
+routers/
+ setup.go # 路由总装（原 router/）
+ web/ # HTML SSR
+ api/ # JSON API（原 handler/）
+modules/
+ auth/ # JWT / 限流等（原 middleware/）
+ webrender/ # 模板渲染
+ seo/ # PageMeta 等
+templates/ # Go 模板（embed）
+web_src/ # CSS/JS 源码
+public/assets/ # 构建产物（URL 前缀 `/ssr-assets/`）
+docs/rebuild-spec/ # 产品规格
+.cursor/rules/ # AI 开发规则
```
-现有 `model/`、`service/`、`handler/`（JSON API）可先复用，公开页出口改为模板。
+**已删除（勿恢复）：** `frontend/`、`embed_static/`。SPA 对照仅看 `main`。
---
diff --git a/docs/rebuild-spec/README.md b/docs/rebuild-spec/README.md
index 2d3eccd..068bf89 100644
--- a/docs/rebuild-spec/README.md
+++ b/docs/rebuild-spec/README.md
@@ -61,9 +61,9 @@ flowchart LR
| 痛点 | 现状 | 对用户的影响 |
|------|------|----------------|
-| 非真 SSR | 生产入口 [`embed_static`](../../embed_static/) 只注入 title / branding / Open Graph，**不渲染帖文 DOM** | 刷新先出壳再灌数据，体验不如 SSR |
-| 爬虫双轨 | [`handler/seo_bot.go`](../../handler/seo_bot.go) 对爬虫返回独立 HTML | 用户与爬虫看到的不是同一套渲染路径 |
-| 无正式 migration | Schema 靠 GORM `AutoMigrate`（[`model/db.go`](../../model/db.go)） | 升级靠「加字段」，难做破坏性迁移与审计 |
+| 非真 SSR | 生产入口（`main` 的 `embed_static`）只注入 title / branding / Open Graph，**不渲染帖文 DOM** | 刷新先出壳再灌数据，体验不如 SSR |
+| 爬虫双轨 | [`routers/api/seo_bot.go`](../../routers/api/seo_bot.go) 对爬虫返回独立 HTML | 用户与爬虫看到的不是同一套渲染路径 |
+| 无正式 migration | Schema 靠 GORM `AutoMigrate`（[`models/db.go`](../../models/db.go)） | 升级靠「加字段」，难做破坏性迁移与审计 |
| Cookie JWT | 无 session 表，密钥在 `data/.jwt_secret` | 可保留语义，实现可换成更好的会话方案 |
**新站目标**：用户首屏即可看到帖文 / 列表的服务端渲染（SSR）HTML；SEO meta 与正文同源。技术选型自定（Next.js / Nuxt / Remix / 其它均可）。
@@ -113,13 +113,13 @@ flowchart LR
| 主题 | 路径 |
|------|------|
-| 路由总表 | [`router/router.go`](../../router/router.go) |
-| GORM 模型 | [`model/models.go`](../../model/models.go) |
-| AutoMigrate | [`model/db.go`](../../model/db.go) |
-| 论坛设置键 | [`service/settings.go`](../../service/settings.go) |
-| 前端 API 客户端 | [`frontend/src/api/client.ts`](../../frontend/src/api/client.ts) |
-| 前端类型 | [`frontend/src/api/types.ts`](../../frontend/src/api/types.ts) |
-| 页面路由 | [`frontend/src/App.tsx`](../../frontend/src/App.tsx) |
+| 路由总装 | [`routers/setup.go`](../../routers/setup.go) |
+| GORM 模型 | [`models/models.go`](../../models/models.go) |
+| AutoMigrate | [`models/db.go`](../../models/db.go) |
+| 论坛设置键 | [`services/settings.go`](../../services/settings.go) |
+| SSR 页面路由 | [`routers/web/`](../../routers/web/) |
+| JSON API | [`routers/api/`](../../routers/api/) |
+| 前端 API / 页面（对照） | 仅 `main`：`frontend/src/api/`、`frontend/src/App.tsx` |
| 产品介绍 | [`docs/introduction.md`](../introduction.md)、[`README.md`](../../README.md) |
---
diff --git a/models/db.go b/models/db.go
index 94a1ad2..e091cce 100644
--- a/models/db.go
+++ b/models/db.go
@@ -1,4 +1,4 @@
-package model
+package models
import (
"fmt"
diff --git a/models/gitea.go b/models/gitea.go
index 5ceacbe..a8590b7 100644
--- a/models/gitea.go
+++ b/models/gitea.go
@@ -1,4 +1,4 @@
-package model
+package models
import "time"
diff --git a/models/level.go b/models/level.go
index a2644f5..66fb398 100644
--- a/models/level.go
+++ b/models/level.go
@@ -1,4 +1,4 @@
-package model
+package models
// LevelThresholds 各等级所需最低 Exp（下标 0 对应 Lv1）
var LevelThresholds = []int{0, 20, 50, 100, 200, 400, 800, 1500, 3000, 5000}
diff --git a/models/models.go b/models/models.go
index 7fdd7c8..615e43e 100644
--- a/models/models.go
+++ b/models/models.go
@@ -1,4 +1,4 @@
-package model
+package models
import (
"time"
diff --git a/models/oauth.go b/models/oauth.go
index a8bdbd4..2ebfb09 100644
--- a/models/oauth.go
+++ b/models/oauth.go
@@ -1,4 +1,4 @@
-package model
+package models
import "time"
diff --git a/models/user_view.go b/models/user_view.go
index 4025521..9328c98 100644
--- a/models/user_view.go
+++ b/models/user_view.go
@@ -1,4 +1,4 @@
-package model
+package models
import "time"
diff --git a/modules/auth/auth.go b/modules/auth/auth.go
index 2df0ac4..863de2f 100644
--- a/modules/auth/auth.go
+++ b/modules/auth/auth.go
@@ -1,4 +1,4 @@
-package middleware
+package auth
import (
"fmt"
@@ -6,8 +6,8 @@ import (
"strings"
"github.com/gin-gonic/gin"
- "git.iioio.com/freefire/jiang13-forum/model"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/models"
+ "git.iioio.com/freefire/jiang13-forum/services"
)
const (
@@ -18,10 +18,10 @@ const (
)
type AuthMiddleware struct {
- auth *service.AuthService
+ auth *services.AuthService
}
-func NewAuthMiddleware(auth *service.AuthService) *AuthMiddleware {
+func NewAuthMiddleware(auth *services.AuthService) *AuthMiddleware {
return &AuthMiddleware{auth: auth}
}
@@ -32,8 +32,8 @@ func (m *AuthMiddleware) OptionalAuth() gin.HandlerFunc {
token := extractToken(c)
if token != "" {
if claims, err := m.auth.ParseToken(token); err == nil {
- var user model.User
- if err := model.DB.Select("id", "username", "role").First(&user, claims.UserID).Error; err != nil {
+ var user models.User
+ if err := models.DB.Select("id", "username", "role").First(&user, claims.UserID).Error; err != nil {
c.SetCookie(CookieName, "", -1, "/", "", false, true)
} else {
c.Set(CtxUserID, user.ID)
@@ -63,8 +63,8 @@ func (m *AuthMiddleware) RequireAuth() gin.HandlerFunc {
return
}
// 检查禁言
- var user model.User
- if err := model.DB.First(&user, claims.UserID).Error; err != nil || user.Banned {
+ var user models.User
+ if err := models.DB.First(&user, claims.UserID).Error; err != nil || user.Banned {
respondBanned(c)
c.Abort()
return
@@ -81,7 +81,7 @@ func (m *AuthMiddleware) RequireAuth() gin.HandlerFunc {
func (m *AuthMiddleware) RequireAdmin() gin.HandlerFunc {
return func(c *gin.Context) {
role, exists := c.Get(CtxRole)
- if !exists || role != model.RoleAdmin {
+ if !exists || role != models.RoleAdmin {
if isAPI(c) {
c.JSON(http.StatusForbidden, gin.H{"error": "需要管理员权限"})
} else {
@@ -147,7 +147,7 @@ func respondBanned(c *gin.Context) {
}
// RateLimitMiddleware 限流中间件
-func RateLimitMiddleware(limiter *service.RateLimiter, action string) gin.HandlerFunc {
+func RateLimitMiddleware(limiter *services.RateLimiter, action string) gin.HandlerFunc {
return func(c *gin.Context) {
key := c.ClientIP()
if uid, ok := c.Get(CtxUserID); ok {
diff --git a/modules/seo/pagemeta.go b/modules/seo/pagemeta.go
new file mode 100644
index 0000000..fb49bb7
--- /dev/null
+++ b/modules/seo/pagemeta.go
@@ -0,0 +1,16 @@
+package seo
+
+// PageMeta 页面级 SEO / 社交预览元数据（SSR 与爬虫 HTML 共用）
+type PageMeta struct {
+ Title string // 完整
+ Description string
+ Keywords string // meta keywords
+ Canonical string
+ OGType string // 默认 website
+ OGImage string
+ SiteName string // og:site_name
+ Locale string // og:locale，默认 zh_CN
+ Robots string // 如 noindex,nofollow
+ JSONLD string // 已序列化的 JSON-LD 对象（不含 script 标签）
+ Status int // HTTP 状态码，0 视为 200
+}
diff --git a/routers/api/api.go b/routers/api/api.go
index 3887d5d..80af074 100644
--- a/routers/api/api.go
+++ b/routers/api/api.go
@@ -1,4 +1,4 @@
-package handler
+package api
import (
"errors"
@@ -10,9 +10,9 @@ import (
"time"
"github.com/gin-gonic/gin"
- "git.iioio.com/freefire/jiang13-forum/middleware"
- "git.iioio.com/freefire/jiang13-forum/model"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/modules/auth"
+ "git.iioio.com/freefire/jiang13-forum/models"
+ "git.iioio.com/freefire/jiang13-forum/services"
)
// APIMe 当前登录用户
@@ -25,7 +25,7 @@ func (h *Handlers) APIMe(c *gin.Context) {
user, err := h.User.GetByID(uid)
if err != nil {
// 账号已删或不存在：清掉失效 cookie，与未登录态一致
- c.SetCookie(middleware.CookieName, "", -1, "/", "", false, true)
+ c.SetCookie(auth.CookieName, "", -1, "/", "", false, true)
c.JSON(http.StatusOK, gin.H{"user": nil})
return
}
@@ -35,7 +35,7 @@ func (h *Handlers) APIMe(c *gin.Context) {
view := user.ToSelf()
if h.Badge != nil {
if badges, bErr := h.Badge.ListUserBadges(user.ID); bErr == nil {
- view.Badges = service.BadgeViews(badges, 0)
+ view.Badges = services.BadgeViews(badges, 0)
}
}
c.JSON(http.StatusOK, gin.H{
@@ -51,14 +51,14 @@ func (h *Handlers) APIBoards(c *gin.Context) {
return
}
if boards == nil {
- boards = []service.BoardWithStats{}
+ boards = []services.BoardWithStats{}
}
c.JSON(http.StatusOK, gin.H{"boards": boards})
}
// APIHealth 健康检查（容器探活 / 负载均衡）
func (h *Handlers) APIHealth(c *gin.Context) {
- if err := model.PingDB(); err != nil {
+ if err := models.PingDB(); err != nil {
c.JSON(http.StatusServiceUnavailable, gin.H{
"status": "unavailable",
"error": err.Error(),
@@ -71,10 +71,10 @@ func (h *Handlers) APIHealth(c *gin.Context) {
// APIStats 论坛概览统计
func (h *Handlers) APIStats(c *gin.Context) {
var userCount, postCount, boardCount, commentCount int64
- model.DB.Model(&model.User{}).Count(&userCount)
- model.DB.Model(&model.Post{}).Where("status = ?", model.ContentStatusPublished).Count(&postCount)
- model.DB.Model(&model.Board{}).Count(&boardCount)
- model.DB.Model(&model.Comment{}).Where("status = ?", model.ContentStatusPublished).Count(&commentCount)
+ models.DB.Model(&models.User{}).Count(&userCount)
+ models.DB.Model(&models.Post{}).Where("status = ?", models.ContentStatusPublished).Count(&postCount)
+ models.DB.Model(&models.Board{}).Count(&boardCount)
+ models.DB.Model(&models.Comment{}).Where("status = ?", models.ContentStatusPublished).Count(&commentCount)
c.JSON(http.StatusOK, gin.H{
"users": userCount,
"posts": postCount,
@@ -144,19 +144,19 @@ func (h *Handlers) APIAdminDeleteBoard(c *gin.Context) {
// APIAdminDashboard 管理后台概览
func (h *Handlers) APIAdminDashboard(c *gin.Context) {
var userCount, postCount, boardCount, commentCount int64
- model.DB.Model(&model.User{}).Count(&userCount)
- model.DB.Model(&model.Post{}).Where("status = ?", model.ContentStatusPublished).Count(&postCount)
- model.DB.Model(&model.Board{}).Count(&boardCount)
- model.DB.Model(&model.Comment{}).Where("status = ?", model.ContentStatusPublished).Count(&commentCount)
+ models.DB.Model(&models.User{}).Count(&userCount)
+ models.DB.Model(&models.Post{}).Where("status = ?", models.ContentStatusPublished).Count(&postCount)
+ models.DB.Model(&models.Board{}).Count(&boardCount)
+ models.DB.Model(&models.Comment{}).Where("status = ?", models.ContentStatusPublished).Count(&commentCount)
pendingPosts, _ := h.Post.PendingPostCount()
pendingComments, _ := h.Comment.PendingCommentCount()
pendingReports, _ := h.Report.PendingCount()
pendingFriendLinks, _ := h.FriendLinkApply.PendingCount()
- recentPosts, _, _ := h.Post.List(service.PostListQuery{
+ recentPosts, _, _ := h.Post.List(services.PostListQuery{
Page: 1, Size: 8, ViewerIsAdmin: true, Status: "all",
})
if recentPosts == nil {
- recentPosts = []model.Post{}
+ recentPosts = []models.Post{}
}
c.JSON(http.StatusOK, gin.H{
"users": userCount, "posts": postCount, "boards": boardCount,
@@ -175,7 +175,7 @@ func (h *Handlers) APIAdminPosts(c *gin.Context) {
size, _ := strconv.Atoi(c.DefaultQuery("size", "20"))
keyword := strings.TrimSpace(c.Query("keyword"))
status := strings.TrimSpace(c.DefaultQuery("status", "all"))
- posts, total, err := h.Post.ListItems(service.PostListQuery{
+ posts, total, err := h.Post.ListItems(services.PostListQuery{
Page: page, Size: size, Keyword: keyword,
ViewerIsAdmin: true, Status: status,
})
@@ -184,7 +184,7 @@ func (h *Handlers) APIAdminPosts(c *gin.Context) {
return
}
if posts == nil {
- posts = []service.PostListItem{}
+ posts = []services.PostListItem{}
}
pending, _ := h.Post.PendingPostCount()
c.JSON(http.StatusOK, gin.H{
@@ -321,7 +321,7 @@ func (h *Handlers) APIAdminTrashPosts(c *gin.Context) {
return
}
if posts == nil {
- posts = []service.TrashPostItem{}
+ posts = []services.TrashPostItem{}
}
c.JSON(http.StatusOK, gin.H{
"posts": posts, "total": total, "page": page,
@@ -360,7 +360,7 @@ func (h *Handlers) APIAdminComments(c *gin.Context) {
return
}
if comments == nil {
- comments = []model.Comment{}
+ comments = []models.Comment{}
}
pending, _ := h.Comment.PendingCommentCount()
c.JSON(http.StatusOK, gin.H{
@@ -374,18 +374,18 @@ func (h *Handlers) APIAdminComments(c *gin.Context) {
// APIAdminApproveComment 通过评论审核
func (h *Handlers) APIAdminApproveComment(c *gin.Context) {
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
- if err := h.Comment.SetStatus(uint(id), model.ContentStatusPublished); err != nil {
+ if err := h.Comment.SetStatus(uint(id), models.ContentStatusPublished); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
if h.Notify != nil {
if comment, err := h.Comment.GetByID(uint(id)); err == nil {
- comment.Status = model.ContentStatusPublished
+ comment.Status = models.ContentStatusPublished
h.Notify.AsyncNotifyCommentPublished(comment)
h.Notify.AsyncNotifyCommentMentions(comment)
}
}
- c.JSON(http.StatusOK, gin.H{"message": "评论已通过审核", "status": model.ContentStatusPublished})
+ c.JSON(http.StatusOK, gin.H{"message": "评论已通过审核", "status": models.ContentStatusPublished})
}
// APIAdminRejectComment 拒绝评论并私信通知
@@ -404,7 +404,7 @@ func (h *Handlers) APIAdminRejectComment(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
- if err := h.Comment.SetStatus(uint(id), model.ContentStatusRejected); err != nil {
+ if err := h.Comment.SetStatus(uint(id), models.ContentStatusRejected); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
@@ -417,13 +417,13 @@ func (h *Handlers) APIAdminRejectComment(c *gin.Context) {
_, _ = h.Message.SendSystem(
comment.UserID,
"评论未通过审核",
- service.FormatCommentRejectContent(title, comment.PostID, comment.Floor, reason),
- model.MessageKindReject,
+ services.FormatCommentRejectContent(title, comment.PostID, comment.Floor, reason),
+ models.MessageKindReject,
&pid,
nil,
)
}
- c.JSON(http.StatusOK, gin.H{"message": "已拒绝该评论并通知作者", "status": model.ContentStatusRejected})
+ c.JSON(http.StatusOK, gin.H{"message": "已拒绝该评论并通知作者", "status": models.ContentStatusRejected})
}
// APIAdminDeleteComment 管理员软删除评论（进入回收站）
@@ -447,7 +447,7 @@ func (h *Handlers) APIAdminTrashComments(c *gin.Context) {
return
}
if comments == nil {
- comments = []service.TrashCommentItem{}
+ comments = []services.TrashCommentItem{}
}
c.JSON(http.StatusOK, gin.H{
"comments": comments, "total": total, "page": page,
@@ -492,7 +492,7 @@ func (h *Handlers) APIAdminUsers(c *gin.Context) {
size, _ := strconv.Atoi(c.DefaultQuery("size", "20"))
keyword := strings.TrimSpace(c.Query("keyword"))
filter := strings.TrimSpace(c.DefaultQuery("filter", "all"))
- users, total, err := h.User.ListUsers(service.UserListQuery{
+ users, total, err := h.User.ListUsers(services.UserListQuery{
Page: page, Size: size, Keyword: keyword, Filter: filter,
})
if err != nil {
@@ -500,10 +500,10 @@ func (h *Handlers) APIAdminUsers(c *gin.Context) {
return
}
if users == nil {
- users = []model.User{}
+ users = []models.User{}
}
c.JSON(http.StatusOK, gin.H{
- "users": model.UsersToAdmin(users), "total": total, "page": page,
+ "users": models.UsersToAdmin(users), "total": total, "page": page,
"total_pages": calcTotalPages(total, size),
"keyword": keyword,
"filter": filter,
@@ -560,7 +560,7 @@ func (h *Handlers) APIAdminDownloadBackup(c *gin.Context) {
// APIAdminSettings 系统设置信息
func (h *Handlers) APIAdminSettings(c *gin.Context) {
limits := h.Settings.Limits()
- filterContent, _ := service.ReadFilterWordsFile(h.Cfg.FilterWordsPath())
+ filterContent, _ := services.ReadFilterWordsFile(h.Cfg.FilterWordsPath())
clients, _ := h.Settings.ListOAuthClients()
c.JSON(http.StatusOK, gin.H{
"filter_path": h.Cfg.FilterWordsPath(),
@@ -575,7 +575,7 @@ func (h *Handlers) APIAdminSettings(c *gin.Context) {
"storage": h.Settings.StorageConfigPublic(),
"branding": h.Settings.SiteBranding(),
"filter_words": filterContent,
- "filter_word_count": service.CountFilterWords(filterContent),
+ "filter_word_count": services.CountFilterWords(filterContent),
})
}
@@ -588,7 +588,7 @@ func (h *Handlers) APISiteBranding(c *gin.Context) {
// APIAdminUpdateBranding 更新站点品牌文案
func (h *Handlers) APIAdminUpdateBranding(c *gin.Context) {
- var req service.SiteBranding
+ var req services.SiteBranding
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
@@ -620,7 +620,7 @@ func (h *Handlers) APIAdminUploadBrandingAsset(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "图片不能超过 2MB"})
return
}
- url, err := service.SaveUploadedImage(h.Store, file, service.UploadCategorySite, kind)
+ url, err := services.SaveUploadedImage(h.Store, file, services.UploadCategorySite, kind)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
@@ -677,7 +677,7 @@ func (h *Handlers) APIAdminClearBrandingAsset(c *gin.Context) {
// APIAdminUpdateForumSettings 更新论坛设置
func (h *Handlers) APIAdminUpdateForumSettings(c *gin.Context) {
- var req service.ForumLimits
+ var req services.ForumLimits
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
@@ -694,7 +694,7 @@ func (h *Handlers) APIAdminUpdateForumSettings(c *gin.Context) {
// APIAdminUpdateMailSettings 更新邮件 SMTP 配置
func (h *Handlers) APIAdminUpdateMailSettings(c *gin.Context) {
- var req service.MailConfig
+ var req services.MailConfig
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
@@ -711,7 +711,7 @@ func (h *Handlers) APIAdminUpdateMailSettings(c *gin.Context) {
// APIAdminUpdateOIDCSettings 更新 OIDC Provider 全局配置
func (h *Handlers) APIAdminUpdateOIDCSettings(c *gin.Context) {
- var req service.OIDCConfig
+ var req services.OIDCConfig
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
@@ -749,7 +749,7 @@ func (h *Handlers) APIProjects(c *gin.Context) {
c.JSON(http.StatusInternalServerError, gin.H{"error": "读取失败"})
return
}
- list = service.AttachGiteaOwners(list, h.Badge)
+ list = services.AttachGiteaOwners(list, h.Badge)
c.JSON(http.StatusOK, gin.H{
"projects": list,
"total": total,
@@ -760,7 +760,7 @@ func (h *Handlers) APIProjects(c *gin.Context) {
// APIAdminUpdateGiteaSettings 更新 Gitea 同步配置
func (h *Handlers) APIAdminUpdateGiteaSettings(c *gin.Context) {
- var req service.GiteaSyncConfig
+ var req services.GiteaSyncConfig
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
@@ -777,7 +777,7 @@ func (h *Handlers) APIAdminUpdateGiteaSettings(c *gin.Context) {
// APIAdminUpdateStorageSettings 更新上传存储（本地 / S3 兼容），保存后立即热切换
func (h *Handlers) APIAdminUpdateStorageSettings(c *gin.Context) {
- var req service.StorageConfig
+ var req services.StorageConfig
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
@@ -799,7 +799,7 @@ func (h *Handlers) APIAdminUpdateStorageSettings(c *gin.Context) {
// APIAdminSyncGitea 立即同步 Gitea 公开仓库
func (h *Handlers) APIAdminSyncGitea(c *gin.Context) {
if h.Gitea == nil {
- c.JSON(http.StatusBadRequest, gin.H{"error": service.ErrGiteaNotConfigured.Error()})
+ c.JSON(http.StatusBadRequest, gin.H{"error": services.ErrGiteaNotConfigured.Error()})
return
}
n, err := h.Gitea.SyncRepos()
@@ -826,7 +826,7 @@ func (h *Handlers) APIAdminListOAuthClients(c *gin.Context) {
// APIAdminCreateOAuthClient 创建 OAuth 应用
func (h *Handlers) APIAdminCreateOAuthClient(c *gin.Context) {
- var req service.OAuthClientInput
+ var req services.OAuthClientInput
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
@@ -850,7 +850,7 @@ func (h *Handlers) APIAdminUpdateOAuthClient(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "无效 ID"})
return
}
- var req service.OAuthClientInput
+ var req services.OAuthClientInput
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
@@ -897,16 +897,16 @@ func (h *Handlers) APIAdminTestMail(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "请填写收件邮箱"})
return
}
- if err := service.ValidateEmail(req.To); err != nil {
+ if err := services.ValidateEmail(req.To); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
if !h.Settings.MailReady() {
- c.JSON(http.StatusBadRequest, gin.H{"error": service.ErrMailNotConfigured.Error()})
+ c.JSON(http.StatusBadRequest, gin.H{"error": services.ErrMailNotConfigured.Error()})
return
}
siteName := h.Settings.SiteBranding().Name
- err := h.Mail.Send(service.NormalizeEmail(req.To), "邮件配置测试",
+ err := h.Mail.Send(services.NormalizeEmail(req.To), "邮件配置测试",
fmt.Sprintf("这是一封来自%s的测试邮件，说明 SMTP 配置正常。", siteName))
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
@@ -917,14 +917,14 @@ func (h *Handlers) APIAdminTestMail(c *gin.Context) {
// APIAdminFilterWords 读取敏感词配置
func (h *Handlers) APIAdminFilterWords(c *gin.Context) {
- content, err := service.ReadFilterWordsFile(h.Cfg.FilterWordsPath())
+ content, err := services.ReadFilterWordsFile(h.Cfg.FilterWordsPath())
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "读取敏感词配置失败"})
return
}
c.JSON(http.StatusOK, gin.H{
"content": content,
- "word_count": service.CountFilterWords(content),
+ "word_count": services.CountFilterWords(content),
"path": h.Cfg.FilterWordsPath(),
})
}
@@ -938,13 +938,13 @@ func (h *Handlers) APIAdminUpdateFilterWords(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
}
- if err := service.WriteFilterWordsFile(h.Cfg.FilterWordsPath(), req.Content, h.Filter); err != nil {
+ if err := services.WriteFilterWordsFile(h.Cfg.FilterWordsPath(), req.Content, h.Filter); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "保存敏感词配置失败"})
return
}
c.JSON(http.StatusOK, gin.H{
"message": "敏感词已保存并生效",
- "word_count": service.CountFilterWords(req.Content),
+ "word_count": services.CountFilterWords(req.Content),
})
}
@@ -959,7 +959,7 @@ func (h *Handlers) APIPosts(c *gin.Context) {
author := strings.TrimSpace(c.Query("author"))
titleOnly := c.Query("title_only") == "1" || strings.EqualFold(c.Query("title_only"), "true")
- q := service.PostListQuery{
+ q := services.PostListQuery{
BoardID: uint(boardID),
UserID: uint(userID),
Page: page,
@@ -982,10 +982,10 @@ func (h *Handlers) APIPosts(c *gin.Context) {
return
}
if items == nil {
- items = []service.PostListItem{}
+ items = []services.PostListItem{}
}
if h.Badge != nil {
- users := make([]*model.User, 0, len(items))
+ users := make([]*models.User, 0, len(items))
for i := range items {
if items[i].User.ID > 0 {
users = append(users, &items[i].User)
@@ -1012,34 +1012,34 @@ func (h *Handlers) APIPostDetail(c *gin.Context) {
}
uid := h.currentUserID(c)
isAdmin := h.isAdmin(c)
- if !service.CanViewPost(post, uid, isAdmin) {
+ if !services.CanViewPost(post, uid, isAdmin) {
c.JSON(http.StatusNotFound, gin.H{"error": "帖子不存在"})
return
}
- if c.Query("skip_view") != "1" && post.Status == model.ContentStatusPublished {
+ if c.Query("skip_view") != "1" && post.Status == models.ContentStatusPublished {
h.Post.RecordView(uint(id))
}
// 出口再消毒：兼容库内历史脏 HTML（如 <style>），避免旧帖污染整页
- post.Content = service.SanitizePostHTML(post.Content)
+ post.Content = services.SanitizePostHTML(post.Content)
hasReplied := uid > 0 && h.Comment.HasUserReplied(uint(id), uid)
if uid == 0 {
- post.Content = service.RedactMembersOnlyHTML(post.Content)
- post.Content = service.RedactReplyOnlyHTML(post.Content)
+ post.Content = services.RedactMembersOnlyHTML(post.Content)
+ post.Content = services.RedactReplyOnlyHTML(post.Content)
} else if !isAdmin && post.UserID != uid && !hasReplied {
// 作者与管理员始终可见；其他用户需已回复
- post.Content = service.RedactReplyOnlyHTML(post.Content)
+ post.Content = services.RedactReplyOnlyHTML(post.Content)
}
// 积分解锁块：作者/站长全文；其他人按解锁记录 redact
if isAdmin || post.UserID == uid {
- post.Content = service.RevealAllPointsOnly(post.Content)
+ post.Content = services.RevealAllPointsOnly(post.Content)
} else {
- unlocked, _ := service.ListUnlockedKeys(uid, uint(id))
- post.Content = service.RedactPointsOnlyHTML(post.Content, unlocked)
+ unlocked, _ := services.ListUnlockedKeys(uid, uint(id))
+ post.Content = services.RedactPointsOnlyHTML(post.Content, unlocked)
}
comments, _ := h.Comment.ListByPost(uint(id), uid, isAdmin, post.UserID, h.parseGuestCommentIDs(c))
if h.Badge != nil {
if post.User.ID > 0 {
- h.Badge.AttachBadgeSummaries([]*model.User{&post.User}, 3)
+ h.Badge.AttachBadgeSummaries([]*models.User{&post.User}, 3)
}
h.Badge.AttachBadgeSummariesOnComments(comments, 2)
}
@@ -1060,21 +1060,21 @@ func (h *Handlers) APIPostDetail(c *gin.Context) {
"is_edited": isEdited,
"post_edit_window_hours": h.Settings.PostEditWindowHours(),
}
- if post.PostType == model.PostTypePoll {
- if poll, err := service.GetPollView(uint(id), uid); err == nil {
+ if post.PostType == models.PostTypePoll {
+ if poll, err := services.GetPollView(uint(id), uid); err == nil {
resp["poll"] = poll
}
}
- if post.PostType == model.PostTypeLottery {
- if lottery, err := service.GetPostLotteryView(post); err == nil && lottery != nil {
+ if post.PostType == models.PostTypeLottery {
+ if lottery, err := services.GetPostLotteryView(post); err == nil && lottery != nil {
resp["lottery"] = lottery
}
}
- if post.PostType == model.PostTypeBounty && post.BountyStatus == model.BountyStatusOpen && post.BountyPoints > 0 {
- canRefund, blockReason := service.CanRefundBounty(post, isAdmin)
+ if post.PostType == models.PostTypeBounty && post.BountyStatus == models.BountyStatusOpen && post.BountyPoints > 0 {
+ canRefund, blockReason := services.CanRefundBounty(post, isAdmin)
resp["bounty_can_refund"] = canRefund
resp["bounty_refund_block_reason"] = blockReason
- if n, err := service.CountEligibleBountyReplies(model.DB, post.ID, post.UserID); err == nil {
+ if n, err := services.CountEligibleBountyReplies(models.DB, post.ID, post.UserID); err == nil {
resp["bounty_eligible_reply_count"] = n
}
}
@@ -1091,7 +1091,7 @@ func (h *Handlers) APIPostComments(c *gin.Context) {
}
uid := h.currentUserID(c)
isAdmin := h.isAdmin(c)
- if !service.CanViewPost(post, uid, isAdmin) {
+ if !services.CanViewPost(post, uid, isAdmin) {
c.JSON(http.StatusNotFound, gin.H{"error": "帖子不存在"})
return
}
@@ -1101,7 +1101,7 @@ func (h *Handlers) APIPostComments(c *gin.Context) {
return
}
if comments == nil {
- comments = []model.Comment{}
+ comments = []models.Comment{}
}
if h.Badge != nil {
h.Badge.AttachBadgeSummariesOnComments(comments, 2)
@@ -1138,7 +1138,7 @@ func (h *Handlers) APIRecentComments(c *gin.Context) {
return
}
if list == nil {
- list = []service.RecentCommentItem{}
+ list = []services.RecentCommentItem{}
}
c.JSON(http.StatusOK, gin.H{"comments": list})
}
@@ -1151,7 +1151,7 @@ func (h *Handlers) APIRecentUsers(c *gin.Context) {
return
}
if list == nil {
- list = []service.RecentUserItem{}
+ list = []services.RecentUserItem{}
}
c.JSON(http.StatusOK, gin.H{"users": list})
}
@@ -1166,7 +1166,7 @@ func (h *Handlers) APIFavorites(c *gin.Context) {
return
}
if favs == nil {
- favs = []model.PostFavorite{}
+ favs = []models.PostFavorite{}
}
c.JSON(http.StatusOK, gin.H{"favorites": favs, "total": total, "page": page})
}
@@ -1217,6 +1217,6 @@ func (h *Handlers) APIPostRevisionDetail(c *gin.Context) {
}
func isClientLimitError(err error) bool {
- return errors.Is(err, service.ErrSearchKeywordTooShort) ||
- errors.Is(err, service.ErrSearchKeywordTooLong)
+ return errors.Is(err, services.ErrSearchKeywordTooShort) ||
+ errors.Is(err, services.ErrSearchKeywordTooLong)
}
diff --git a/routers/api/economy.go b/routers/api/economy.go
index db9b96c..d9acbb0 100644
--- a/routers/api/economy.go
+++ b/routers/api/economy.go
@@ -1,4 +1,4 @@
-package handler
+package api
import (
"errors"
@@ -6,8 +6,8 @@ import (
"strconv"
"github.com/gin-gonic/gin"
- "git.iioio.com/freefire/jiang13-forum/model"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/models"
+ "git.iioio.com/freefire/jiang13-forum/services"
)
// APIMePoints 余额与流水
@@ -53,7 +53,7 @@ func (h *Handlers) APIMeCheckInGet(c *gin.Context) {
func (h *Handlers) APIMeCheckIn(c *gin.Context) {
st, err := h.Points.CheckIn(h.currentUserID(c))
if err != nil {
- if errors.Is(err, service.ErrAlreadyCheckedIn) {
+ if errors.Is(err, services.ErrAlreadyCheckedIn) {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
@@ -102,7 +102,7 @@ func (h *Handlers) APIUnlockPostBlock(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "缺少 block_key"})
return
}
- res, err := service.UnlockPointsBlock(h.currentUserID(c), uint(id), req.BlockKey)
+ res, err := services.UnlockPointsBlock(h.currentUserID(c), uint(id), req.BlockKey)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
@@ -120,7 +120,7 @@ func (h *Handlers) APIAdminVerifyUser(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
}
- if err := service.SetVerified(uint(id), req.Verified); err != nil {
+ if err := services.SetVerified(uint(id), req.Verified); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
@@ -141,11 +141,11 @@ func (h *Handlers) APIAdminSetUserLevel(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
}
- if err := service.SetUserLevel(uint(id), req.Level); err != nil {
+ if err := services.SetUserLevel(uint(id), req.Level); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
- c.JSON(http.StatusOK, gin.H{"message": "等级已更新", "level": req.Level, "exp": model.ExpForLevel(req.Level)})
+ c.JSON(http.StatusOK, gin.H{"message": "等级已更新", "level": req.Level, "exp": models.ExpForLevel(req.Level)})
}
// APIAdminAdjustPoints 调积分
@@ -179,7 +179,7 @@ func (h *Handlers) APIAdminListBadges(c *gin.Context) {
// APIAdminUpsertBadge 创建/更新徽章定义
func (h *Handlers) APIAdminUpsertBadge(c *gin.Context) {
- var def model.BadgeDef
+ var def models.BadgeDef
if err := c.ShouldBindJSON(&def); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
diff --git a/routers/api/friend_link.go b/routers/api/friend_link.go
index a1beca5..9766f9d 100644
--- a/routers/api/friend_link.go
+++ b/routers/api/friend_link.go
@@ -1,4 +1,4 @@
-package handler
+package api
import (
"fmt"
@@ -6,7 +6,7 @@ import (
"strconv"
"strings"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/services"
"github.com/gin-gonic/gin"
)
@@ -28,7 +28,7 @@ func (h *Handlers) APIApplyFriendLink(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
}
- result, err := h.FriendLinkApply.Create(service.FriendLinkApplyInput{
+ result, err := h.FriendLinkApply.Create(services.FriendLinkApplyInput{
UserID: uid,
Name: req.Name,
URL: req.URL,
@@ -65,10 +65,10 @@ func (h *Handlers) APIUploadFriendLinkLogo(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "图片文件过大"})
return
}
- url, err := service.SaveUploadedImage(
+ url, err := services.SaveUploadedImage(
h.Store,
file,
- service.UploadCategorySite,
+ services.UploadCategorySite,
fmt.Sprintf("fl_%d", uid),
)
if err != nil {
@@ -83,7 +83,7 @@ func (h *Handlers) APIAdminFriendLinkApplies(c *gin.Context) {
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
size, _ := strconv.Atoi(c.DefaultQuery("size", "20"))
status := strings.TrimSpace(c.DefaultQuery("status", "pending"))
- list, total, err := h.FriendLinkApply.ListAdmin(service.FriendLinkApplyListQuery{
+ list, total, err := h.FriendLinkApply.ListAdmin(services.FriendLinkApplyListQuery{
Page: page, Size: size, Status: status,
})
if err != nil {
@@ -236,7 +236,7 @@ func (h *Handlers) APIUpdateFriendLinkApply(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
}
- result, err := h.FriendLinkApply.Update(uid, uint(id), service.FriendLinkApplyInput{
+ result, err := h.FriendLinkApply.Update(uid, uint(id), services.FriendLinkApplyInput{
UserID: uid,
Name: req.Name,
URL: req.URL,
diff --git a/routers/api/handlers.go b/routers/api/handlers.go
index dbb47c9..8a2c417 100644
--- a/routers/api/handlers.go
+++ b/routers/api/handlers.go
@@ -1,4 +1,4 @@
-package handler
+package api
import (
"encoding/base64"
@@ -10,58 +10,58 @@ import (
"github.com/gin-gonic/gin"
"git.iioio.com/freefire/jiang13-forum/config"
- "git.iioio.com/freefire/jiang13-forum/middleware"
- "git.iioio.com/freefire/jiang13-forum/model"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/modules/auth"
+ "git.iioio.com/freefire/jiang13-forum/models"
+ "git.iioio.com/freefire/jiang13-forum/services"
)
// Handlers 聚合所有 HTTP 处理器
type Handlers struct {
Cfg *config.Config
- Store *service.UploadStore
- Auth *service.AuthService
- User *service.UserService
- Board *service.BoardService
- Post *service.PostService
- Comment *service.CommentService
- Message *service.MessageService
- Notify *service.NotifyService
- Report *service.ReportService
- Backup *service.BackupService
- Filter *service.SensitiveFilter
- Limiter *service.RateLimiter
- Settings *service.ForumSettingsService
- Captcha *service.CaptchaService
- Mail *service.MailService
- EmailCode *service.EmailCodeService
- OIDC *service.OIDCService
- Gitea *service.GiteaService
- Points *service.PointsService
- Badge *service.BadgeService
- SitePage *service.SitePageService
- FriendLinkApply *service.FriendLinkApplyService
+ Store *services.UploadStore
+ Auth *services.AuthService
+ User *services.UserService
+ Board *services.BoardService
+ Post *services.PostService
+ Comment *services.CommentService
+ Message *services.MessageService
+ Notify *services.NotifyService
+ Report *services.ReportService
+ Backup *services.BackupService
+ Filter *services.SensitiveFilter
+ Limiter *services.RateLimiter
+ Settings *services.ForumSettingsService
+ Captcha *services.CaptchaService
+ Mail *services.MailService
+ EmailCode *services.EmailCodeService
+ OIDC *services.OIDCService
+ Gitea *services.GiteaService
+ Points *services.PointsService
+ Badge *services.BadgeService
+ SitePage *services.SitePageService
+ FriendLinkApply *services.FriendLinkApplyService
}
func (h *Handlers) setAuthCookie(c *gin.Context, token string) {
- c.SetCookie(middleware.CookieName, token, int(service.TokenExpire.Seconds()), "/", "", false, true)
+ c.SetCookie(auth.CookieName, token, int(services.TokenExpire.Seconds()), "/", "", false, true)
}
func (h *Handlers) currentUserID(c *gin.Context) uint {
- if v, ok := c.Get(middleware.CtxUserID); ok {
+ if v, ok := c.Get(auth.CtxUserID); ok {
return v.(uint)
}
return 0
}
func (h *Handlers) isAdmin(c *gin.Context) bool {
- if v, ok := c.Get(middleware.CtxRole); ok {
- return v == model.RoleAdmin
+ if v, ok := c.Get(auth.CtxRole); ok {
+ return v == models.RoleAdmin
}
return false
}
// loadCurrentUser 加载当前登录用户完整资料（含认证/积分）
-func (h *Handlers) loadCurrentUser(c *gin.Context) (*model.User, error) {
+func (h *Handlers) loadCurrentUser(c *gin.Context) (*models.User, error) {
uid := h.currentUserID(c)
if uid == 0 {
return nil, errors.New("未登录")
@@ -133,7 +133,7 @@ func (h *Handlers) APIRegisterConfig(c *gin.Context) {
"mail_ready": mailReady,
"require_email_code": mailReady,
"register_open": userCount == 0 || mailReady,
- "email_code_len": service.EmailCodeLen,
+ "email_code_len": services.EmailCodeLen,
})
}
@@ -147,7 +147,7 @@ func (h *Handlers) APISendRegisterEmailCode(c *gin.Context) {
return
}
if !h.Settings.MailReady() {
- c.JSON(http.StatusBadRequest, gin.H{"error": service.ErrMailNotConfigured.Error()})
+ c.JSON(http.StatusBadRequest, gin.H{"error": services.ErrMailNotConfigured.Error()})
return
}
if err := h.EmailCode.SendRegisterCode(req.Email); err != nil {
@@ -167,7 +167,7 @@ func (h *Handlers) APISendResetEmailCode(c *gin.Context) {
return
}
if !h.Settings.MailReady() {
- c.JSON(http.StatusBadRequest, gin.H{"error": service.ErrMailNotConfigured.Error()})
+ c.JSON(http.StatusBadRequest, gin.H{"error": services.ErrMailNotConfigured.Error()})
return
}
if err := h.EmailCode.SendResetCode(req.Email); err != nil {
@@ -189,11 +189,11 @@ func (h *Handlers) APIResetPassword(c *gin.Context) {
return
}
if !h.Settings.MailReady() {
- c.JSON(http.StatusBadRequest, gin.H{"error": service.ErrMailNotConfigured.Error()})
+ c.JSON(http.StatusBadRequest, gin.H{"error": services.ErrMailNotConfigured.Error()})
return
}
- if !h.EmailCode.VerifyPurpose(service.EmailCodePurposeReset, req.Email, req.EmailCode) {
- c.JSON(http.StatusBadRequest, gin.H{"error": service.ErrEmailCodeInvalid.Error()})
+ if !h.EmailCode.VerifyPurpose(services.EmailCodePurposeReset, req.Email, req.EmailCode) {
+ c.JSON(http.StatusBadRequest, gin.H{"error": services.ErrEmailCodeInvalid.Error()})
return
}
if err := h.User.ResetPasswordByEmail(req.Email, req.NewPassword); err != nil {
@@ -244,12 +244,12 @@ func (h *Handlers) APIRegister(c *gin.Context) {
userCount := h.Auth.UserCount()
mailReady := h.Settings.MailReady()
if userCount > 0 && !mailReady {
- c.JSON(http.StatusBadRequest, gin.H{"error": service.ErrRegisterClosed.Error()})
+ c.JSON(http.StatusBadRequest, gin.H{"error": services.ErrRegisterClosed.Error()})
return
}
if mailReady {
if !h.EmailCode.Verify(req.Email, req.EmailCode) {
- c.JSON(http.StatusBadRequest, gin.H{"error": service.ErrEmailCodeInvalid.Error()})
+ c.JSON(http.StatusBadRequest, gin.H{"error": services.ErrEmailCodeInvalid.Error()})
return
}
}
@@ -283,7 +283,7 @@ func (h *Handlers) APILogin(c *gin.Context) {
}
func (h *Handlers) APILogout(c *gin.Context) {
- c.SetCookie(middleware.CookieName, "", -1, "/", "", false, true)
+ c.SetCookie(auth.CookieName, "", -1, "/", "", false, true)
c.JSON(http.StatusOK, gin.H{"message": "已退出"})
}
@@ -323,7 +323,7 @@ func (h *Handlers) APIUserPublic(c *gin.Context) {
if h.Badge != nil {
_ = h.Badge.EvaluateAuto(user.ID)
if badges, bErr := h.Badge.ListUserBadges(user.ID); bErr == nil {
- view.Badges = service.BadgeViews(badges, 0)
+ view.Badges = services.BadgeViews(badges, 0)
}
}
c.JSON(http.StatusOK, gin.H{
@@ -396,10 +396,10 @@ func (h *Handlers) APIUploadPostImage(c *gin.Context) {
return
}
uid := h.currentUserID(c)
- url, err := service.SaveUploadedImage(
+ url, err := services.SaveUploadedImage(
h.Store,
file,
- service.UploadCategoryPosts,
+ services.UploadCategoryPosts,
fmt.Sprintf("%d", uid),
)
if err != nil {
@@ -421,20 +421,20 @@ func (h *Handlers) APICreatePost(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
- extras := service.ParsePostExtrasFromForm(
+ extras := services.ParsePostExtrasFromForm(
c.PostForm("poll_options"),
c.PostForm("bounty_points"),
c.PostForm("lottery_winner_count"),
)
- if post.PostType == model.PostTypePoll || post.PostType == model.PostTypeBounty || post.PostType == model.PostTypeLottery {
- if err := service.FinalizeSpecialPostCreate(post, h.currentUserID(c), extras); err != nil {
+ if post.PostType == models.PostTypePoll || post.PostType == models.PostTypeBounty || post.PostType == models.PostTypeLottery {
+ if err := services.FinalizeSpecialPostCreate(post, h.currentUserID(c), extras); err != nil {
_ = h.Post.Delete(h.currentUserID(c), post.ID, true)
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
}
msg := "发帖成功"
- if post.Status == model.ContentStatusPending {
+ if post.Status == models.ContentStatusPending {
msg = "已提交审核，通过后将公开显示"
if h.Notify != nil {
h.Notify.AsyncNotifyPendingPost(post)
@@ -479,8 +479,8 @@ func (h *Handlers) APIToggleLike(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
- var post model.Post
- model.DB.First(&post, id)
+ var post models.Post
+ models.DB.First(&post, id)
c.JSON(http.StatusOK, gin.H{"liked": liked, "like_count": post.LikeCount})
}
@@ -535,7 +535,7 @@ func (h *Handlers) APICreateComment(c *gin.Context) {
return
}
- in := service.CommentCreateInput{
+ in := services.CommentCreateInput{
UserID: uid,
PostID: uint(postID),
Content: content,
@@ -551,14 +551,14 @@ func (h *Handlers) APICreateComment(c *gin.Context) {
msg := "评论成功"
if h.Notify != nil {
switch comment.Status {
- case model.ContentStatusPublished:
+ case models.ContentStatusPublished:
h.Notify.AsyncNotifyCommentPublished(comment)
h.Notify.AsyncNotifyCommentMentions(comment)
- case model.ContentStatusPending:
+ case models.ContentStatusPending:
msg = "评论已提交，审核通过后公开显示"
h.Notify.AsyncNotifyPendingComment(comment)
}
- } else if comment.Status == model.ContentStatusPending {
+ } else if comment.Status == models.ContentStatusPending {
msg = "评论已提交，审核通过后公开显示"
}
c.JSON(http.StatusOK, gin.H{"message": msg, "floor": comment.Floor, "id": comment.ID, "status": comment.Status})
@@ -586,7 +586,7 @@ func (h *Handlers) APIUpdateComment(c *gin.Context) {
status := ""
if comment, e := h.Comment.GetByID(uint(id)); e == nil {
status = comment.Status
- if status == model.ContentStatusPending && !h.isAdmin(c) {
+ if status == models.ContentStatusPending && !h.isAdmin(c) {
msg = "评论已更新，审核通过后公开显示"
}
if enteredPending && h.Notify != nil {
diff --git a/routers/api/media.go b/routers/api/media.go
index 0fcf320..f655d49 100644
--- a/routers/api/media.go
+++ b/routers/api/media.go
@@ -1,4 +1,4 @@
-package handler
+package api
import (
"net/http"
diff --git a/routers/api/message.go b/routers/api/message.go
index d8b8835..56549c7 100644
--- a/routers/api/message.go
+++ b/routers/api/message.go
@@ -1,19 +1,19 @@
-package handler
+package api
import (
"net/http"
"strconv"
"github.com/gin-gonic/gin"
- "git.iioio.com/freefire/jiang13-forum/model"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/models"
+ "git.iioio.com/freefire/jiang13-forum/services"
)
// APIMessageConversations 会话列表（按对方聚合）
func (h *Handlers) APIMessageConversations(c *gin.Context) {
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
size, _ := strconv.Atoi(c.DefaultQuery("size", "30"))
- list, total, err := h.Message.ListConversations(service.ConversationListQuery{
+ list, total, err := h.Message.ListConversations(services.ConversationListQuery{
UserID: h.currentUserID(c),
Page: page,
Size: size,
@@ -41,7 +41,7 @@ func (h *Handlers) APIConversationMessages(c *gin.Context) {
before, _ := strconv.ParseUint(c.DefaultQuery("before", "0"), 10, 64)
uid := h.currentUserID(c)
- list, total, err := h.Message.ListConversationMessages(service.ConversationMessagesQuery{
+ list, total, err := h.Message.ListConversationMessages(services.ConversationMessagesQuery{
UserID: uid,
PeerID: uint(peerID),
Page: page,
@@ -63,10 +63,10 @@ func (h *Handlers) APIConversationMessages(c *gin.Context) {
}
}
- var peer *model.User
+ var peer *models.User
if peerID > 0 {
- var u model.User
- if err := model.DB.First(&u, uint(peerID)).Error; err == nil {
+ var u models.User
+ if err := models.DB.First(&u, uint(peerID)).Error; err == nil {
peer = &u
}
}
@@ -147,7 +147,7 @@ func (h *Handlers) APISendMessage(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
}
- msg, err := h.Message.Send(service.MessageSendInput{
+ msg, err := h.Message.Send(services.MessageSendInput{
FromUserID: h.currentUserID(c),
ToUserID: req.ToUserID,
Subject: req.Subject,
diff --git a/routers/api/oidc.go b/routers/api/oidc.go
index 311b0d9..8974661 100644
--- a/routers/api/oidc.go
+++ b/routers/api/oidc.go
@@ -1,4 +1,4 @@
-package handler
+package api
import (
"encoding/base64"
@@ -8,8 +8,8 @@ import (
"strings"
"github.com/gin-gonic/gin"
- "git.iioio.com/freefire/jiang13-forum/middleware"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/modules/auth"
+ "git.iioio.com/freefire/jiang13-forum/services"
)
// OIDCDiscovery OpenID Provider 元数据
@@ -47,7 +47,7 @@ func (h *Handlers) OIDCAuthorize(c *gin.Context) {
return
}
- req := service.AuthorizeRequest{
+ req := services.AuthorizeRequest{
ClientID: c.Query("client_id"),
RedirectURI: c.Query("redirect_uri"),
ResponseType: c.Query("response_type"),
@@ -60,7 +60,7 @@ func (h *Handlers) OIDCAuthorize(c *gin.Context) {
if err := h.OIDC.ValidateAuthorize(req); err != nil {
// redirect_uri 未通过校验时不能重定向，避免开放重定向
- if errors.Is(err, service.ErrOIDCInvalidRedirect) || errors.Is(err, service.ErrOIDCInvalidClient) {
+ if errors.Is(err, services.ErrOIDCInvalidRedirect) || errors.Is(err, services.ErrOIDCInvalidClient) {
c.String(http.StatusBadRequest, err.Error())
return
}
@@ -77,7 +77,7 @@ func (h *Handlers) OIDCAuthorize(c *gin.Context) {
callback, err := h.OIDC.IssueAuthCode(uid, req)
if err != nil {
- if errors.Is(err, service.ErrOIDCUserBanned) {
+ if errors.Is(err, services.ErrOIDCUserBanned) {
h.oidcErrorRedirect(c, req.RedirectURI, req.State, "access_denied", "账号已被禁言")
return
}
@@ -121,7 +121,7 @@ func (h *Handlers) OIDCToken(c *gin.Context) {
}
}
- resp, err := h.OIDC.ExchangeCode(service.TokenRequest{
+ resp, err := h.OIDC.ExchangeCode(services.TokenRequest{
GrantType: c.PostForm("grant_type"),
Code: c.PostForm("code"),
RedirectURI: c.PostForm("redirect_uri"),
@@ -133,12 +133,12 @@ func (h *Handlers) OIDCToken(c *gin.Context) {
status := http.StatusBadRequest
code := "invalid_grant"
switch {
- case errors.Is(err, service.ErrOIDCInvalidClient):
+ case errors.Is(err, services.ErrOIDCInvalidClient):
status = http.StatusUnauthorized
code = "invalid_client"
- case errors.Is(err, service.ErrOIDCInvalidRequest):
+ case errors.Is(err, services.ErrOIDCInvalidRequest):
code = "invalid_request"
- case errors.Is(err, service.ErrOIDCPKCEFailed):
+ case errors.Is(err, services.ErrOIDCPKCEFailed):
code = "invalid_grant"
}
c.JSON(status, gin.H{"error": code, "error_description": err.Error()})
@@ -179,7 +179,7 @@ func (h *Handlers) OIDCLogout(c *gin.Context) {
state = c.PostForm("state")
}
- c.SetCookie(middleware.CookieName, "", -1, "/", "", false, true)
+ c.SetCookie(auth.CookieName, "", -1, "/", "", false, true)
if h.OIDC == nil {
c.Redirect(http.StatusFound, "/")
diff --git a/routers/api/report.go b/routers/api/report.go
index 8e0a49f..294dbc3 100644
--- a/routers/api/report.go
+++ b/routers/api/report.go
@@ -1,4 +1,4 @@
-package handler
+package api
import (
"net/http"
@@ -6,8 +6,8 @@ import (
"strings"
"github.com/gin-gonic/gin"
- "git.iioio.com/freefire/jiang13-forum/model"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/models"
+ "git.iioio.com/freefire/jiang13-forum/services"
)
// APICreatePostReport 举报帖子
@@ -53,7 +53,7 @@ func (h *Handlers) APIAdminReports(c *gin.Context) {
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
size, _ := strconv.Atoi(c.DefaultQuery("size", "20"))
status := c.DefaultQuery("status", "pending")
- list, total, err := h.Report.ListAdmin(service.ReportListQuery{
+ list, total, err := h.Report.ListAdmin(services.ReportListQuery{
Status: status,
Page: page,
Size: size,
@@ -84,7 +84,7 @@ func (h *Handlers) APIAdminHandleReport(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
return
}
- rep, err := h.Report.Handle(service.HandleReportInput{
+ rep, err := h.Report.Handle(services.HandleReportInput{
ReportID: uint(id),
HandlerID: h.currentUserID(c),
Action: req.Action,
@@ -101,11 +101,11 @@ func (h *Handlers) APIAdminHandleReport(c *gin.Context) {
// APIAdminApprovePost 通过帖子审核
func (h *Handlers) APIAdminApprovePost(c *gin.Context) {
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
- if err := h.Post.SetStatus(uint(id), model.ContentStatusPublished); err != nil {
+ if err := h.Post.SetStatus(uint(id), models.ContentStatusPublished); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
- c.JSON(http.StatusOK, gin.H{"message": "帖子已通过审核", "status": model.ContentStatusPublished})
+ c.JSON(http.StatusOK, gin.H{"message": "帖子已通过审核", "status": models.ContentStatusPublished})
}
// APIAdminRejectPost 拒绝帖子并私信通知作者（标记为 rejected，不进回收站）
@@ -133,7 +133,7 @@ func (h *Handlers) APIAdminRejectPost(c *gin.Context) {
title := post.Title
postID := post.ID
- if err := h.Post.SetStatus(postID, model.ContentStatusRejected); err != nil {
+ if err := h.Post.SetStatus(postID, models.ContentStatusRejected); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
@@ -142,8 +142,8 @@ func (h *Handlers) APIAdminRejectPost(c *gin.Context) {
_, msgErr := h.Message.SendSystem(
authorID,
"帖子《"+title+"》未通过审核",
- service.FormatRejectContent(title, postID, reason),
- model.MessageKindReject,
+ services.FormatRejectContent(title, postID, reason),
+ models.MessageKindReject,
&pid,
nil,
)
@@ -151,13 +151,13 @@ func (h *Handlers) APIAdminRejectPost(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{
"message": "帖子已拒绝，但私信通知失败：" + msgErr.Error(),
"notified": false,
- "status": model.ContentStatusRejected,
+ "status": models.ContentStatusRejected,
})
return
}
c.JSON(http.StatusOK, gin.H{
"message": "已拒绝该帖并私信通知作者",
"notified": true,
- "status": model.ContentStatusRejected,
+ "status": models.ContentStatusRejected,
})
}
diff --git a/routers/api/seo.go b/routers/api/seo.go
index 3e789e7..30dc413 100644
--- a/routers/api/seo.go
+++ b/routers/api/seo.go
@@ -1,4 +1,4 @@
-package handler
+package api
import (
"encoding/json"
@@ -11,9 +11,9 @@ import (
"time"
"github.com/gin-gonic/gin"
- "git.iioio.com/freefire/jiang13-forum/embed_static"
- "git.iioio.com/freefire/jiang13-forum/model"
- "git.iioio.com/freefire/jiang13-forum/service"
+ "git.iioio.com/freefire/jiang13-forum/modules/seo"
+ "git.iioio.com/freefire/jiang13-forum/models"
+ "git.iioio.com/freefire/jiang13-forum/services"
)
var (
@@ -60,7 +60,7 @@ func (h *Handlers) SitemapXML(c *gin.Context) {
now := time.Now().UTC()
permalink := h.Settings.Permalink()
- urls := []service.SitemapURL{
+ urls := []services.SitemapURL{
{Loc: base + "/", LastMod: now, ChangeFreq: "hourly", Priority: "1.0"},
{Loc: base + "/projects", LastMod: now, ChangeFreq: "daily", Priority: "0.6"},
{Loc: base + "/links", LastMod: now, ChangeFreq: "weekly", Priority: "0.6"},
@@ -68,8 +68,8 @@ func (h *Handlers) SitemapXML(c *gin.Context) {
if boards, err := h.Board.List(); err == nil {
for _, board := range boards {
- urls = append(urls, service.SitemapURL{
- Loc: base + service.QueryBoardHome(board.ID, permalink),
+ urls = append(urls, services.SitemapURL{
+ Loc: base + services.QueryBoardHome(board.ID, permalink),
LastMod: board.UpdatedAt.UTC(),
ChangeFreq: "daily",
Priority: "0.7",
@@ -83,7 +83,7 @@ func (h *Handlers) SitemapXML(c *gin.Context) {
if lm.IsZero() {
lm = p.CreatedAt
}
- urls = append(urls, service.SitemapURL{
+ urls = append(urls, services.SitemapURL{
Loc: base + permalink.PostPath(p.ID),
LastMod: lm.UTC(),
ChangeFreq: "weekly",
@@ -94,7 +94,7 @@ func (h *Handlers) SitemapXML(c *gin.Context) {
if users, e2 := h.User.ListSitemap(seoSitemapLimit); e2 == nil {
for _, u := range users {
- urls = append(urls, service.SitemapURL{
+ urls = append(urls, services.SitemapURL{
Loc: base + permalink.UserPath(u.ID),
LastMod: u.UpdatedAt.UTC(),
ChangeFreq: "weekly",
@@ -109,7 +109,7 @@ func (h *Handlers) SitemapXML(c *gin.Context) {
if lm.IsZero() {
lm = p.CreatedAt
}
- urls = append(urls, service.SitemapURL{
+ urls = append(urls, services.SitemapURL{
Loc: base + permalink.PagePath(p.Slug),
LastMod: lm.UTC(),
ChangeFreq: "monthly",
@@ -160,14 +160,14 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
if siteName == "" {
siteName = "姜十三论坛"
}
- defaultImage := service.AbsoluteURL(base, brand.DefaultShareImage())
+ defaultImage := services.AbsoluteURL(base, brand.DefaultShareImage())
siteKeywords := brand.MetaKeywords()
permalink := h.Settings.Permalink()
// 旧版 /?board=id → 规范板块路径
if path == "/" || path == "" {
if boardID, err := strconv.ParseUint(c.Query("board"), 10, 64); err == nil && boardID > 0 {
- target := service.QueryBoardHome(uint(boardID), permalink)
+ target := services.QueryBoardHome(uint(boardID), permalink)
if q := c.Request.URL.RawQuery; q != "" {
// 保留 sort/keyword 等 query，去掉 board
vals := c.Request.URL.Query()
@@ -181,7 +181,7 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
}
}
- isBot := service.IsSEOCrawler(c.Request.UserAgent())
+ isBot := services.IsSEOCrawler(c.Request.UserAgent())
if isBot {
c.Header("Vary", "User-Agent")
}
@@ -201,11 +201,11 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
if desc == "" {
desc = brand.MetaDescription()
}
- meta := attachSiteSEO(&embed_static.SPAPageMeta{
+ meta := attachSiteSEO(&seo.PageMeta{
Title: pageTitle(board.Name, siteName),
- Description: service.TruncateRunes(desc, seoDescMax),
- Keywords: service.JoinSEOKeywords(board.Name, siteKeywords),
- Canonical: service.AbsoluteURL(base, bm.Canonical),
+ Description: services.TruncateRunes(desc, seoDescMax),
+ Keywords: services.JoinSEOKeywords(board.Name, siteKeywords),
+ Canonical: services.AbsoluteURL(base, bm.Canonical),
OGType: "website",
OGImage: defaultImage,
}, siteName, siteKeywords)
@@ -213,7 +213,7 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
c.Data(http.StatusOK, "text/html; charset=utf-8", []byte(h.botBoardHTML(meta, *board)))
return
}
- embed_static.ServeSPAWithMeta(c, meta)
+ servePendingSSR(c, meta.Title, `<p>板块页 SSR 迁移中，请先从 <a href="/">首页</a> 浏览。</p>`)
return
}
@@ -224,16 +224,16 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
return
}
post, err := h.Post.FindByID(pm.ID)
- if err != nil || !service.CanViewPost(post, h.currentUserID(c), h.isAdmin(c)) {
+ if err != nil || !services.CanViewPost(post, h.currentUserID(c), h.isAdmin(c)) {
h.serveNotFound(c, base, siteName, siteKeywords, path, isBot)
return
}
- postKeywords := service.JoinSEOKeywords(post.Board.Name, siteKeywords)
+ postKeywords := services.JoinSEOKeywords(post.Board.Name, siteKeywords)
if isBot {
c.Data(http.StatusOK, "text/html; charset=utf-8", []byte(h.botPostHTML(base, siteName, defaultImage, postKeywords, post)))
return
}
- embed_static.ServeSPAWithMeta(c, attachSiteSEO(h.postPageMeta(base, siteName, defaultImage, post), siteName, postKeywords))
+ servePendingSSR(c, pageTitle(post.Title, siteName), `<p>帖子详情 SSR 迁移中，请先从 <a href="/">首页</a> 返回。</p>`)
return
}
@@ -252,7 +252,7 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
c.Data(http.StatusOK, "text/html; charset=utf-8", []byte(h.botUserHTML(base, siteName, defaultImage, siteKeywords, user)))
return
}
- embed_static.ServeSPAWithMeta(c, attachSiteSEO(h.userPageMeta(base, siteName, defaultImage, user), siteName, siteKeywords))
+ servePendingSSR(c, pageTitle(user.Nickname, siteName), `<p>用户主页 SSR 迁移中，请先从 <a href="/">首页</a> 返回。</p>`)
return
}
@@ -267,12 +267,12 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
h.serveNotFound(c, base, siteName, siteKeywords, path, isBot)
return
}
- desc := service.ExcerptFromHTML(page.Content, seoDescMax)
- meta := attachSiteSEO(&embed_static.SPAPageMeta{
+ desc := services.ExcerptFromHTML(page.Content, seoDescMax)
+ meta := attachSiteSEO(&seo.PageMeta{
Title: pageTitle(page.Title, siteName),
Description: desc,
- Keywords: service.JoinSEOKeywords(page.Title, siteKeywords),
- Canonical: service.AbsoluteURL(base, pg.Canonical),
+ Keywords: services.JoinSEOKeywords(page.Title, siteKeywords),
+ Canonical: services.AbsoluteURL(base, pg.Canonical),
OGType: "article",
OGImage: defaultImage,
}, siteName, siteKeywords)
@@ -281,7 +281,7 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
c.Data(http.StatusOK, "text/html; charset=utf-8", []byte(renderBotHTML(meta, body)))
return
}
- embed_static.ServeSPAWithMeta(c, meta)
+ servePendingSSR(c, meta.Title, page.Content)
return
}
@@ -291,13 +291,23 @@ func (h *Handlers) ServePublicSPA(c *gin.Context) {
return
}
- // 其余已知路由：SPA + head meta；首页对爬虫额外返回可读正文
+ // 其余已知路由：爬虫可读首页；用户走占位页（首页本身已由 routers/web SSR）
meta := h.buildSPAPageMeta(c, path, brand, base, siteName, defaultImage)
if isBot && (path == "/" || path == "") {
c.Data(http.StatusOK, "text/html; charset=utf-8", []byte(h.botHomeHTML(meta, brand)))
return
}
- embed_static.ServeSPAWithMeta(c, meta)
+ servePendingSSR(c, meta.Title, `<p>该页面 SSR 迁移中。<a href="/">返回首页</a></p>`)
+}
+
+func servePendingSSR(c *gin.Context, title, bodyHTML string) {
+ if strings.TrimSpace(title) == "" {
+ title = "姜十三论坛"
+ }
+ page := fmt.Sprintf(`<!DOCTYPE html><html lang="zh-CN"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width, initial-scale=1.0"/><title>%s%s