diff --git a/.env.example b/.env.example
index dea8a32..cf88bd4 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,3 @@
-VITE_API_URL=http://localhost:8000/api/v1
+VITE_API_URL=http://localhost:3000
 VITE_AMAP_KEY=
 VITE_SITE_URL=http://localhost:5173
diff --git a/API.md b/API.md
new file mode 100644
index 0000000..986c55f
--- /dev/null
+++ b/API.md
@@ -0,0 +1,1239 @@
+# OpenCloud API 前端开发文档
+
+> **读者**：前端开发者。本文档覆盖 API 的全部端点：请求参数、响应结构、可能出现的错误与已知坑点。
+>
+> **事实来源**：本文档的字段名、约束与错误消息以 `src/schema/*.ts`（zod 校验定义）与 `src/router/*.ts`（路由实现）为最终依据整理。若文档与代码不一致，以代码为准。
+>
+> **重要免责**：错误消息文案（`error` 字段的中文内容）可能随时调整。**前端逻辑只能依赖 HTTP 状态码，严禁匹配错误消息字符串**。文档中列出消息原文仅供调试对照。
+
+## 目录
+
+1. 通用约定
+2. 错误处理与已知不一致
+3. 认证
+4. 端点 · 认证 `/auth`
+5. 端点 · 云图 `/cloud`
+6. 端点 · 个人资料 `/profile`
+7. 端点 · 信息 `/info`
+8. 端点 · 管理 `/admin`
+9. 端点 · 系统
+
+---
+
+## 1. 通用约定
+
+### 1.1 Base URL
+
+| 环境 | 地址 |
+|---|---|
+| 本地开发 | `http://localhost:3000`（`vc dev` 启动） |
+| 生产 | 以部署地址为准 |
+
+除 `/image` 成功响应直接返回图片字节外，响应均为 `application/json`（个别异常情形返回纯文本，见 2.2）。所有响应携带两个调试响应头：
+
+- `X-Request-Id`：请求唯一 ID，反馈问题时请附上
+- `X-Response-Time`：服务端处理耗时，如 `12ms`
+
+### 1.2 命名与格式
+
+- 请求与响应字段一律 **snake_case**（如 `cloud_id`、`page_size`、`received_like_count`）
+- 日期时间一律为 **ISO 8601 字符串**（如 `2026-08-15T08:30:00.000Z`），可空的日期字段值为 `null`。唯一的例外见 2.3 第 5 条
+- UUID 字段为标准 UUID 字符串
+
+### 1.3 响应形态
+
+响应**没有统一包装**，分两种形态：
+
+| 场景 | 形态 | 示例 |
+|---|---|---|
+| 写操作成功（POST/PATCH/DELETE 的动作类端点） | 信封对象 | `{ "status_code": 200, "message": "删除成功" }` |
+| 读操作成功（GET 及登录） | 裸数据 | 单资源为对象、列表为**数组**、登录为 `{ "access_token" }` |
+
+### 1.4 分页
+
+所有分页端点使用相同的 query 参数：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `page` | int | 否 | ≥ 1，默认 `1` | 页码 |
+| `page_size` | int | 否 | 1–100，默认 `50` | 每页数量 |
+
+⚠️ **响应不返回总数**，也没有 `has_more` 字段。判断「是否还有下一页」只能依靠「返回数组长度 < `page_size`」。超出数据范围的页返回 `200` + 空数组 `[]`，不是 404。
+
+云图列表排序为 `uploaded_at` 倒序（同刻按 `id` 倒序）；点赞列表按点赞时间倒序。
+
+### 1.5 共享数据模型
+
+以下模型在多个端点复用，端点章节中直接引用名称。
+
+**CloudInfo（云图）**
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `id` | uuid | 云图 ID |
+| `owner` | object | 上传者：`{ id: uuid, name: string }` |
+| `type` | object | 云类型：`{ id: int, name: string, genus: string\|null, icon_id: uuid\|null, rarity: int, description: string }` |
+| `latitude` | number | 纬度，-90 ~ 90 |
+| `longitude` | number | 经度，-180 ~ 180 |
+| `description` | string | 描述，可能为空字符串 |
+| `captured_at` | string\|null | 拍摄时间（ISO 8601） |
+| `uploaded_at` | string | 上传时间（ISO 8601） |
+| `updated_at` | string | 最后更新时间（ISO 8601） |
+| `received_like_count` | int | 收到点赞数 |
+| `status` | enum | 审核状态：`pending`（待审核）/ `approved`（已通过）/ `rejected`（已驳回） |
+| `is_hidden` | boolean | 是否隐藏（上传者控制，与审核状态独立） |
+
+**公开可见规则**：未登录访客与无关用户只能看到 `status === "approved"` 且 `is_hidden === false` 的云图；上传者本人与 admin 不受限。
+
+**UserProfile（用户）**
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `id` | uuid | 用户 ID |
+| `name` | string | 用户名 |
+| `email` | string | 邮箱（注意 2.3 第 7 条的暴露范围问题） |
+| `avatar_id` | uuid\|null | 头像 ID（当前恒为 `null`，头像功能未上线） |
+| `cloud_count` | int | 云图数（该用户上传的云图总数） |
+| `received_like_count` | int | 收到点赞数（名下云图获赞总和） |
+| `last_online` | string\|null | 最后在线时间（ISO 8601） |
+| `role` | enum | `user` / `admin` |
+| `is_disabled` | boolean | 是否被禁用 |
+| `created_at` | string | 注册时间（ISO 8601） |
+
+**CloudTypeInfo（云类型）**
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `id` | int | 云类型 ID |
+| `name` | string | 名称，如「积云」 |
+| `genus` | string\|null | 属（拉丁名），如 `Cumulus` |
+| `icon_id` | uuid\|null | 图标 ID |
+| `rarity` | int | 稀有度 |
+| `description` | string | 描述 |
+| `created_at` | string | 创建时间。⚠️ 列表与详情端点的格式不一致，见 2.3 第 5 条 |
+
+### 1.6 上传约束（`POST /cloud`）
+
+- 请求体总大小上限 **21 MiB**，超出返回 413
+- 图片文件上限 **20 MB**；仅支持 **JPEG / PNG / WebP**；**不支持动图**（含动态 WebP、GIF）
+- 图片分辨率过高会被拒绝（像素上限）
+- multipart 表单字段均为字符串，注意 `is_hidden` 的编码规则（见 5.7）
+
+---
+
+## 2. 错误处理与已知不一致
+
+### 2.1 两种错误响应形状
+
+本 API 存在**两种**错误响应形状，前端必须分别处理：
+
+**① 业务错误**（绝大多数错误）——ErrorMessage 信封：
+
+```json
+{
+    "status_code": 404,
+    "error": "未找到图片"
+}
+```
+
+**② 参数校验失败（400）**——zod 原始结构，**不是**上面的信封：
+
+```json
+{
+    "success": false,
+    "error": {
+        "name": "ZodError",
+        "message": "[{\"code\":\"invalid_format\",\"path\":[\"email\"],\"message\":\"Invalid email address\"}]"
+    }
+}
+```
+
+注意 `error.message` 是一个 **JSON 字符串**（issues 数组的序列化结果），需要二次 `JSON.parse` 才能拿到字段级错误明细；每个 issue 含 `path`（出错字段路径）、`code`、`message`。不需要逐字段提示时，直接弹「参数错误」即可。
+
+**判别方式**：响应体含 `success: false` → 形状②；含 `status_code` → 形状①。
+
+### 2.2 状态码总表
+
+| 状态码 | 含义 | 前端通用动作 |
+|---|---|---|
+| 200 | 成功 | — |
+| 201 | 创建成功（注册、上传云图） | — |
+| 304 | 图片 ETag 未变化，无响应 body | 继续使用本地缓存 |
+| 400 | 参数校验失败（形状②），或业务规则拒绝（形状①，如「新密码不能与当前密码相同」） | 检查参数；形状②可解析 `error.message` 定位字段 |
+| 401 | 未认证：未携带 token，或 token 无效/过期/已失效 | 清除本地登录态，跳转登录页 |
+| 403 | 已认证但无权限：角色不足、邮箱未确认、帐号被禁用、越权访问他人资源 | 按消息场景提示 |
+| 404 | 资源不存在（形状①）；**也可能是纯文本**（见下方警告） | 区分 content-type 后处理 |
+| 405 | HTTP 方法不受端点支持 | 读取 `Allow` 响应头 |
+| 409 | 唯一性冲突：邮箱/用户名已被占用 | 提示用户更换 |
+| 413 | 上传请求体超过 21 MiB | 提示压缩图片后重试 |
+| 500 | 服务器内部错误 | 提示稍后重试，反馈时附 `X-Request-Id` |
+| 503 | 图片存储服务暂时不可用 | 稍后重试，反馈时附 `X-Request-Id` |
+
+⚠️ **404 有两种 body**：业务 404（资源不存在）是 JSON 信封；但「未实现的占位端点」和「个别端点的数据库异常」返回的是 **纯文本 `404 Not Found`**（`text/plain`），见 2.3 第 2 条。前端解析 404 响应前必须先判断 content-type。
+
+### 2.3 ⚠️ 已知不一致清单
+
+以下是文档写作时核实的现状描述，**未来可能修复**。前端如需为之写防御代码，请做好移除准备。
+
+1. **两种错误形状并存**：400 校验错误不是业务错误信封（见 2.1）。
+2. **部分 404 是纯文本而非 JSON**，来源有三：(a) 未实现的占位端点（各章已标注）；(b) `GET /profile/me` 与 `GET /admin/users` 的数据库异常会从空 `catch` 落到纯文本 404；(c) 未匹配任何路由的路径。注册与邮箱确认失败始终返回 JSON 信封。
+3. **静默续签只写 Cookie**：token 到期前的自动续签仅通过 `Set-Cookie` 下发新 token（见 3.4）。使用 Bearer header 模式的客户端**拿不到新 token**，30 分钟后必然 401，需重新登录。
+4. **`POST /admin/user` 是假端点**：它原样回显请求体（**含明文密码**），并不创建用户。
+5. **`GET /info/cloudtype`（列表）的 `created_at` 格式与其他端点不同**：是 PostgreSQL 原生字符串（如 `2026-08-15 08:30:00.123456+00`），而非 ISO 8601（`2026-08-15T08:30:00.000Z`）。详情端点 `/info/cloudtype/:id` 及其他所有端点均为 ISO 8601。前端解析该字段时需兼容两种格式。
+6. **用户名/邮箱长度不在 API 层校验**：数据库限制用户名 ≤ 16 字符、邮箱 ≤ 64 字符，但 zod 校验不拦截。超长注册与超长改名（`PATCH /profile/me`）会返回 JSON 500。前端应自行限制输入长度。
+7. **`GET /profile/:user_id` 向任意登录用户暴露对方邮箱**：任何登录用户都能查到任意用户的 `email`。前端展示他人资料时不应展示邮箱，也不应假设该接口未来仍返回邮箱。
+8. **用户名唯一性的大小写规则不一致**：注册时的查重是大小写不敏感的（`Alice`/`alice` 视为重复），但数据库唯一约束与 `PATCH /profile/me` 改名是大小写敏感的（可改成仅大小写不同的名字）。
+
+---
+
+## 3. 认证
+
+### 3.1 机制概览
+
+- JWT（HS256），有效期 **30 分钟**
+- 获取方式：`POST /auth/login` 成功后在响应体返回 `access_token`，**同时**通过 `Set-Cookie` 写入 HttpOnly Cookie
+- 受保护端点接受两种携带方式（服务端优先读 header）：
+  1. 请求头 `Authorization: Bearer <access_token>`
+  2. Cookie `token=<jwt>`（`HttpOnly; SameSite=Strict; Path=/; Max-Age=1800`；非开发/测试环境附加 `Secure`）
+
+### 3.2 Bearer 还是 Cookie？
+
+| 模式 | 适用 | 注意事项 |
+|---|---|---|
+| Cookie | 浏览器前端（推荐） | 登录后浏览器自动携带；`fetch` 需设 `credentials: "include"`；HttpOnly 使 JS 无法读取 token，天然防 XSS 窃取；可享受静默续签 |
+| Bearer | 非浏览器客户端（App、脚本） | 自行存储 `access_token` 并注入 header；**无法静默续签**（2.3 第 3 条），30 分钟后需重新登录 |
+
+### 3.3 CORS
+
+- 服务端仅放行**单个** origin（环境变量 `CORS_ORIGIN`，本地默认应为 `http://localhost:5173`），且 `credentials: true`
+- 前端本地开发的服务端口/origin 必须与后端配置**完全一致**（协议、主机、端口），否则 Cookie 模式的请求会被浏览器拦截
+- 放行的请求头：`Content-Type`、`Authorization`
+- 私有图片通过 `<img src>` 直接加载时依赖 Cookie；生产环境前端与 API 必须位于同一 site（例如 `app.example.com` 与 `api.example.com`），否则 `SameSite=Strict` Cookie 不会随图片请求发送
+
+### 3.4 有效期、续签与失效
+
+- token 有效期 30 分钟（Cookie 的 `Max-Age` 同为 1800 秒）
+- **静默续签**：携带剩余有效期 ≤ 300 秒的 token 访问受保护端点时，服务端会在响应中**追加 `Set-Cookie` 写入新 token**。Cookie 模式下浏览器自动替换，前端无感知；Bearer 模式收不到新 token
+- 续签不适用的路径：`POST /auth/logout`、`PATCH /auth/password`
+- `/image` 请求只验证身份，不触发静默续签，避免一个页面的并发图片请求重复写 Cookie
+- 认证中间件每次请求都会重新检查用户仍已确认邮箱且未被管理员禁用；任一条件不满足时，已有 JWT 也会被拒绝
+- **立即失效**的情况：调用 `/auth/logout`、调用 `PATCH /auth/password` 改密、通过 `/auth/reset-password` 重置密码、用户被禁用，以及管理员修改了该用户的角色或密码（`PATCH /admin/users/:user_id` 见 8.3、`PATCH /admin/users/:user_id/password` 见 8.4）。除「用户被禁用」由中间件每次请求重新校验外，其余情况都会递增 `tokenVersion`，使该用户**所有已签发的 token 全部作废**（包括其他设备上的）；用户自己改密与密码重置成功时还会写入过期 Cookie
+
+### 3.5 认证相关错误消息对照
+
+| 状态码 | 消息原文 | 场景 |
+|---|---|---|
+| 401 | `未登录` | 受保护端点未携带任何 token |
+| 401 | `Token 无效或已过期` | token 签名无效、过期、已被吊销（登出、改密或密码重置后），或用户不再同时满足「邮箱已确认且未禁用」 |
+| 403 | `权限不足` | 已登录但角色不满足（如非 admin 访问 `/admin`） |
+
+注意「帐号被禁用」在**登录时**报 403「帐号已被禁用」，但已登录后被禁用，后续请求报的是 401「Token 无效或已过期」。
+
+---
+
+## 4. 端点 · 认证 `/auth`
+
+### 4.1 `POST /auth/register` — 注册
+
+- **认证**：无（公开）
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `name` | string | 是 | ⚠️ 数据库限 ≤ 16 字符，API 层不校验（2.3 第 6 条） | 用户名，大小写不敏感查重 |
+| `email` | string | 是 | 合法邮箱格式；⚠️ 数据库限 ≤ 64 字符 | 服务端去除首尾空白并转为小写后存储 |
+| `password` | string | 是 | 无强度校验 | 密码 |
+
+```json
+{
+    "name": "cloudwatcher",
+    "email": "watcher@example.com",
+    "password": "s3cret-password"
+}
+```
+
+**成功响应**：`201`
+
+```json
+{
+    "status_code": 201,
+    "message": "注册成功，请查收邮件并确认邮箱",
+    "email_sent": true
+}
+```
+
+数据库提交成功但邮件暂时未发送时仍返回 `201`，`email_sent` 为 `false`，消息会提示稍后使用重发验证流程。用户、密码凭据和 24 小时有效的确认记录已经保留，不应重试注册。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 参数校验失败 | zod 形状（2.1） | 检查字段 |
+| 409 | 已确认邮箱重复注册（大小写不敏感） | `该邮箱已被注册` | 提示直接登录 |
+| 409 | 未确认邮箱重复注册 | `该邮箱已被注册，请使用重发验证流程` | 引导至重发验证流程，不会覆盖原用户名或密码 |
+| 409 | 用户名已使用（大小写不敏感） | `该用户名已被使用` | 提示换用户名 |
+| 500 | 数据库、密码散列或服务端配置异常 | `注册失败` | 稍后重试；若此前已收到 201，不要重复注册 |
+
+**注意事项**：
+
+- 新用户的 `is_disabled` 为 `false`，`email_verified_at` 为空；两个状态相互独立。注册后必须先确认邮箱，再调用 `/auth/login`
+- 注册响应**不返回 token、不写 Cookie**
+- 确认邮件由 `Opencloud <opencloud@catpl.top>` 发出，同时包含 `https://cloud.catpl.top/verify-email?token=...` 链接和原始 token 备用文本。数据库仅保存使用 `JWT_SECRET` 生成的 HMAC 摘要
+- ⚠️ 并发注册（同一邮箱/用户名几乎同时提交）命中数据库唯一约束时，冲突消息文案与上方表格不同（邮箱冲突会返回 `该邮箱已被注册；若尚未验证，请使用重发验证流程`）。按本文档免责声明，前端仍只依据状态码 `409` 处理
+
+### 4.2 `POST /auth/resend-confirmation` — 重发确认邮件
+
+- **认证**：无（公开）
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 说明 |
+|---|---|---|---|
+| `email` | string | 是 | 与注册、登录相同：服务端去除首尾空白并转为小写；不接受旧字段 `user_email` |
+
+```json
+{
+    "email": "watcher@example.com"
+}
+```
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "如果该邮箱符合条件，我们将发送验证邮件"
+}
+```
+
+未知邮箱、已确认邮箱、被管理员禁用、处于 60 秒冷却期、符合发送条件以及邮件供应商失败，都会收到完全相同的状态码和响应体。前端不能根据该响应判断邮件是否实际发送，也不应显示「邮箱存在」之类的提示。
+
+只有尚未确认、未被管理员禁用且不在冷却期内的用户会触发邮件发送。成功签发新 token 后，同一用户此前未消费的邮箱确认 token 全部失效；新 token 仍有 24 小时有效期，邮件内容与注册邮件相同。已消费记录会保留作为审计信息。
+
+重叠请求会按用户串行处理，至多签发一个可用 token。数据库签发或 Resend 失败不会改变上述公共响应。
+
+**错误**：请求体校验失败返回 `400` zod 形状（2.1）。
+
+### 4.3 `POST /auth/confirm-email` — 确认邮箱
+
+- **认证**：无（公开）
+
+前端从确认链接读取 `token`，再提交：
+
+```json
+{
+    "token": "0123456789abcdef0123456789abcdef"
+}
+```
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "邮箱确认成功，请重新登录"
+}
+```
+
+确认会在一个数据库事务中消费未过期、未消费且用途为 `email_confirmation` 的记录，并写入用户的邮箱确认时间。它不会签发 JWT、不会写认证 Cookie，也绝不修改管理员禁用状态。
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | token 未知、过期、已消费，或来自其他用途 | `确认链接无效或已过期` | 统一提示链接无效，并引导重发 |
+| 500 | 数据库或服务端配置异常 | `确认邮箱失败` | 稍后重试 |
+
+### 4.4 `POST /auth/login` — 登录
+
+- **认证**：无（公开）
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 说明 |
+|---|---|---|---|
+| `email` | string | 是 | 服务端去除首尾空白、转为小写后匹配 |
+| `password` | string | 是 | 密码 |
+
+```json
+{
+    "email": "watcher@example.com",
+    "password": "s3cret-password"
+}
+```
+
+**成功响应**：`200`，同时写入认证 Cookie（见 3.1）
+
+```json
+{
+    "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9..."
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 参数校验失败 | zod 形状（2.1） | 检查字段 |
+| 401 | 邮箱不存在或密码错误（两者共用，防枚举） | `邮箱或密码错误` | 统一提示「邮箱或密码错误」 |
+| 403 | 帐号被管理员禁用 | `帐号已被禁用` | 提示联系管理员 |
+| 403 | 密码正确但邮箱尚未确认 | `邮箱尚未验证` | 引导至重发验证流程 |
+| 500 | 服务端异常 | `登录失败` | 稍后重试 |
+
+### 4.5 `POST /auth/logout` — 登出
+
+- **认证**：需登录（任意角色）
+- **请求体**：无
+
+**成功响应**：`200`，同时写入过期 Cookie
+
+```json
+{
+    "status_code": 200,
+    "message": "已登出"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 401 | 未登录 / token 失效 | 见 3.5 | 本地直接清理登录态即可 |
+| 500 | 数据库异常 | `连接数据库发生错误，登出失败` | 提示重试；⚠️ 此时服务端 token 可能仍有效 |
+
+**注意事项**：登出会使该用户**所有设备**的 token 立即失效（`tokenVersion` 递增），不只是当前会话。
+
+### 4.6 `POST /auth/forgot-password` — 申请重置密码
+
+- **认证**：无（公开）
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 说明 |
+|---|---|---|---|
+| `email` | string | 是 | 服务端去除首尾空白并转为小写；不接受旧字段 `user_email` |
+
+```json
+{
+    "email": "watcher@example.com"
+}
+```
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "如果该邮箱符合条件，我们将发送密码重置邮件"
+}
+```
+
+未知邮箱、邮箱未确认、被管理员禁用、处于 60 秒冷却期、符合发送条件以及邮件供应商失败，都会收到完全相同的状态码和响应体。只有邮箱已确认、未被禁用且不在冷却期内的用户会触发邮件发送。
+
+新签发的 `password_reset` token 有效期为 30 分钟，并使此前未消费的密码重置 token 失效；它与邮箱确认 token 用 purpose 隔离。邮件由 `Opencloud <opencloud@catpl.top>` 发出，链接到 `https://cloud.catpl.top/reset-password?email=...&token=...`。数据库和 Resend 失败不改变公共响应。
+
+**错误**：请求体校验失败返回 `400` zod 形状（2.1）。没有 `/auth/forget-password` 兼容路径。
+
+### 4.7 `POST /auth/reset-password` — 重置密码
+
+- **认证**：无（公开）
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 说明 |
+|---|---|---|---|
+| `email` | string | 是 | 邮件链接中的邮箱；服务端再次规范化 |
+| `token` | string | 是 | 邮件链接中的原始 token |
+| `new_password` | string | 是 | 新密码；不能与当前密码相同，不额外扩大密码策略 |
+
+```json
+{
+    "email": "watcher@example.com",
+    "token": "0123456789abcdef0123456789abcdef",
+    "new_password": "new-s3cret-password"
+}
+```
+
+**成功响应**：`200`，同时写入过期认证 Cookie
+
+```json
+{
+    "status_code": 200,
+    "message": "密码重置成功，请使用新密码重新登录"
+}
+```
+
+成功时，服务端在同一数据库事务中消费 token、更新密码哈希和凭据更新时间，并递增 `tokenVersion`。此前在所有设备签发的 JWT 随即失效；响应不会签发新 JWT，用户必须重新登录。
+
+token 必须同时匹配规范化邮箱、HMAC 摘要、`password_reset` purpose、有效期、未消费状态和目标用户；用户在消费时仍须邮箱已确认且未被管理员禁用。重置不会修改邮箱确认时间或管理员禁用状态。
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | token 未知、过期、已消费、已被替换、用途错误、邮箱不匹配，或用户不再符合状态要求 | `重置链接无效或已过期` | 统一提示链接无效，重新申请 |
+| 400 | 新密码与当前密码相同 | `新密码不能与当前密码相同` | 要求输入不同密码 |
+| 500 | 数据库或服务端配置异常 | `重置密码失败` | 稍后重试 |
+
+### 4.8 `PATCH /auth/password` — 修改密码
+
+- **认证**：需登录（任意角色）
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 说明 |
+|---|---|---|---|
+| `current_password` | string | 是 | 当前密码 |
+| `new_password` | string | 是 | 新密码，无强度校验 |
+
+```json
+{
+    "current_password": "s3cret-password",
+    "new_password": "new-s3cret-password"
+}
+```
+
+**成功响应**：`200`，同时写入过期 Cookie
+
+```json
+{
+    "status_code": 200,
+    "message": "密码修改成功，请重新登录"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 新旧密码相同 | `新密码不能与当前密码相同` | 表单前置校验可避免 |
+| 400 | 参数校验失败 | zod 形状（2.1） | 检查字段 |
+| 401 | 当前密码错误 | `当前密码错误` | 提示重新输入 |
+| 401 | 未登录 / token 失效 | 见 3.5 | 跳登录 |
+| 404 | 用户无凭据记录（数据异常） | `未找到用户凭据` | 反馈后端，附 `X-Request-Id` |
+| 500 | 服务端异常 | `修改密码时发生错误` | 稍后重试 |
+
+**注意事项**：改密成功后**所有已签发 token 立即失效**（含当前使用的这个），前端必须清理登录态并跳转登录页。
+
+---
+
+## 5. 端点 · 云图 `/cloud`
+
+### 5.1 `GET /cloud` — 云图列表（公开搜索）
+
+- **认证**：无（公开）；仅返回公开可见（`approved` 且未隐藏）的云图
+
+**Query 参数**（在分页参数 1.4 基础上）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `page` | int | 否 | 默认 `1` | 见 1.4 |
+| `page_size` | int | 否 | 默认 `50`，最大 `100` | 见 1.4 |
+| `filter` | enum | 否 | `type` / `owner`，默认 `type` | 搜索维度 |
+| `value` | string | 否 | 默认 `""`（空 = 不过滤） | 搜索词 |
+
+搜索逻辑：
+
+- `value` 为空 → 不过滤，返回全部公开云图
+- `filter=owner`，**或** `value` 以 `@` 开头 → 按**用户名精确匹配**搜索该用户的公开云图（`@` 前缀会被去掉）
+- 其他情况 → 按**云类型名称精确匹配**搜索
+- 均为精确匹配，不支持模糊搜索
+
+**成功响应**：`200`，CloudInfo 数组（字段见 1.5）
+
+```json
+[
+    {
+        "id": "3f8a2c1e-7b9d-4e5f-a1c2-9d8e7f6a5b4c",
+        "owner": {
+            "id": "a1b2c3d4-e5f6-4a5b-8c9d-0e1f2a3b4c5d",
+            "name": "cloudwatcher"
+        },
+        "type": {
+            "id": 3,
+            "name": "积云",
+            "genus": "Cumulus",
+            "icon_id": null,
+            "rarity": 2,
+            "description": "底部平坦、顶部蓬松的白色云块"
+        },
+        "latitude": 39.9042,
+        "longitude": 116.4074,
+        "description": "午后拍到的淡积云",
+        "captured_at": "2026-08-14T07:20:00.000Z",
+        "uploaded_at": "2026-08-15T08:30:00.000Z",
+        "updated_at": "2026-08-15T08:30:00.000Z",
+        "received_like_count": 12,
+        "status": "approved",
+        "is_hidden": false
+    }
+]
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 参数校验失败（如 `page_size=0`） | zod 形状（2.1） | 检查参数 |
+| 404 | 按用户名搜索但该用户不存在 | `该用户不存在` | 提示「没有找到这个用户」，不要显示为空列表 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：按云类型搜索时类型名不存在**不报错**，返回空数组（与用户名搜索的 404 行为不同）。
+
+### 5.2 `GET /cloud/map` — 时间范围地图数据
+
+- **认证**：无（公开）；仅返回公开可见的云图
+
+**Query 参数**：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `start` | date string | 是 | 须 ≤ `end` | 范围起点，如 `2026-08-01T00:00:00Z` |
+| `end` | date string | 是 | — | 范围终点 |
+| `time_field` | enum | 否 | `captured_at` / `uploaded_at`，默认 `captured_at` | 按拍摄时间还是上传时间过滤 |
+| `limit` | int | 否 | 1–1000，默认 `1000` | 返回上限（不分页） |
+
+**成功响应**：`200`，CloudInfo 数组，按 `time_field` 倒序（同刻按 `id` 倒序），结构同 5.1。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | `start` 晚于 `end` | zod 形状，issues 中含 `开始时间不能晚于结束时间` | 表单前置校验 |
+| 400 | 其他参数校验失败 | zod 形状（2.1） | 检查参数 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：`time_field=captured_at`（默认）时，`captured_at` 为 `null` 的云图**不会出现在结果中**；需要全量数据时请用 `uploaded_at`。
+
+### 5.3 `GET /cloud/:cloud_id` — 云图详情
+
+- **认证**：可选。匿名访客按公开可见规则过滤；上传者本人可见自己的全部云图；admin 可见全部
+- 无效/过期 token 按匿名处理，**不会**返回 401
+
+**路径参数**：
+
+| 参数 | 类型 | 说明 |
+|---|---|---|
+| `cloud_id` | uuid | 云图 ID |
+
+**成功响应**：`200`，单个 CloudInfo 对象（字段见 1.5），结构同 5.1 的数组元素。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | `cloud_id` 不是合法 uuid | zod 形状（2.1） | 检查链接 |
+| 404 | 云图不存在，**或**对当前用户不可见（待审核/已驳回/已隐藏） | `未找到图片` | 统一提示「云图不存在或不可见」——服务端故意不区分，防止泄露私有云图的存在 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+### 5.4 `GET /cloud/type/:cloud_type_id` — 按云类型列出云图
+
+- **认证**：无（公开）；仅返回公开可见的云图
+
+**路径参数**：
+
+| 参数 | 类型 | 说明 |
+|---|---|---|
+| `cloud_type_id` | int | 云类型 ID（非数字返回 400） |
+
+**Query 参数**：分页参数，见 1.4。
+
+**成功响应**：`200`，CloudInfo 数组，结构同 5.1。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 参数校验失败 | zod 形状（2.1） | 检查参数 |
+| 404 | 云类型不存在 | `云类型不存在` | 提示类型不存在 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+### 5.5 `POST /cloud/:cloud_id/like` — 点赞
+
+- **认证**：需登录（任意角色）
+- **请求体**：无
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "点赞成功"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 401 | 未登录 / token 失效 | 见 3.5 | 引导登录 |
+| 404 | 云图不存在，或不是公开可见状态 | `图片不存在` | 提示云图不可点赞；与「不存在」共用是设计意图 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：**幂等**——重复点赞返回相同的 200，点赞数不会增加。前端无需在点击前查询是否已赞，但仍建议本地置灰防止连点。
+
+### 5.6 `DELETE /cloud/:cloud_id/like` — 取消点赞
+
+- **认证**：需登录（任意角色）
+- **请求体**：无
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "取消点赞成功"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 401 | 未登录 / token 失效 | 见 3.5 | 引导登录 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：**完全幂等**——从未点赞、云图不存在，同样返回 200。没有 404 分支。
+
+### 5.7 `POST /cloud` — 上传云图
+
+- **认证**：需登录（任意角色）
+- **Content-Type**：`multipart/form-data`；请求体总上限 21 MiB（图片约束见 1.6）
+
+**表单字段**（multipart 字段均为字符串）：
+
+| 字段 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `image` | file | 是 | 1 B – 20 MB，JPEG/PNG/WebP，非动图 | 图片文件 |
+| `type_id` | int | 是 | 正整数 | 云类型 ID（从 `/info/cloudtype` 获取） |
+| `latitude` | number | 是 | -90 ~ 90 | 纬度 |
+| `longitude` | number | 是 | -180 ~ 180 | 经度 |
+| `description` | string | 否 | ≤ 128 字符 | 描述 |
+| `captured_at` | date string | 否 | 合法日期 | 拍摄时间 |
+| `is_hidden` | string | **是** | 仅接受 `"true"` / `"false"` / `"1"` / `"0"` | 是否隐藏；其他写法（如 `"yes"`）返回 400 |
+
+**成功响应**：`201`
+
+```json
+{
+    "status_code": 201,
+    "message": "上传成功",
+    "cloud_id": "3f8a2c1e-7b9d-4e5f-a1c2-9d8e7f6a5b4c"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 图片为空文件 | `图片为空` | 提示重新选择 |
+| 400 | 图片超过 20 MB | `图片大小超过 20MB 限制` | 提示压缩 |
+| 400 | 格式不支持 | `仅支持 JPEG、PNG、WebP 格式` | 提示转换格式 |
+| 400 | 动图 | `不支持动图` | 提示使用静态图 |
+| 400 | 分辨率超上限 | `图片分辨率超过限制` | 提示缩小尺寸 |
+| 400 | 其他图片处理失败 | `压缩参数无效` / `图片处理失败` | 提示换图重试 |
+| 400 | 表单字段校验失败（如 `is_hidden` 编码非法、缺字段） | zod 形状（2.1） | 检查表单 |
+| 401 | 未登录 / token 失效 | 见 3.5 | 引导登录 |
+| 413 | 请求体超过 21 MiB | `上传文件过大` | 提示压缩图片 |
+| 500 | 服务端异常（含存储/数据库失败） | `服务器发生内部错误` | 稍后重试；服务端已做失败补偿清理，可安全重试 |
+
+**注意事项**：
+
+- 上传成功后云图为 `pending`（待审核），**不会出现在公开列表**，本人可在「我的云图」（6.4）中看到
+- `type_id` 指向不存在的云类型会导致 500（外键约束），前端应确保类型 ID 来自 `/info/cloudtype`
+
+### 5.8 `PATCH /cloud/:cloud_id` — 更新云图
+
+- **认证**：需登录，且为上传者本人。**非本人的云图返回 404 而非 403**（防止泄露存在性）
+
+**路径参数**：`cloud_id`（uuid）。
+
+**请求体**（JSON，至少提供一个字段，否则 400）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `latitude` | number | 否 | -90 ~ 90 | 纬度 |
+| `longitude` | number | 否 | -180 ~ 180 | 经度 |
+| `type_id` | int | 否 | 正整数 | ⚠️ 不校验存在性，非法值导致 500 |
+| `description` | string | 否 | ≤ 128 字符 | 描述 |
+| `captured_at` | date string | 否 | 合法日期 | 拍摄时间 |
+| `is_hidden` | boolean | 否 | — | 是否隐藏（JSON 布尔值） |
+
+```json
+{
+    "description": "补充：拍摄于景山公园",
+    "is_hidden": false
+}
+```
+
+**成功响应**：`200`，`{ "status_code": 200, "message": "更新成功" }`
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 未提供任何修改字段 | zod 形状，issues 中含 `至少需要提供一个修改字段` | 表单前置校验 |
+| 400 | 参数校验失败 | zod 形状（2.1） | 检查字段 |
+| 401 | 未登录 / token 失效 | 见 3.5 | 引导登录 |
+| 404 | 云图不存在或不属于当前用户 | `图片不存在` | 提示云图不存在 |
+| 500 | 服务端异常（含 `type_id` 不存在） | `服务器发生内部错误` | 稍后重试 |
+
+### 5.9 `DELETE /cloud/:cloud_id` — 删除云图
+
+- **认证**：需登录，且为上传者本人（非本人返回 404，同 5.8）
+
+**成功响应**：`200`，`{ "status_code": 200, "message": "删除成功" }`
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 401 | 未登录 / token 失效 | 见 3.5 | 引导登录 |
+| 404 | 云图不存在或不属于当前用户 | `图片不存在` | 提示云图不存在 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+### 5.10 `DELETE /cloud` — 批量删除云图
+
+- **认证**：需登录；仅删除属于当前用户的云图
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `cloud_ids` | array | 是 | 1–100 个元素，不允许重复 | 元素为 `{ "cloud_id": "<uuid>" }` 对象 |
+
+```json
+{
+    "cloud_ids": [
+        { "cloud_id": "3f8a2c1e-7b9d-4e5f-a1c2-9d8e7f6a5b4c" },
+        { "cloud_id": "b4c5d6e7-f8a9-4b5c-9d0e-1f2a3b4c5d6e" }
+    ]
+}
+```
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "成功删除 2 张图片"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | ID 重复 / 数量超出 1–100 / 格式非法 | zod 形状，ID 重复时 issues 含 `图片 ID 不能重复` | 前端去重后提交 |
+| 401 | 未登录 / token 失效 | 见 3.5 | 引导登录 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：**部分成功语义**——只删除属于当前用户的云图，他人或不存在的 ID 被静默跳过，消息中的 `N` 是实际删除数（可能小于请求数，甚至为 0）。前端应以 `N` 为准刷新列表，而不是假设全部删除成功。
+
+### 5.11 `GET|HEAD /image/:cloud_id/:variant` — 读取图片变体
+
+- **认证**：可选。匿名访客与无关用户只能读取具备 PublicVisibility 的 Cloud；上传者可读取自己的全部 Cloud；admin 可读取全部 Cloud
+- **严格凭证**：完全不携带凭证时按匿名处理；一旦携带无效/过期 Bearer 或 Cookie，返回 401，不会降级为匿名。Bearer 与 Cookie 同时存在时 Bearer 优先
+- **响应**：应用先查询 Cloud 权限，再从 MinIO 流式代理图片；客户端不能提交 bucket 或 object key
+
+**路径参数**：
+
+| 参数 | 类型 | 说明 |
+|---|---|---|
+| `cloud_id` | uuid | Cloud ID，由上传响应、列表或详情接口取得 |
+| `variant` | enum | `preview`（最大 640×640 WebP）或 `original`（上传原图） |
+
+两种图片变体采用相同权限规则。示例：
+
+```html
+<img src="https://api.example.com/image/3f8a2c1e-7b9d-4e5f-a1c2-9d8e7f6a5b4c/preview" alt="云图" />
+```
+
+**成功响应**：
+
+- `GET` 返回 200 和图片字节，`Content-Type` 仅可能为 `image/jpeg`、`image/png` 或 `image/webp`
+- `HEAD` 返回与 GET 相同的授权结果和响应头，但没有 body，也不会读取 MinIO 对象 body
+- 返回 `Content-Length`、`Content-Disposition: inline`、`ETag`、`Last-Modified` 与 `X-Content-Type-Options: nosniff`
+- 携带匹配的 `If-None-Match` 时返回 304；认证和 PublicVisibility 检查仍会执行
+
+**缓存**：
+
+| 调用方式 | `Cache-Control` |
+|---|---|
+| 匿名读取具备 PublicVisibility 的 Cloud | `public, no-cache` |
+| 任何有效 Cookie/Bearer 请求 | `private, no-store` |
+
+响应同时包含 `Vary: Authorization, Cookie`。公开缓存每次复用前都必须回源验证，因此 Cloud 被隐藏或改判后立即失效。
+
+**错误**：
+
+| 状态码 | 触发条件 | 前端建议动作 |
+|---|---|---|
+| 400 | Cloud ID 或 ImageVariant 非法 | 检查 URL |
+| 401 | 显式提供的 JWT 无效、过期或已失效 | 清除本地登录态 |
+| 404 | Cloud 不存在、当前用户不可见，或对应 MinIO 对象不存在 | 统一显示占位图，不推断具体原因 |
+| 405 | 使用 GET/HEAD 之外的业务方法；响应含 `Allow: GET, HEAD` | 修正请求方法 |
+| 500 | 数据库或应用内部错误 | 稍后重试 |
+| 503 | MinIO 暂时不可用或对象 metadata 异常 | 稍后重试 |
+
+具备 PublicVisibility 的 Cloud 允许被其他网站嵌入；流量限制由部署网关/CDN/WAF 负责。端点不支持 Range 请求。CORS 预检 `OPTIONS` 是协议级例外，由全局中间件返回 204，并只声明 `GET, HEAD`。
+
+---
+
+## 6. 端点 · 个人资料 `/profile`
+
+本章所有端点**都需要登录**（任意角色）。未登录统一返回 401（见 3.5），下文错误表不再重复列出。
+
+### 6.1 `GET /profile/me` — 我的资料
+
+- **认证**：需登录
+
+**成功响应**：`200`，UserProfile 对象（字段见 1.5）
+
+```json
+{
+    "id": "a1b2c3d4-e5f6-4a5b-8c9d-0e1f2a3b4c5d",
+    "name": "cloudwatcher",
+    "email": "watcher@example.com",
+    "avatar_id": null,
+    "cloud_count": 7,
+    "received_like_count": 42,
+    "last_online": "2026-08-15T08:30:00.000Z",
+    "role": "user",
+    "is_disabled": false,
+    "created_at": "2026-07-01T10:00:00.000Z"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 404 | ⚠️ 数据库异常（空 `catch`，2.3 第 2 条） | 纯文本 `404 Not Found` | 视为服务异常，稍后重试 |
+
+### 6.2 `PATCH /profile/me` — 修改用户名
+
+- **认证**：需登录
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `user_name` | string | 是 | ⚠️ 数据库限 ≤ 16 字符，API 层不校验（超长返回 500） | 新用户名 |
+
+```json
+{
+    "user_name": "newname"
+}
+```
+
+**成功响应**：`200`，更新后的 UserProfile 对象（结构同 6.1）。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 参数校验失败 | zod 形状（2.1） | 检查字段 |
+| 409 | 用户名已被占用（数据库唯一约束，大小写敏感） | `用户名已被占用` | 提示换用户名 |
+| 500 | 服务端异常（含用户名超长） | `服务器发生内部错误` | 前端应限制 ≤ 16 字符避免误报 |
+
+### 6.3 `GET /profile/me/likes` — 我点赞过的云图
+
+- **认证**：需登录
+
+**成功响应**：`200`，CloudInfo 数组（字段见 1.5），按点赞时间倒序。
+
+**注意事项**：包含**所有状态**的云图（含待审核/已驳回/已隐藏的），因为这些是你自己点过赞的——展示时如需隐藏非公开项请自行过滤 `status` 与 `is_hidden`。
+
+**错误**：500 `服务器发生内部错误`。
+
+### 6.4 `GET /profile/me/clouds` — 我上传的云图
+
+- **认证**：需登录
+
+**成功响应**：`200`，CloudInfo 数组（字段见 1.5），按上传时间倒序，包含所有状态（`pending`/`approved`/`rejected`）与隐藏的云图。这是上传后查看审核进度的入口。
+
+**错误**：500 `服务器发生内部错误`。
+
+### 6.5 `GET /profile/:user_id` — 查看用户资料
+
+- **认证**：需登录（任意登录用户可查看任意用户）
+
+**路径参数**：`user_id`（uuid）。
+
+**成功响应**：`200`，UserProfile 对象（结构同 6.1）。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | `user_id` 不是合法 uuid | zod 形状（2.1） | 检查链接 |
+| 404 | 用户不存在 | `该用户不存在` | 提示用户不存在 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：⚠️ 响应包含对方 `email`（2.3 第 7 条）。展示他人资料页时不应展示邮箱字段。
+
+### 6.6 `GET /profile/:user_id/likes` — 查看用户点赞记录
+
+- **认证**：需登录，且为**本人或 admin**
+
+**路径参数**：`user_id`（uuid）。
+
+**成功响应**：`200`，CloudInfo 数组，按点赞时间倒序，结构同 5.1。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 403 | 查看他人且非 admin | `无权查看该用户的点赞记录` | 前端应在进入页面前判断身份，避免触发 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+### 6.7 `GET /profile/:user_id/clouds` — 查看用户上传的云图
+
+- **认证**：需登录，且为**本人或 admin**
+
+**路径参数**：`user_id`（uuid）。
+
+**成功响应**：`200`，CloudInfo 数组，按上传时间倒序，结构同 5.1。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 403 | 查看他人且非 admin | `无权查看该用户的图片` | 同上，前置判断 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：想查看某个用户的**公开**云图，应使用 `GET /cloud?filter=owner&value=<用户名>`（5.1）而非本端点——本端点是管理/个人视角，返回含非公开状态的完整列表。
+
+---
+
+## 7. 端点 · 信息 `/info`
+
+### 7.1 `GET /info/cloudtype` — 云类型列表
+
+- **认证**：无（公开）
+
+**成功响应**：`200`，CloudTypeInfo 数组（字段见 1.5），按 `id` 升序：
+
+```json
+[
+    {
+        "id": 1,
+        "name": "积云",
+        "genus": "Cumulus",
+        "icon_id": null,
+        "rarity": 1,
+        "description": "底部平坦、顶部蓬松的白色云块",
+        "created_at": "2026-01-01 00:00:00+00"
+    }
+]
+```
+
+**注意事项**：⚠️ 本端点的 `created_at` 是 PostgreSQL 原生格式（上例），**不是** ISO 8601（2.3 第 5 条），解析时自行兼容。
+
+**错误**：500 `服务器发生内部错误`。
+
+### 7.2 `GET /info/cloudtype/:cloud_type_id` — 云类型详情
+
+- **认证**：无（公开）
+
+**路径参数**：`cloud_type_id`（int）。
+
+**成功响应**：`200`，单个 CloudTypeInfo 对象；本端点的 `created_at` 为 ISO 8601 格式。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | `cloud_type_id` 非数字 | zod 形状（2.1） | 检查链接 |
+| 404 | 云类型不存在 | `未找到` | 提示类型不存在 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+---
+
+## 8. 端点 · 管理 `/admin`
+
+本章所有端点**仅 admin 角色可用**。未登录返回 401；已登录但非 admin 统一返回 403 `权限不足`，下文错误表不再重复列出。
+
+### 8.1 `GET /admin/stats` — 统计数据
+
+> ⚠️ **未实现**（占位端点，无 handler）。admin 请求返回纯文本 `404 Not Found`；未登录/非 admin 仍按本章规则先返回 401/403。请勿接入。
+
+### 8.2 `GET /admin/users` — 用户列表
+
+- **认证**：admin
+
+**成功响应**：`200`，UserProfile 数组（字段见 1.5）。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 404 | ⚠️ 数据库异常（空 `catch`，2.3 第 2 条） | 纯文本 `404 Not Found` | 视为服务异常，稍后重试 |
+
+**注意事项**：**无分页参数**，一次返回全部用户。用户量大时注意性能。
+
+### 8.3 `PATCH /admin/users/:user_id` — 修改用户角色
+
+- **认证**：admin
+
+**路径参数**：`user_id`（uuid）。
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `user_role` | enum | 是 | `user` / `admin` | 目标角色 |
+
+```json
+{
+    "user_role": "admin"
+}
+```
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "角色修改成功"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 参数校验失败（`user_role` 非法 / `user_id` 非 uuid） | zod 形状（2.1） | 检查参数 |
+| 404 | 用户不存在 | `用户不存在` | 提示用户不存在 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：修改角色会同时递增 `tokenVersion`，**该用户所有已签发 token 立即失效，必须重新登录**（见 3.4）。前端改完角色后可提示目标用户重新登录。
+
+### 8.4 `PATCH /admin/users/:user_id/password` — 设置用户密码
+
+- **认证**：admin
+
+**路径参数**：`user_id`（uuid）。
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `new_password` | string | 是 | 无强度校验 | 新密码；管理员直接覆盖，无需旧密码 |
+
+```json
+{
+    "new_password": "new-s3cret-password"
+}
+```
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "密码修改成功"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | 参数校验失败（`user_id` 非 uuid） | zod 形状（2.1） | 检查参数 |
+| 404 | 用户不存在（含凭据记录缺失） | `用户不存在` | 提示用户不存在 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：成功后同样递增 `tokenVersion`，该用户所有已签发 token 立即失效，必须重新登录（见 3.4）。
+
+### 8.5 `POST /admin/user` — 创建用户
+
+> ⚠️ **假端点**（2.3 第 4 条）：通过 zod 校验后**原样回显请求体（含明文密码）**，不创建任何用户。响应为 `200 { name, email, password, role }`。请勿接入，更不要在任何持久化日志中记录其响应。
+
+### 8.6 `GET /admin/clouds` — 全状态云图列表
+
+- **认证**：admin；可见任意状态与隐藏的云图
+
+**Query 参数**（在分页参数 1.4 基础上）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `status` | enum | 否 | `pending` / `approved` / `rejected` | 按审核状态过滤；不传返回全部状态 |
+
+**成功响应**：`200`，CloudInfo 数组（字段见 1.5），按上传时间倒序。
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | `status` 非法等参数错误 | zod 形状（2.1） | 检查参数 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+### 8.7 `POST /admin/clouds/review` — 批量审核云图
+
+- **认证**：admin
+
+**请求体**（JSON）：
+
+| 参数 | 类型 | 必填 | 约束 | 说明 |
+|---|---|---|---|---|
+| `cloud_ids` | array | 是 | 1–100 个元素，不允许重复 | 元素为 `{ "cloud_id": "<uuid>" }` 对象 |
+| `status` | enum | 是 | `approved` / `rejected` | 目标审核状态；**不支持打回 `pending`** |
+
+```json
+{
+    "cloud_ids": [
+        { "cloud_id": "3f8a2c1e-7b9d-4e5f-a1c2-9d8e7f6a5b4c" }
+    ],
+    "status": "approved"
+}
+```
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "成功审核 1 张"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | ID 重复 / `status` 非法 / 数量超限 | zod 形状（2.1） | 检查请求 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：**部分成功语义**——消息中的 `N` 只统计状态**实际发生变化**的云图；已是目标状态的与不存在的一律静默跳过。审核只改变审核状态，不影响 `is_hidden` 与点赞数据。`pending ↔ approved/rejected`、`approved ↔ rejected` 均可。
+
+### 8.8 `DELETE /admin/clouds/:cloud_id` — 删除云图
+
+- **认证**：admin
+
+**路径参数**：`cloud_id`（uuid）。
+
+**成功响应**：`200`
+
+```json
+{
+    "status_code": 200,
+    "message": "删除成功"
+}
+```
+
+**错误**：
+
+| 状态码 | 触发条件 | 消息原文 | 前端建议动作 |
+|---|---|---|---|
+| 400 | `cloud_id` 非 uuid | zod 形状（2.1） | 检查链接 |
+| 404 | 云图不存在 | `图片不存在` | 提示云图不存在 |
+| 500 | 服务端异常 | `服务器发生内部错误` | 稍后重试 |
+
+**注意事项**：管理员删除不受审核状态或隐藏状态限制。删除会级联删除该云图的点赞记录，并尽力清理 MinIO 中的图片对象；清理失败不报错，可能残留孤儿对象（可接受）。删除后前端应立即刷新相关列表。
+
+---
+
+## 9. 端点 · 系统
+
+### 9.1 `ALL /health` · 9.2 `ALL /status`
+
+> ⚠️ **均未实现**（占位端点，任意 HTTP 方法）。当前返回纯文本 `404 Not Found`。健康检查请直接探测任意已实现端点（如 `GET /info/cloudtype`）。
diff --git a/src/components/cloud/CloudEditModal.vue b/src/components/cloud/CloudEditModal.vue
index bf1eab5..936fe71 100644
--- a/src/components/cloud/CloudEditModal.vue
+++ b/src/components/cloud/CloudEditModal.vue
@@ -1,17 +1,15 @@
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { NAlert, NButton, NIcon } from 'naive-ui'
 import { Map as MapIcon, X } from '@vicons/tabler'
 import MapPickerModal from '@/components/cloud/MapPickerModal.vue'
 import type { CloudType } from '@/types/database'
 
 export interface CloudEditFormValue {
-  cloudCategoryId: number | 'other' | null
-  customCloudType: string
+  cloudCategoryId: number | null
   capturedAt: string
   latitude: number | null
   longitude: number | null
-  locationName: string
   description: string
   isPublic: boolean
 }
@@ -35,16 +33,12 @@ const emit = defineEmits<{
 const form = ref<CloudEditFormValue>(createEmptyForm())
 const mapPickerOpen = ref(false)
 
-const hasCoordinates = computed(() => form.value.latitude !== null || form.value.longitude !== null)
-
 function createEmptyForm(): CloudEditFormValue {
   return {
     cloudCategoryId: null,
-    customCloudType: '',
     capturedAt: '',
     latitude: null,
     longitude: null,
-    locationName: '',
     description: '',
     isPublic: true,
   }
@@ -56,9 +50,7 @@ function cloneForm(value: CloudEditFormValue | null) {
 
 function onCategoryChange(event: Event) {
   const value = (event.target as HTMLSelectElement).value
-  if (value === 'other') {
-    form.value.cloudCategoryId = 'other'
-  } else if (!value) {
+  if (!value) {
     form.value.cloudCategoryId = null
   } else {
     form.value.cloudCategoryId = Number(value)
@@ -75,11 +67,6 @@ function onLngInput(event: Event) {
   form.value.longitude = Number.isNaN(value) ? null : value
 }
 
-function clearCoordinates() {
-  form.value.latitude = null
-  form.value.longitude = null
-}
-
 function confirmMapPicker(payload: { latitude: number; longitude: number }) {
   form.value.latitude = payload.latitude
   form.value.longitude = payload.longitude
@@ -154,21 +141,11 @@ watch(() => props.initialValue, value => {
               >
                 <option value="" disabled>请选择</option>
                 <option v-for="ct in cloudTypes" :key="ct.id" :value="ct.id">
-                  {{ ct.name }}（{{ ct.name_en }}）
+                  {{ ct.name }}{{ ct.genus ? '（' + ct.genus + '）' : '' }}
                 </option>
-                <option value="other">其他</option>
               </select>
             </div>
 
-            <div v-if="form.cloudCategoryId === 'other'">
-              <label class="oc-field-label">自定义云型</label>
-              <input
-                v-model="form.customCloudType"
-                type="text"
-                class="oc-field-control"
-              />
-            </div>
-
             <div>
               <label class="oc-field-label">拍摄时间</label>
               <input
@@ -179,27 +156,7 @@ watch(() => props.initialValue, value => {
             </div>
 
             <div>
-              <label class="oc-field-label">位置名称</label>
-              <input
-                v-model="form.locationName"
-                type="text"
-                class="oc-field-control"
-                placeholder="如：北京、成都"
-              />
-            </div>
-
-            <div>
-              <div class="mb-1 flex items-center justify-between gap-3">
-                <label class="oc-field-label mb-0">经纬度</label>
-                <button
-                  v-if="hasCoordinates"
-                  type="button"
-                  class="oc-text-button oc-text-button--muted text-xs"
-                  @click="clearCoordinates"
-                >
-                  清空
-                </button>
-              </div>
+              <label class="oc-field-label">经纬度 <span class="oc-field-required">*</span></label>
               <div class="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_auto] gap-2">
                 <input
                   :value="form.latitude !== null ? form.latitude : ''"
diff --git a/src/components/cloud/EncyclopediaProgressCard.vue b/src/components/cloud/EncyclopediaProgressCard.vue
deleted file mode 100644
index d6e9753..0000000
--- a/src/components/cloud/EncyclopediaProgressCard.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue'
-import { NCard } from 'naive-ui'
-
-const props = defineProps<{
-  unlockedCount: number
-  totalCount: number
-  isLoggedIn: boolean
-}>()
-
-const displayedUnlockedCount = computed(() => {
-  if (!props.isLoggedIn) return 0
-  return Math.min(Math.max(props.unlockedCount, 0), props.totalCount)
-})
-const remainingCount = computed(() => Math.max(props.totalCount - displayedUnlockedCount.value, 0))
-</script>
-
-<template>
-  <NCard class="oc-panel-card-soft border border-sky-100 bg-white/88 backdrop-blur" :bordered="false">
-    <div class="flex items-end justify-between gap-4">
-      <div>
-        <p class="oc-stat-label">Collection Status</p>
-        <p class="mt-1 text-base font-semibold text-slate-900">图鉴收集进度</p>
-      </div>
-      <p class="shrink-0 font-mono tabular-nums text-slate-500">
-        <span class="text-3xl font-bold text-sky-800">{{ displayedUnlockedCount }}</span>
-        <span class="ml-1 text-sm">/ {{ totalCount }}</span>
-      </p>
-    </div>
-
-    <div
-      class="mt-5 grid grid-cols-5 gap-2 sm:grid-cols-10"
-      role="progressbar"
-      aria-label="云属收集进度"
-      aria-valuemin="0"
-      :aria-valuemax="totalCount"
-      :aria-valuenow="displayedUnlockedCount"
-      :aria-valuetext="`已收录 ${displayedUnlockedCount} 种，共 ${totalCount} 种`"
-    >
-      <span
-        v-for="index in totalCount"
-        :key="index"
-        aria-hidden="true"
-        class="encyclopedia-progress-cell aspect-square border border-slate-300 bg-slate-50"
-        :class="{ 'encyclopedia-progress-cell--active': index <= displayedUnlockedCount }"
-        :style="{ animationDelay: `${(index - 1) * 90}ms` }"
-      ></span>
-    </div>
-
-    <p class="mt-4 border-t border-slate-200 pt-3 text-sm text-slate-500">
-      <template v-if="isLoggedIn">
-        已收录 {{ displayedUnlockedCount }} 种云属，还差 {{ remainingCount }} 种。
-      </template>
-      <template v-else>
-        登录后可同步你的个人图鉴进度。
-      </template>
-    </p>
-  </NCard>
-</template>
-
-<style scoped>
-.encyclopedia-progress-cell--active {
-  background: rgb(224 242 254);
-  border-color: rgb(125 211 252);
-  box-shadow: 3px 3px 0 0 rgb(3 105 161 / 14%);
-  animation:
-    encyclopedia-cell-activate 1ms linear both,
-    encyclopedia-cell-pulse 220ms ease-out both;
-}
-
-@keyframes encyclopedia-cell-activate {
-  from {
-    background: rgb(248 250 252);
-    border-color: rgb(203 213 225);
-    box-shadow: none;
-  }
-
-  to {
-    background: rgb(224 242 254);
-    border-color: rgb(125 211 252);
-    box-shadow: 3px 3px 0 0 rgb(3 105 161 / 14%);
-  }
-}
-
-@keyframes encyclopedia-cell-pulse {
-  0% {
-    transform: scale(1);
-  }
-
-  28% {
-    transform: scale(0.9);
-  }
-
-  62% {
-    transform: scale(1.06);
-  }
-
-  100% {
-    transform: scale(1);
-  }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .encyclopedia-progress-cell--active {
-    animation: none;
-  }
-}
-</style>
diff --git a/src/components/cloud/ImageDetailModal.vue b/src/components/cloud/ImageDetailModal.vue
index 182df62..4394349 100644
--- a/src/components/cloud/ImageDetailModal.vue
+++ b/src/components/cloud/ImageDetailModal.vue
@@ -49,10 +49,10 @@ const layout = computed(() => {
     ? naturalWidth.value / naturalHeight.value
     : 4 / 3
   const maxModalWidth = viewportWidth.value > 0
-    ? Math.max(Math.min(viewportWidth.value * 0.92, viewportWidth.value - 32), 280)
+    ? Math.max(Math.min(viewportWidth.value * 0.95, viewportWidth.value - 32), 280)
     : 320
   const maxImageHeight = viewportHeight.value > 0
-    ? Math.max(viewportHeight.value * 0.86, 240)
+    ? Math.max(viewportHeight.value * 0.9, 240)
     : 360
   const imageWidth = Math.min(maxModalWidth, maxImageHeight * aspectRatio)
 
@@ -187,11 +187,11 @@ onBeforeUnmount(() => {
           <button
             type="button"
             @click="close"
-            class="image-detail-close-button oc-overlay-button absolute right-4 top-4 z-30 h-10 w-10 [&_svg]:stroke-[2.5]"
+            class="oc-overlay-button absolute right-3 top-3 z-30 h-9 w-9 opacity-0 drop-shadow-[0_2px_8px_rgba(15,23,42,0.9)] transition-opacity duration-200 hover:opacity-100 focus-visible:opacity-100"
             aria-label="关闭大图"
             title="关闭大图"
           >
-            <NIcon size="22">
+            <NIcon size="20">
               <X />
             </NIcon>
           </button>
@@ -301,13 +301,7 @@ onBeforeUnmount(() => {
   transform: translateY(10px) scale(0.97);
 }
 
-.image-detail-shell.image-detail-shell {
-  border-radius: 30px !important;
-}
-
-.image-detail-close-button.image-detail-close-button,
-.image-detail-info-button.image-detail-info-button,
-.image-detail-panel-close.image-detail-panel-close {
+.image-detail-info-button.image-detail-info-button {
   border-radius: 9999px !important;
 }
 </style>
diff --git a/src/components/cloud/QuickUploadModal.vue b/src/components/cloud/QuickUploadModal.vue
index 66fcebb..f4249d6 100644
--- a/src/components/cloud/QuickUploadModal.vue
+++ b/src/components/cloud/QuickUploadModal.vue
@@ -91,9 +91,7 @@ function handleRemove(id: string) {
 function onCategoryChange(event: Event) {
   if (!activeItem.value) return
   const value = (event.target as HTMLSelectElement).value
-  if (value === 'other') {
-    activeItem.value.cloudCategoryId = 'other'
-  } else if (value === '') {
+  if (value === '') {
     activeItem.value.cloudCategoryId = null
   } else {
     activeItem.value.cloudCategoryId = Number(value)
@@ -102,6 +100,7 @@ function onCategoryChange(event: Event) {
 }
 
 function formatDatetimeLocal(iso: string): string {
+  if (!iso) return ''
   const date = new Date(iso)
   const pad = (value: number) => String(value).padStart(2, '0')
   return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(date.getMinutes())}`
@@ -110,8 +109,7 @@ function formatDatetimeLocal(iso: string): string {
 function onCapturedAtChange(event: Event) {
   if (!activeItem.value) return
   const value = (event.target as HTMLInputElement).value
-  if (!value) return
-  activeItem.value.capturedAt = new Date(value).toISOString()
+  activeItem.value.capturedAt = value ? new Date(value).toISOString() : ''
   delete activeItem.value.errors.capturedAt
 }
 
@@ -169,7 +167,7 @@ async function handleSubmit() {
 
   const result = await uploadAll()
   if (!result.ok) {
-    errorMsg.value = '上传失败，请稍后重试'
+    errorMsg.value = result.errorMessage || '上传失败，请稍后重试'
     return
   }
 
@@ -217,7 +215,7 @@ onBeforeUnmount(() => {
         </div>
 
         <div class="max-h-[72vh] overflow-y-auto px-5 py-5">
-          <input ref="fileInput" type="file" accept="image/*" class="hidden" @change="handleFileSelect" />
+          <input ref="fileInput" type="file" accept="image/jpeg,image/png,image/webp" class="hidden" @change="handleFileSelect" />
 
           <NAlert v-if="successMsg" type="success" :bordered="false" title="已提交审核" class="mb-4">
             图片审核通过后会出现在画廊和地图中。
@@ -248,7 +246,7 @@ onBeforeUnmount(() => {
           >
             <NIcon size="42" class="text-sky-600"><CloudUpload /></NIcon>
             <p class="mt-3 text-base font-semibold text-slate-800">选择一张云图</p>
-            <p class="oc-field-help">支持 JPG、PNG，可点击或拖拽上传。</p>
+            <p class="oc-field-help">支持 JPEG、PNG、WebP，图片不超过 20MB。</p>
           </div>
 
           <template v-else-if="activeItem">
@@ -273,23 +271,15 @@ onBeforeUnmount(() => {
                   >
                     <option value="" disabled>请选择</option>
                     <option v-for="cloudType in cloudsStore.cloudTypes" :key="cloudType.id" :value="cloudType.id">
-                      {{ cloudType.name }}（{{ cloudType.name_en }}）
+                      {{ cloudType.name }}{{ cloudType.genus ? '（' + cloudType.genus + '）' : '' }}
                     </option>
-                    <option value="other">其他</option>
                   </select>
-                  <input
-                    v-if="activeItem.cloudCategoryId === 'other'"
-                    v-model="activeItem.customCloudType"
-                    type="text"
-                    placeholder="输入云的类型"
-                    class="oc-field-control mt-2"
-                    @input="activeItem.errors = {}"
-                  />
                   <p v-if="activeItem.errors.cloudCategory" class="oc-field-error">{{ activeItem.errors.cloudCategory }}</p>
+                  <p v-if="activeItem.errors.file" class="oc-field-error">{{ activeItem.errors.file }}</p>
                 </div>
 
                 <div>
-                  <label class="oc-field-label">拍摄时间 <span class="oc-field-required">*</span></label>
+                  <label class="oc-field-label">拍摄时间</label>
                   <input
                     type="datetime-local"
                     :value="formatDatetimeLocal(activeItem.capturedAt)"
@@ -300,7 +290,7 @@ onBeforeUnmount(() => {
                 </div>
 
                 <div>
-                  <label class="oc-field-label">经纬度</label>
+                  <label class="oc-field-label">经纬度 <span class="oc-field-required">*</span></label>
                   <div class="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_40px] gap-2">
                     <div>
                       <input
@@ -336,17 +326,7 @@ onBeforeUnmount(() => {
                       </NIcon>
                     </button>
                   </div>
-                  <p class="mt-1 text-xs text-slate-400">选填，可手动输入，也可以点击右侧地图按钮选点。</p>
-                </div>
-
-                <div>
-                  <label class="oc-field-label">位置名称</label>
-                  <input
-                    v-model="activeItem.locationName"
-                    type="text"
-                    placeholder="如：北京、成都"
-                    class="oc-field-control"
-                  />
+                  <p class="mt-1 text-xs text-slate-400">必填，可手动输入，也可以点击右侧地图按钮选点。</p>
                 </div>
 
                 <div>
@@ -354,9 +334,11 @@ onBeforeUnmount(() => {
                   <textarea
                     v-model="activeItem.description"
                     rows="3"
+                    maxlength="128"
                     placeholder="描述一下这张图片..."
                     class="oc-field-control resize-none"
                   ></textarea>
+                  <p v-if="activeItem.errors.description" class="oc-field-error">{{ activeItem.errors.description }}</p>
                 </div>
 
                 <label class="flex items-center justify-between gap-4 border border-slate-200 bg-slate-50 px-4 py-3">
diff --git a/src/components/layout/AppHeader.vue b/src/components/layout/AppHeader.vue
index 14b152d..673bc55 100644
--- a/src/components/layout/AppHeader.vue
+++ b/src/components/layout/AppHeader.vue
@@ -198,7 +198,7 @@ async function handleLogout() {
               class="oc-nav-link"
               :class="route.name === 'encyclopedia' || route.name === 'cloud-type' ? activeNavClass : inactiveNavClass"
             >
-              图鉴
+              百科
             </RouterLink>
           </nav>
 
@@ -362,7 +362,7 @@ async function handleLogout() {
             class="oc-nav-link shrink-0"
             :class="route.name === 'encyclopedia' || route.name === 'cloud-type' ? activeNavClass : inactiveNavClass"
           >
-            图鉴
+            百科
           </RouterLink>
         </nav>
       </div>
diff --git a/src/composables/useUpload.ts b/src/composables/useUpload.ts
index 40d0004..ecb83bc 100644
--- a/src/composables/useUpload.ts
+++ b/src/composables/useUpload.ts
@@ -3,15 +3,12 @@ import { apiRequest } from '@/lib/api'
 import { useAuthStore } from '@/stores/auth'
 import { useProfileStore } from '@/stores/profile'
 import type { CloudCreateResponse } from '@/types/api'
-import type { CloudType } from '@/types/database'
 
 export interface UploadItem {
   id: string
   file: File
   preview: string
-  cloudCategoryId: number | 'other' | null
-  customCloudType: string
-  locationName: string
+  cloudCategoryId: number | null
   description: string
   isHidden: boolean
   latitude: number | null
@@ -20,17 +17,9 @@ export interface UploadItem {
   errors: Record<string, string>
 }
 
-export interface UnlockedBadge {
-  cloudTypeId: number
-  cloudName: string
-  cloudNameEn: string
-  rarity: CloudType['rarity']
-  unlockedAt: string
-}
-
 export interface UploadResult {
   ok: boolean
-  unlockedBadges: UnlockedBadge[]
+  errorMessage?: string
 }
 
 let nextId = 0
@@ -46,7 +35,7 @@ function readFileAsArrayBuffer(file: File): Promise<ArrayBuffer> {
 
 function extractExifDate(buffer: ArrayBuffer): string | null {
   const view = new DataView(buffer)
-  if (view.getUint16(0, false) !== 0xffd8) return null
+  if (view.byteLength < 4 || view.getUint16(0, false) !== 0xffd8) return null
 
   let offset = 2
   while (offset < view.byteLength - 2) {
@@ -89,8 +78,8 @@ function extractExifDate(buffer: ArrayBuffer): string | null {
   return null
 }
 
-function appendOptional(form: FormData, key: string, value: string | number | null) {
-  if (value !== null && value !== '') form.append(key, String(value))
+function appendOptional(form: FormData, key: string, value: string) {
+  if (value.trim()) form.append(key, value.trim())
 }
 
 export function useUpload() {
@@ -103,14 +92,13 @@ export function useUpload() {
   const totalItems = ref(0)
 
   async function addFiles(files: File[]) {
-    const imageFiles = files.filter(file => file.type.startsWith('image/'))
+    const imageFiles = files.filter(file => ['image/jpeg', 'image/png', 'image/webp'].includes(file.type))
     for (const file of imageFiles) {
-      let capturedAt = new Date().toISOString()
+      let capturedAt = ''
       try {
-        const exifDate = extractExifDate(await readFileAsArrayBuffer(file))
-        if (exifDate) capturedAt = exifDate
+        capturedAt = extractExifDate(await readFileAsArrayBuffer(file)) || ''
       } catch {
-        // 无 EXIF 时使用当前时间。
+        capturedAt = ''
       }
 
       items.value.push({
@@ -118,8 +106,6 @@ export function useUpload() {
         file,
         preview: URL.createObjectURL(file),
         cloudCategoryId: null,
-        customCloudType: '',
-        locationName: '',
         description: '',
         isHidden: false,
         latitude: null,
@@ -145,15 +131,24 @@ export function useUpload() {
   function validateItem(item: UploadItem) {
     const errors: Record<string, string> = {}
     if (!item.cloudCategoryId) errors.cloudCategory = '请选择类别'
-    if (item.cloudCategoryId === 'other' && !item.customCloudType.trim()) {
-      errors.cloudCategory = '请输入自定义云型名称'
+    if (item.file.size === 0) errors.file = '图片文件为空'
+    if (item.file.size > 20 * 1024 * 1024) errors.file = '图片不能超过 20MB'
+    if (!['image/jpeg', 'image/png', 'image/webp'].includes(item.file.type)) {
+      errors.file = '仅支持 JPEG、PNG、WebP 格式'
     }
-    if (!item.capturedAt) errors.capturedAt = '请选择拍摄时间'
 
-    const hasLat = typeof item.latitude === 'number' && !isNaN(item.latitude)
-    const hasLng = typeof item.longitude === 'number' && !isNaN(item.longitude)
-    if (hasLat && !hasLng) errors.longitude = '经纬度必须同时填写'
-    if (hasLng && !hasLat) errors.latitude = '经纬度必须同时填写'
+    if (item.latitude === null || Number.isNaN(item.latitude)) {
+      errors.latitude = '请填写纬度'
+    } else if (item.latitude < -90 || item.latitude > 90) {
+      errors.latitude = '纬度范围为 -90 到 90'
+    }
+    if (item.longitude === null || Number.isNaN(item.longitude)) {
+      errors.longitude = '请填写经度'
+    } else if (item.longitude < -180 || item.longitude > 180) {
+      errors.longitude = '经度范围为 -180 到 180'
+    }
+    if (item.description.trim().length > 128) errors.description = '图片描述不能超过 128 个字符'
+
     item.errors = errors
     return Object.keys(errors).length === 0
   }
@@ -163,13 +158,12 @@ export function useUpload() {
   }
 
   async function uploadAll(): Promise<UploadResult> {
-    if (!validateAll() || !authStore.user) return { ok: false, unlockedBadges: [] }
+    if (!validateAll() || !authStore.user) return { ok: false }
 
     uploading.value = true
     totalItems.value = items.value.length
     currentItemIndex.value = 0
     overallProgress.value = 0
-    const badges = new Map<number, UnlockedBadge>()
 
     try {
       for (let index = 0; index < items.value.length; index++) {
@@ -179,40 +173,28 @@ export function useUpload() {
 
         const form = new FormData()
         form.append('image', item.file)
-        if (item.cloudCategoryId === 'other') {
-          form.append('custom_cloud_type', item.customCloudType.trim())
-        } else {
-          form.append('cloud_type_id', String(item.cloudCategoryId))
-        }
-        appendOptional(form, 'latitude', item.latitude)
-        appendOptional(form, 'longitude', item.longitude)
-        appendOptional(form, 'location_name', item.locationName.trim())
-        appendOptional(form, 'description', item.description.trim())
+        form.append('type_id', String(item.cloudCategoryId))
+        form.append('latitude', String(item.latitude))
+        form.append('longitude', String(item.longitude))
+        appendOptional(form, 'description', item.description)
         appendOptional(form, 'captured_at', item.capturedAt)
         form.append('is_hidden', String(item.isHidden))
 
-        const result = await apiRequest<CloudCreateResponse>('/clouds', {
+        await apiRequest<CloudCreateResponse>('/cloud', {
           method: 'POST',
           body: form,
         })
-        if (result.unlocked_badge) {
-          const badge = result.unlocked_badge
-          badges.set(badge.cloud_type_id, {
-            cloudTypeId: badge.cloud_type_id,
-            cloudName: badge.cloud_name,
-            cloudNameEn: badge.cloud_name_en,
-            rarity: badge.rarity,
-            unlockedAt: badge.unlocked_at,
-          })
-        }
         overallProgress.value = Math.round((index + 1) / items.value.length * 100)
       }
 
       clearAll()
       profileStore.invalidateUser(authStore.user.id)
-      return { ok: true, unlockedBadges: [...badges.values()] }
-    } catch {
-      return { ok: false, unlockedBadges: [] }
+      return { ok: true }
+    } catch (error) {
+      return {
+        ok: false,
+        errorMessage: error instanceof Error ? error.message : '上传失败，请稍后重试',
+      }
     } finally {
       uploading.value = false
     }
diff --git a/src/lib/api.ts b/src/lib/api.ts
index dfc90b7..091f6e9 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -1,14 +1,17 @@
-import type { AuthResponse } from '@/types/api'
+import type {
+  ApiCloud,
+  AuthUser,
+  BackendCloudInfo,
+  BackendCloudType,
+  BackendUserProfile,
+} from '@/types/api'
+import type { CloudType } from '@/types/database'
 
-const DEFAULT_API_URL = 'http://localhost:8000/api/v1'
+const DEFAULT_API_URL = 'http://localhost:3000'
 
 export const API_URL = (import.meta.env.VITE_API_URL || DEFAULT_API_URL).replace(/\/$/, '')
-export const AUTH_UPDATED_EVENT = 'opencloud:auth-updated'
 export const AUTH_EXPIRED_EVENT = 'opencloud:auth-expired'
 
-let accessToken: string | null = null
-let refreshPromise: Promise<AuthResponse> | null = null
-
 export class ApiError extends Error {
   status: number
   detail: unknown
@@ -24,6 +27,8 @@ export class ApiError extends Error {
 interface ApiRequestOptions extends Omit<RequestInit, 'body'> {
   body?: BodyInit | Record<string, unknown> | null
   auth?: boolean
+  // Kept for callers that explicitly disable retries. Cookie sessions do not
+  // use a refresh-and-retry flow, so this option is intentionally ignored.
   retry?: boolean
 }
 
@@ -36,43 +41,71 @@ function isJsonBody(body: ApiRequestOptions['body']): body is Record<string, unk
     && !(body instanceof ArrayBuffer)
 }
 
-function detailToMessage(detail: unknown, fallback: string) {
-  if (typeof detail === 'string') return detail
-  if (Array.isArray(detail)) {
-    const messages = detail
-      .map(item => item && typeof item === 'object' && 'msg' in item ? String(item.msg) : '')
+function validationMessage(value: unknown) {
+  if (typeof value !== 'string') return ''
+
+  try {
+    const issues = JSON.parse(value) as unknown
+    if (!Array.isArray(issues)) return value
+    const messages = issues
+      .map(issue => issue && typeof issue === 'object' && 'message' in issue ? String(issue.message) : '')
       .filter(Boolean)
-    if (messages.length) return messages.join('；')
+    return messages.join('；') || value
+  } catch {
+    return value
   }
+}
+
+function errorMessage(payload: unknown, fallback: string) {
+  if (!payload || typeof payload !== 'object') return fallback
+
+  if ('detail' in payload) {
+    const detail = payload.detail
+    if (typeof detail === 'string') return detail
+    if (Array.isArray(detail)) {
+      const messages = detail
+        .map(item => item && typeof item === 'object' && 'msg' in item ? String(item.msg) : '')
+        .filter(Boolean)
+      if (messages.length) return messages.join('；')
+    }
+  }
+
+  if ('error' in payload) {
+    const error = payload.error
+    if (typeof error === 'string') return error
+    if (error && typeof error === 'object' && 'message' in error) {
+      return validationMessage(error.message) || fallback
+    }
+  }
+
   return fallback
 }
 
-async function toApiError(response: Response) {
-  let detail: unknown
+async function readPayload(response: Response) {
+  const text = await response.text()
+  if (!text) return undefined
+
+  const contentType = response.headers.get('content-type') || ''
+  if (!contentType.includes('json')) return text
+
   try {
-    const payload = await response.json() as { detail?: unknown }
-    detail = payload.detail
+    return JSON.parse(text) as unknown
   } catch {
-    detail = undefined
+    return text
   }
-
-  return new ApiError(
-    detailToMessage(detail, `请求失败（${response.status}）`),
-    response.status,
-    detail,
-  )
 }
 
-export function setAccessToken(token: string | null) {
-  accessToken = token
-}
+async function toApiError(response: Response) {
+  const payload = await readPayload(response)
+  const fallback = typeof payload === 'string' && payload.trim()
+    ? payload.trim()
+    : `请求失败（${response.status}）`
 
-export function clearAccessToken() {
-  accessToken = null
+  return new ApiError(errorMessage(payload, fallback), response.status, payload)
 }
 
 async function request<T>(path: string, options: ApiRequestOptions = {}) {
-  const { body, auth = true, retry = true, ...requestOptions } = options
+  const { body, auth = true, retry: _retry, ...requestOptions } = options
   const headers = new Headers(requestOptions.headers)
   let requestBody: BodyInit | null | undefined = body as BodyInit | null | undefined
 
@@ -81,10 +114,6 @@ async function request<T>(path: string, options: ApiRequestOptions = {}) {
     requestBody = JSON.stringify(body)
   }
 
-  if (auth && accessToken) {
-    headers.set('Authorization', `Bearer ${accessToken}`)
-  }
-
   const response = await fetch(`${API_URL}${path}`, {
     ...requestOptions,
     body: requestBody,
@@ -92,43 +121,77 @@ async function request<T>(path: string, options: ApiRequestOptions = {}) {
     credentials: 'include',
   })
 
-  if (response.status === 401 && auth && accessToken && retry) {
-    try {
-      const authResponse = await refreshSession()
-      window.dispatchEvent(new CustomEvent<AuthResponse>(AUTH_UPDATED_EVENT, { detail: authResponse }))
-      return request<T>(path, { ...options, retry: false })
-    } catch {
-      clearAccessToken()
-      window.dispatchEvent(new Event(AUTH_EXPIRED_EVENT))
-    }
+  if (response.status === 401 && auth && typeof window !== 'undefined') {
+    window.dispatchEvent(new Event(AUTH_EXPIRED_EVENT))
   }
 
   if (!response.ok) throw await toApiError(response)
-  if (response.status === 204) return undefined as T
-
-  return response.json() as Promise<T>
+  return await readPayload(response) as T
 }
 
 export function apiRequest<T>(path: string, options: ApiRequestOptions = {}) {
   return request<T>(path, options)
 }
 
-export function refreshSession() {
-  if (!refreshPromise) {
-    refreshPromise = (async () => {
-      const response = await fetch(`${API_URL}/auth/refresh`, {
-        method: 'POST',
-        credentials: 'include',
-      })
-      if (!response.ok) throw await toApiError(response)
-
-      const authResponse = await response.json() as AuthResponse
-      setAccessToken(authResponse.access_token)
-      return authResponse
-    })().finally(() => {
-      refreshPromise = null
-    })
-  }
-
-  return refreshPromise
+export function imageUrl(id: string, variant: 'preview' | 'original' = 'preview') {
+  return `${API_URL}/image/${encodeURIComponent(id)}/${variant}`
+}
+
+export function toAuthUser(profile: BackendUserProfile): AuthUser {
+  return {
+    id: profile.id,
+    email: profile.email,
+    username: profile.name,
+    avatar_id: profile.avatar_id,
+    role: profile.role,
+    is_disabled: profile.is_disabled,
+    cloud_count: profile.cloud_count,
+    received_like_count: profile.received_like_count,
+    created_at: profile.created_at,
+  }
+}
+
+export function toCloudType(row: BackendCloudType): CloudType {
+  return {
+    id: row.id,
+    name: row.name,
+    genus: row.genus || '',
+    icon_id: row.icon_id,
+    // Compatibility value for the excluded legacy admin view. Migrated pages
+    // display rarity_value directly because API.md defines no semantic mapping.
+    rarity: 'common',
+    rarity_value: row.rarity,
+    description: row.description,
+    created_at: row.created_at,
+  }
+}
+
+export function toApiCloud(row: BackendCloudInfo): ApiCloud {
+  return {
+    id: row.id,
+    user_id: row.owner.id,
+    cloud_type_id: row.type.id,
+    image_url: imageUrl(row.id, 'original'),
+    thumbnail_url: imageUrl(row.id, 'preview'),
+    latitude: row.latitude,
+    longitude: row.longitude,
+    description: row.description,
+    captured_at: row.captured_at,
+    status: row.status,
+    is_hidden: row.is_hidden,
+    created_at: row.uploaded_at,
+    updated_at: row.updated_at,
+    cloud_type: {
+      id: row.type.id,
+      name: row.type.name,
+      rarity: 'common',
+      rarity_value: row.type.rarity,
+    },
+    owner: { id: row.owner.id, username: row.owner.name },
+    cloud_type_name: row.type.name,
+    cloud_type_rarity: 'common',
+    cloud_type_rarity_value: row.type.rarity,
+    username: row.owner.name,
+    received_like_count: row.received_like_count,
+  }
 }
diff --git a/src/lib/canvas.ts b/src/lib/canvas.ts
deleted file mode 100644
index 4190083..0000000
--- a/src/lib/canvas.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-const PATCH_FLAG = '__openCloudWillReadFrequentlyPatched__'
-
-type CanvasLikePrototype = {
-  getContext?: (contextId: string, options?: unknown) => unknown
-  [PATCH_FLAG]?: boolean
-}
-
-function patch2DContextOptions(ctor: typeof HTMLCanvasElement | typeof OffscreenCanvas | undefined) {
-  const prototype = ctor?.prototype as CanvasLikePrototype | undefined
-  if (!prototype?.getContext || prototype[PATCH_FLAG]) return
-
-  const originalGetContext = prototype.getContext
-
-  prototype.getContext = function getContextWithReadHint(contextId: string, options?: unknown) {
-    if (contextId === '2d') {
-      const nextOptions =
-        options && typeof options === 'object'
-          ? { ...options as Record<string, unknown>, willReadFrequently: true }
-          : { willReadFrequently: true }
-
-      return originalGetContext.call(this, contextId, nextOptions)
-    }
-
-    return originalGetContext.call(this, contextId, options)
-  }
-
-  prototype[PATCH_FLAG] = true
-}
-
-export function enableCanvasReadbackHint() {
-  if (typeof window === 'undefined') return
-
-  patch2DContextOptions(window.HTMLCanvasElement)
-  if (typeof window.OffscreenCanvas !== 'undefined') {
-    patch2DContextOptions(window.OffscreenCanvas)
-  }
-}
diff --git a/src/lib/cloudBadges.ts b/src/lib/cloudBadges.ts
deleted file mode 100644
index b8a406a..0000000
--- a/src/lib/cloudBadges.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-export type BadgeRarity = 'common' | 'uncommon' | 'rare'
-
-export interface CloudBadgeCardInput {
-  cloudName: string
-  cloudNameEn: string
-  unlockedAt: string
-  username: string
-  rarity: BadgeRarity
-}
-
-const rarityTheme = {
-  common: {
-    from: '#dbeafe',
-    to: '#f8fafc',
-    accent: '#0284c7',
-    shadow: 'rgba(2, 132, 199, 0.18)',
-  },
-  uncommon: {
-    from: '#fef3c7',
-    to: '#fff7ed',
-    accent: '#d97706',
-    shadow: 'rgba(217, 119, 6, 0.22)',
-  },
-  rare: {
-    from: '#fee2e2',
-    to: '#fff7ed',
-    accent: '#dc2626',
-    shadow: 'rgba(220, 38, 38, 0.22)',
-  },
-} satisfies Record<BadgeRarity, { from: string; to: string; accent: string; shadow: string }>
-
-function formatDate(iso: string) {
-  return new Date(iso).toLocaleDateString('zh-CN', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-  })
-}
-
-function makeDownloadName(name: string) {
-  return `opencloud-badge-${name}.png`
-}
-
-export async function downloadCloudBadgeCard(input: CloudBadgeCardInput) {
-  const canvas = document.createElement('canvas')
-  canvas.width = 1200
-  canvas.height = 630
-
-  const ctx = canvas.getContext('2d')
-  if (!ctx) return
-
-  const theme = rarityTheme[input.rarity]
-  const gradient = ctx.createLinearGradient(0, 0, canvas.width, canvas.height)
-  gradient.addColorStop(0, theme.from)
-  gradient.addColorStop(1, theme.to)
-
-  ctx.fillStyle = gradient
-  ctx.fillRect(0, 0, canvas.width, canvas.height)
-
-  ctx.fillStyle = 'rgba(255,255,255,0.72)'
-  ctx.beginPath()
-  ctx.arc(1010, 120, 140, 0, Math.PI * 2)
-  ctx.fill()
-
-  ctx.fillStyle = 'rgba(255,255,255,0.45)'
-  ctx.beginPath()
-  ctx.arc(160, 520, 180, 0, Math.PI * 2)
-  ctx.fill()
-
-  ctx.fillStyle = '#0f172a'
-  ctx.font = '700 44px sans-serif'
-  ctx.fillText('OpenCloud 云朵图鉴', 72, 88)
-
-  ctx.fillStyle = 'rgba(15, 23, 42, 0.62)'
-  ctx.font = '400 24px sans-serif'
-  ctx.fillText('新徽章已解锁', 72, 126)
-
-  ctx.shadowColor = theme.shadow
-  ctx.shadowBlur = 28
-  ctx.fillStyle = '#ffffff'
-  ctx.beginPath()
-  ctx.roundRect(72, 170, 1056, 380, 32)
-  ctx.fill()
-  ctx.shadowBlur = 0
-
-  ctx.fillStyle = theme.accent
-  ctx.beginPath()
-  ctx.arc(210, 360, 92, 0, Math.PI * 2)
-  ctx.fill()
-
-  ctx.fillStyle = '#ffffff'
-  ctx.font = '700 82px sans-serif'
-  ctx.textAlign = 'center'
-  ctx.textBaseline = 'middle'
-  ctx.fillText(input.cloudName.slice(0, 1), 210, 360)
-
-  ctx.textAlign = 'left'
-  ctx.textBaseline = 'alphabetic'
-  ctx.fillStyle = '#0f172a'
-  ctx.font = '700 64px sans-serif'
-  ctx.fillText(input.cloudName, 340, 300)
-
-  ctx.fillStyle = 'rgba(15, 23, 42, 0.62)'
-  ctx.font = '400 30px sans-serif'
-  ctx.fillText(input.cloudNameEn, 340, 346)
-
-  ctx.fillStyle = theme.accent
-  ctx.beginPath()
-  ctx.roundRect(340, 382, 168, 48, 24)
-  ctx.fill()
-
-  ctx.fillStyle = '#ffffff'
-  ctx.font = '600 24px sans-serif'
-  ctx.fillText(input.rarity === 'common' ? '常见' : input.rarity === 'uncommon' ? '少见' : '罕见', 384, 414)
-
-  ctx.fillStyle = '#334155'
-  ctx.font = '400 28px sans-serif'
-  ctx.fillText(`解锁者：${input.username}`, 340, 476)
-  ctx.fillText(`解锁日期：${formatDate(input.unlockedAt)}`, 340, 518)
-
-  const blob = await new Promise<Blob | null>(resolve => canvas.toBlob(resolve, 'image/png'))
-  if (!blob) return
-
-  const url = URL.createObjectURL(blob)
-  const link = document.createElement('a')
-  link.href = url
-  link.download = makeDownloadName(input.cloudNameEn.toLowerCase())
-  link.click()
-  URL.revokeObjectURL(url)
-}
diff --git a/src/lib/cloudTypes.ts b/src/lib/cloudTypes.ts
index a39464d..94b8821 100644
--- a/src/lib/cloudTypes.ts
+++ b/src/lib/cloudTypes.ts
@@ -1,14 +1,14 @@
 export const CLOUD_TYPES = [
-  { id: 1, name: '积云', nameEn: 'Cumulus' },
-  { id: 2, name: '层云', nameEn: 'Stratus' },
-  { id: 3, name: '卷云', nameEn: 'Cirrus' },
-  { id: 4, name: '积雨云', nameEn: 'Cumulonimbus' },
-  { id: 5, name: '层积云', nameEn: 'Stratocumulus' },
-  { id: 6, name: '高积云', nameEn: 'Altocumulus' },
-  { id: 7, name: '高层云', nameEn: 'Altostratus' },
-  { id: 8, name: '雨层云', nameEn: 'Nimbostratus' },
-  { id: 9, name: '卷层云', nameEn: 'Cirrostratus' },
-  { id: 10, name: '卷积云', nameEn: 'Cirrocumulus' },
+  { id: 1, name: '积云' },
+  { id: 2, name: '层云' },
+  { id: 3, name: '卷云' },
+  { id: 4, name: '积雨云' },
+  { id: 5, name: '层积云' },
+  { id: 6, name: '高积云' },
+  { id: 7, name: '高层云' },
+  { id: 8, name: '雨层云' },
+  { id: 9, name: '卷层云' },
+  { id: 10, name: '卷积云' },
 ] as const
 
 export function getCloudTypeName(id: string | string[]) {
diff --git a/src/main.ts b/src/main.ts
index 8cc76a3..16d5621 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,11 +3,8 @@ import { createPinia } from 'pinia'
 import App from './App.vue'
 import router from './router'
 import { useAuthStore } from './stores/auth'
-import { enableCanvasReadbackHint } from './lib/canvas'
 import './style.css'
 
-enableCanvasReadbackHint()
-
 const app = createApp(App)
 const pinia = createPinia()
 app.use(pinia)
diff --git a/src/router/index.ts b/src/router/index.ts
index 2088a9c..b57f7ba 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -27,6 +27,12 @@ const router = createRouter({
       component: () => import('@/views/auth/RegisterView.vue'),
       meta: { title: '注册', noindex: true },
     },
+    {
+      path: '/resend-confirmation',
+      name: 'resend-confirmation',
+      component: () => import('@/views/auth/ResendConfirmationView.vue'),
+      meta: { title: '重发验证邮件', noindex: true },
+    },
     {
       path: '/forgot-password',
       name: 'forgot-password',
@@ -34,13 +40,15 @@ const router = createRouter({
       meta: { title: '忘记密码', noindex: true },
     },
     {
-      path: '/auth/confirm',
+      path: '/verify-email',
+      alias: '/auth/confirm',
       name: 'auth-confirm',
       component: () => import('@/views/auth/AuthConfirmView.vue'),
       meta: { title: '确认邮箱', noindex: true },
     },
     {
-      path: '/auth/reset-password',
+      path: '/reset-password',
+      alias: '/auth/reset-password',
       name: 'auth-reset-password',
       component: () => import('@/views/auth/ResetPasswordView.vue'),
       meta: { title: '重置密码', noindex: true },
@@ -57,8 +65,8 @@ const router = createRouter({
       component: () => import('@/views/encyclopedia/EncyclopediaView.vue'),
       meta: {
         requiresAuth: true,
-        title: '云朵图鉴',
-        description: '浏览 10 种基础云属，了解云型特征，并通过拍摄云图点亮个人图鉴。',
+        title: '云朵百科',
+        description: '浏览基础云属，了解云型特征和社区公开观测记录。',
         noindex: true,
       },
     },
@@ -109,7 +117,7 @@ const router = createRouter({
       component: () => import('@/views/profile/ProfileView.vue'),
       meta: {
         title: '用户云图档案',
-        description: '查看用户公开分享的云图记录、图鉴进度和拍摄时间线。',
+        description: '按用户名查看用户公开分享的云图记录和拍摄时间线。',
       },
     },
     {
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index ef9547a..df4def1 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -1,61 +1,92 @@
 import { computed, ref } from 'vue'
 import { defineStore } from 'pinia'
-import {
-  AUTH_EXPIRED_EVENT,
-  AUTH_UPDATED_EVENT,
-  apiRequest,
-  clearAccessToken,
-  refreshSession,
-  setAccessToken,
-} from '@/lib/api'
-import type { AuthResponse, AuthUser } from '@/types/api'
+import { AUTH_EXPIRED_EVENT, apiRequest, toAuthUser } from '@/lib/api'
+import type { ActionResponse, BackendUserProfile, LoginResponse, RegisterResponse } from '@/types/api'
 import type { Profile } from '@/types/database'
 
 export const useAuthStore = defineStore('auth', () => {
-  const user = ref<AuthUser | null>(null)
+  const user = ref<ReturnType<typeof toAuthUser> | null>(null)
   const profile = ref<Profile | null>(null)
   const loading = ref(true)
-  let listenersAttached = false
+  let listenerAttached = false
 
   const isLoggedIn = computed(() => !!user.value)
   const isAdmin = computed(() => profile.value?.role === 'admin')
 
-  function applyAuth(auth: AuthResponse) {
-    setAccessToken(auth.access_token)
-    user.value = auth.user
+  function applyProfile(backendProfile: BackendUserProfile) {
+    const normalized = toAuthUser(backendProfile)
+    user.value = normalized
     profile.value = {
-      id: auth.user.id,
-      username: auth.user.username,
-      avatar_url: auth.user.avatar_url,
-      role: auth.user.role,
-      is_disabled: auth.user.is_disabled,
-      created_at: auth.user.created_at,
+      id: normalized.id,
+      username: normalized.username,
+      avatar_id: normalized.avatar_id,
+      role: normalized.role,
+      is_disabled: normalized.is_disabled,
+      created_at: normalized.created_at,
     }
   }
 
   function clearAuth() {
-    clearAccessToken()
     user.value = null
     profile.value = null
   }
 
+  async function fetchMe() {
+    const backendProfile = await apiRequest<BackendUserProfile>('/profile/me')
+    applyProfile(backendProfile)
+  }
+
   async function login(email: string, password: string) {
-    const auth = await apiRequest<AuthResponse>('/auth/login', {
+    await apiRequest<LoginResponse>('/auth/login', {
       method: 'POST',
       auth: false,
       body: { email, password },
     })
-    applyAuth(auth)
+    await fetchMe()
   }
 
-  async function register(email: string, password: string, username: string) {
-    await apiRequest('/auth/register', {
+  async function register(name: string, email: string, password: string) {
+    return await apiRequest<RegisterResponse>('/auth/register', {
       method: 'POST',
       auth: false,
-      body: { email, password, username },
+      body: { name, email, password },
     })
   }
 
+  async function resendConfirmation(email: string) {
+    return await apiRequest<ActionResponse>('/auth/resend-confirmation', {
+      method: 'POST',
+      auth: false,
+      body: { email },
+    })
+  }
+
+  async function confirmEmail(token: string) {
+    return await apiRequest<ActionResponse>('/auth/confirm-email', {
+      method: 'POST',
+      auth: false,
+      body: { token },
+    })
+  }
+
+  async function sendPasswordReset(email: string) {
+    return await apiRequest<ActionResponse>('/auth/forgot-password', {
+      method: 'POST',
+      auth: false,
+      body: { email },
+    })
+  }
+
+  async function resetPassword(email: string, token: string, newPassword: string) {
+    const response = await apiRequest<ActionResponse>('/auth/reset-password', {
+      method: 'POST',
+      auth: false,
+      body: { email, token, new_password: newPassword },
+    })
+    clearAuth()
+    return response
+  }
+
   async function logout() {
     try {
       await apiRequest('/auth/logout', { method: 'POST', retry: false })
@@ -65,48 +96,32 @@ export const useAuthStore = defineStore('auth', () => {
   }
 
   async function updateUsername(username: string) {
-    const updatedUser = await apiRequest<AuthUser>('/profiles/me', {
+    const backendProfile = await apiRequest<BackendUserProfile>('/profile/me', {
       method: 'PATCH',
-      body: { username },
+      body: { user_name: username },
     })
-    user.value = updatedUser
-    profile.value = {
-      id: updatedUser.id,
-      username: updatedUser.username,
-      avatar_url: updatedUser.avatar_url,
-      role: updatedUser.role,
-      is_disabled: updatedUser.is_disabled,
-      created_at: updatedUser.created_at,
-    }
+    applyProfile(backendProfile)
   }
 
-  async function updatePassword(password: string) {
-    const auth = await apiRequest<AuthResponse>('/auth/password', {
+  async function updatePassword(currentPassword: string, newPassword: string) {
+    await apiRequest('/auth/password', {
       method: 'PATCH',
-      body: { password },
-    })
-    applyAuth(auth)
-  }
-
-  async function sendPasswordReset(email: string) {
-    await apiRequest('/auth/forgot-password', {
-      method: 'POST',
-      auth: false,
-      body: { email },
+      body: {
+        current_password: currentPassword,
+        new_password: newPassword,
+      },
     })
+    clearAuth()
   }
 
   async function initialize() {
-    if (!listenersAttached) {
-      window.addEventListener(AUTH_UPDATED_EVENT, event => {
-        applyAuth((event as CustomEvent<AuthResponse>).detail)
-      })
+    if (!listenerAttached) {
       window.addEventListener(AUTH_EXPIRED_EVENT, clearAuth)
-      listenersAttached = true
+      listenerAttached = true
     }
 
     try {
-      applyAuth(await refreshSession())
+      await fetchMe()
     } catch {
       clearAuth()
     } finally {
@@ -122,10 +137,13 @@ export const useAuthStore = defineStore('auth', () => {
     isAdmin,
     login,
     register,
+    resendConfirmation,
+    confirmEmail,
+    sendPasswordReset,
+    resetPassword,
     logout,
     updateUsername,
     updatePassword,
-    sendPasswordReset,
     initialize,
   }
 })
diff --git a/src/stores/clouds.ts b/src/stores/clouds.ts
index bd36ec6..04ef585 100644
--- a/src/stores/clouds.ts
+++ b/src/stores/clouds.ts
@@ -1,6 +1,7 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
-import { apiRequest } from '@/lib/api'
+import { apiRequest, toCloudType } from '@/lib/api'
+import type { BackendCloudType } from '@/types/api'
 import type { CloudType } from '@/types/database'
 
 export const useCloudsStore = defineStore('clouds', () => {
@@ -11,7 +12,8 @@ export const useCloudsStore = defineStore('clouds', () => {
     if (cloudTypes.value.length > 0) return
     loading.value = true
     try {
-      cloudTypes.value = await apiRequest<CloudType[]>('/cloud-types', { auth: false })
+      const rows = await apiRequest<BackendCloudType[]>('/info/cloudtype', { auth: false })
+      cloudTypes.value = rows.map(toCloudType)
     } finally {
       loading.value = false
     }
diff --git a/src/stores/encyclopedia.ts b/src/stores/encyclopedia.ts
index e64f14d..bff48dc 100644
--- a/src/stores/encyclopedia.ts
+++ b/src/stores/encyclopedia.ts
@@ -1,104 +1,29 @@
-import { computed, ref } from 'vue'
+import { ref } from 'vue'
 import { defineStore } from 'pinia'
-import { apiRequest } from '@/lib/api'
-import { useAuthStore } from '@/stores/auth'
-import type { ApiCollection } from '@/types/api'
-import type { CloudType, UserCollection } from '@/types/database'
-
-export interface CollectionPreviewCloud {
-  id: string
-  image_url: string
-  thumbnail_url: string | null
-  captured_at: string | null
-  created_at: string
-  location_name: string | null
-}
-
-export interface CollectionEntry extends UserCollection {
-  firstCloud: CollectionPreviewCloud | null
-}
-
-function getErrorMessage(error: unknown) {
-  return error instanceof Error ? error.message : '图鉴收藏加载失败'
-}
+import { apiRequest, toCloudType } from '@/lib/api'
+import type { BackendCloudType } from '@/types/api'
+import type { CloudType } from '@/types/database'
 
 export const useEncyclopediaStore = defineStore('encyclopedia', () => {
-  const authStore = useAuthStore()
-
   const cloudTypes = ref<CloudType[]>([])
-  const myCollection = ref<CollectionEntry[]>([])
   const loadingCloudTypes = ref(false)
-  const loadingCollection = ref(false)
   const cloudTypesLoaded = ref(false)
-  const collectionLoadedForUserId = ref<string | null>(null)
-  const collectionError = ref('')
-
-  const collectionMap = computed(() => new Map(myCollection.value.map(item => [item.cloud_type_id, item])))
-  const unlockedCount = computed(() => myCollection.value.length)
-  const unlockProgress = computed(() => `${unlockedCount.value}/${cloudTypes.value.length || 10}`)
-  const unlockPercent = computed(() => cloudTypes.value.length
-    ? Math.round(unlockedCount.value / cloudTypes.value.length * 100)
-    : 0)
 
   async function fetchCloudTypes(force = false) {
     if (cloudTypesLoaded.value && !force) return
     loadingCloudTypes.value = true
     try {
-      cloudTypes.value = await apiRequest<CloudType[]>('/cloud-types', { auth: false })
+      const rows = await apiRequest<BackendCloudType[]>('/info/cloudtype', { auth: false })
+      cloudTypes.value = rows.map(toCloudType)
       cloudTypesLoaded.value = true
     } finally {
       loadingCloudTypes.value = false
     }
   }
 
-  async function fetchMyCollection(force = false) {
-    const userId = authStore.user?.id ?? null
-    if (!userId) {
-      myCollection.value = []
-      collectionLoadedForUserId.value = null
-      collectionError.value = ''
-      return
-    }
-    if (!force && collectionLoadedForUserId.value === userId) return
-
-    loadingCollection.value = true
-    collectionError.value = ''
-    try {
-      const rows = await apiRequest<ApiCollection[]>('/collections/me')
-      myCollection.value = rows.map(({ first_cloud, cloud_type: _cloudType, ...collection }) => ({
-        ...collection,
-        firstCloud: first_cloud,
-      }))
-      collectionLoadedForUserId.value = userId
-    } catch (error) {
-      myCollection.value = []
-      collectionLoadedForUserId.value = userId
-      collectionError.value = getErrorMessage(error)
-    } finally {
-      loadingCollection.value = false
-    }
-  }
-
-  function isUnlocked(cloudTypeId: number) {
-    return collectionMap.value.has(cloudTypeId)
-  }
-
-  function getCollectionEntry(cloudTypeId: number) {
-    return collectionMap.value.get(cloudTypeId) ?? null
-  }
-
   return {
     cloudTypes,
-    myCollection,
     loadingCloudTypes,
-    loadingCollection,
-    collectionError,
-    unlockedCount,
-    unlockProgress,
-    unlockPercent,
     fetchCloudTypes,
-    fetchMyCollection,
-    isUnlocked,
-    getCollectionEntry,
   }
 })
diff --git a/src/stores/profile.ts b/src/stores/profile.ts
index f6e3646..c3822e2 100644
--- a/src/stores/profile.ts
+++ b/src/stores/profile.ts
@@ -1,124 +1,118 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
-import { apiRequest } from '@/lib/api'
+import { ApiError, apiRequest, toApiCloud } from '@/lib/api'
 import { useAuthStore } from '@/stores/auth'
-import type { ApiCloud, ApiPage, LikeStats, PublicProfile } from '@/types/api'
-import type { CloudType, Profile } from '@/types/database'
+import type { ActionResponse, ApiCloud, BackendCloudInfo } from '@/types/api'
+import type { Profile } from '@/types/database'
 
 export interface ProfileCloudItem {
   id: string
-  cloud_type_id: number | null
-  custom_cloud_type: string | null
+  cloud_type_id: number
   image_url: string
-  thumbnail_url: string | null
-  latitude: number | null
-  longitude: number | null
-  location_name: string | null
+  thumbnail_url: string
+  latitude: number
+  longitude: number
   description: string | null
   captured_at: string | null
   created_at: string
   status: 'pending' | 'approved' | 'rejected'
   is_hidden: boolean
   cloudTypeName: string
-  cloudTypeRarity: CloudType['rarity']
-  favoriteCount: number
-  isFavorited: boolean
+  cloudTypeRarity: number
+  receivedLikeCount: number
 }
 
 function toProfileCloud(row: ApiCloud): ProfileCloudItem {
   return {
     id: row.id,
-    cloud_type_id: row.cloud_type_id,
-    custom_cloud_type: row.custom_cloud_type,
+    cloud_type_id: row.cloud_type_id as number,
     image_url: row.image_url,
-    thumbnail_url: row.thumbnail_url,
-    latitude: row.latitude,
-    longitude: row.longitude,
-    location_name: row.location_name,
+    thumbnail_url: row.thumbnail_url as string,
+    latitude: row.latitude as number,
+    longitude: row.longitude as number,
     description: row.description,
     captured_at: row.captured_at,
     created_at: row.created_at,
     status: row.status,
     is_hidden: row.is_hidden,
-    cloudTypeName: row.cloud_type_name || row.custom_cloud_type || '未知',
-    cloudTypeRarity: row.cloud_type_rarity || 'common',
-    favoriteCount: row.favorite_count,
-    isFavorited: row.is_favorited,
-  }
-}
-
-function toProfile(profile: PublicProfile): Profile {
-  return {
-    ...profile,
-    role: 'user',
-    is_disabled: false,
+    cloudTypeName: row.cloud_type_name || '未知',
+    cloudTypeRarity: row.cloud_type_rarity_value ?? 0,
+    receivedLikeCount: row.received_like_count,
   }
 }
 
 export const useProfileStore = defineStore('profile-page', () => {
   const authStore = useAuthStore()
-  const profilesById = ref<Record<string, Profile>>({})
+  const profilesByKey = ref<Record<string, Profile>>({})
   const cloudsByKey = ref<Record<string, ProfileCloudItem[]>>({})
-  const likeStatsByUserId = ref<Record<string, LikeStats>>({})
   const loadingKeys = ref<Record<string, boolean>>({})
   const errorByKey = ref<Record<string, string>>({})
 
-  const makeKey = (userId: string, isOwnProfile: boolean) => `${userId}:${isOwnProfile ? 'own' : 'public'}`
+  const makeKey = (identifier: string, isOwnProfile: boolean) => `${identifier}:${isOwnProfile ? 'own' : 'public'}`
 
-  function getProfile(userId: string | null) {
-    return userId ? profilesById.value[userId] ?? null : null
+  function getProfile(identifier: string | null) {
+    return identifier ? profilesByKey.value[identifier] ?? null : null
   }
 
-  function getClouds(userId: string | null, isOwnProfile: boolean) {
-    return userId ? cloudsByKey.value[makeKey(userId, isOwnProfile)] ?? [] : []
+  function getClouds(identifier: string | null, isOwnProfile: boolean) {
+    return identifier ? cloudsByKey.value[makeKey(identifier, isOwnProfile)] ?? [] : []
   }
 
-  function getLikeStats(userId: string | null) {
-    return userId ? likeStatsByUserId.value[userId] ?? null : null
+  function getError(identifier: string | null, isOwnProfile: boolean) {
+    return identifier ? errorByKey.value[makeKey(identifier, isOwnProfile)] ?? '' : ''
   }
 
-  function getError(userId: string | null, isOwnProfile: boolean) {
-    return userId ? errorByKey.value[makeKey(userId, isOwnProfile)] ?? '' : ''
+  function isLoaded(identifier: string | null, isOwnProfile: boolean) {
+    return !!identifier && makeKey(identifier, isOwnProfile) in cloudsByKey.value
   }
 
-  function isLoaded(userId: string | null, isOwnProfile: boolean) {
-    return !!userId && makeKey(userId, isOwnProfile) in cloudsByKey.value
+  async function fetchAllPublicClouds(username: string) {
+    const rows: BackendCloudInfo[] = []
+    for (let page = 1; ; page++) {
+      const params = new URLSearchParams({
+        page: String(page),
+        page_size: '100',
+        filter: 'owner',
+        value: `@${username}`,
+      })
+      let current: BackendCloudInfo[]
+      try {
+        current = await apiRequest<BackendCloudInfo[]>(`/cloud?${params}`, { auth: false })
+      } catch (error) {
+        if (error instanceof ApiError && error.status === 404) return rows
+        throw error
+      }
+      rows.push(...current)
+      if (current.length < 100) return rows
+    }
   }
 
-  async function fetchAllClouds(userId: string, isOwnProfile: boolean) {
-    const requestOptions = { auth: isOwnProfile }
-    const first = await apiRequest<ApiPage<ApiCloud>>(`/profiles/${userId}/clouds?page=1&page_size=100`, requestOptions)
-    if (first.total_pages <= 1) return first.items
-
-    const remaining = await Promise.all(
-      Array.from({ length: first.total_pages - 1 }, (_, index) =>
-        apiRequest<ApiPage<ApiCloud>>(`/profiles/${userId}/clouds?page=${index + 2}&page_size=100`, requestOptions),
-      ),
-    )
-    return [first, ...remaining].flatMap(page => page.items)
-  }
-
-  async function fetchProfilePage(userId: string, isOwnProfile: boolean, force = false) {
-    const key = makeKey(userId, isOwnProfile)
-    if (!force && key in cloudsByKey.value && profilesById.value[userId]) return
+  async function fetchProfilePage(identifier: string, isOwnProfile: boolean, force = false) {
+    const key = makeKey(identifier, isOwnProfile)
+    if (!force && key in cloudsByKey.value && profilesByKey.value[identifier]) return
 
     loadingKeys.value[key] = true
     errorByKey.value[key] = ''
     try {
-      const profilePromise = isOwnProfile && authStore.profile?.id === userId
-        ? Promise.resolve(authStore.profile)
-        : apiRequest<PublicProfile>(`/profiles/${userId}`, { auth: false }).then(toProfile)
-      const likeStatsPromise = isOwnProfile
-        ? apiRequest<LikeStats>('/profiles/me/like-stats')
-        : Promise.resolve(null)
-      const [profile, cloudRows, likeStats] = await Promise.all([
-        profilePromise,
-        fetchAllClouds(userId, isOwnProfile),
-        likeStatsPromise,
-      ])
-      profilesById.value[userId] = profile
-      cloudsByKey.value[key] = cloudRows.map(toProfileCloud)
-      if (likeStats) likeStatsByUserId.value[userId] = likeStats
+      const backendRows = isOwnProfile
+        ? await apiRequest<BackendCloudInfo[]>('/profile/me/clouds')
+        : await fetchAllPublicClouds(identifier)
+      const cloudRows = backendRows.map(toApiCloud).map(toProfileCloud)
+
+      if (isOwnProfile && authStore.profile) {
+        profilesByKey.value[identifier] = authStore.profile
+      } else {
+        const owner = backendRows[0]?.owner
+        profilesByKey.value[identifier] = {
+          id: owner?.id || identifier,
+          username: owner?.name || identifier,
+          avatar_id: null,
+          role: 'user',
+          is_disabled: false,
+          created_at: '',
+        }
+      }
+      cloudsByKey.value[key] = cloudRows
     } catch (error) {
       errorByKey.value[key] = error instanceof Error ? error.message : '个人主页加载失败'
       cloudsByKey.value[key] = []
@@ -127,13 +121,13 @@ export const useProfileStore = defineStore('profile-page', () => {
     }
   }
 
-  function isLoading(userId: string | null, isOwnProfile: boolean) {
-    return !!userId && !!loadingKeys.value[makeKey(userId, isOwnProfile)]
+  function isLoading(identifier: string | null, isOwnProfile: boolean) {
+    return !!identifier && !!loadingKeys.value[makeKey(identifier, isOwnProfile)]
   }
 
-  function patchCachedCloud(userId: string, cloudId: string, patch: Partial<ProfileCloudItem>) {
+  function patchCachedCloud(identifier: string, cloudId: string, patch: Partial<ProfileCloudItem>) {
     for (const isOwnProfile of [true, false]) {
-      const key = makeKey(userId, isOwnProfile)
+      const key = makeKey(identifier, isOwnProfile)
       const current = cloudsByKey.value[key]
       if (!current) continue
       cloudsByKey.value[key] = current
@@ -142,68 +136,68 @@ export const useProfileStore = defineStore('profile-page', () => {
     }
   }
 
-  function removeCachedClouds(userId: string, cloudIds: string[]) {
-    const idSet = new Set(cloudIds)
+  function removeCachedClouds(identifier: string, cloudIds: string[]) {
+    const ids = new Set(cloudIds)
     for (const isOwnProfile of [true, false]) {
-      const key = makeKey(userId, isOwnProfile)
+      const key = makeKey(identifier, isOwnProfile)
       const current = cloudsByKey.value[key]
-      if (current) cloudsByKey.value[key] = current.filter(item => !idSet.has(item.id))
+      if (current) cloudsByKey.value[key] = current.filter(item => !ids.has(item.id))
     }
   }
 
-  function invalidateUser(userId: string) {
-    delete cloudsByKey.value[makeKey(userId, true)]
-    delete cloudsByKey.value[makeKey(userId, false)]
+  function invalidateUser(identifier: string) {
+    delete cloudsByKey.value[makeKey(identifier, true)]
+    delete cloudsByKey.value[makeKey(identifier, false)]
   }
 
-  async function updateCloud(userId: string, cloudId: string, patch: {
-    cloud_type_id: number | null
-    custom_cloud_type: string | null
-    latitude: number | null
-    longitude: number | null
-    location_name: string | null
-    description: string | null
-    captured_at: string | null
+  async function updateCloud(identifier: string, cloudId: string, patch: {
+    type_id: number
+    latitude: number
+    longitude: number
+    description?: string
+    captured_at?: string
     is_hidden: boolean
   }) {
-    const updated = toProfileCloud(await apiRequest<ApiCloud>(`/clouds/${cloudId}`, {
+    await apiRequest<ActionResponse>(`/cloud/${cloudId}`, {
       method: 'PATCH',
       body: patch,
-    }))
-    patchCachedCloud(userId, cloudId, updated)
+    })
+    const updated = toProfileCloud(toApiCloud(await apiRequest<BackendCloudInfo>(`/cloud/${cloudId}`)))
+    patchCachedCloud(identifier, cloudId, updated)
     return updated
   }
 
-  async function updateCloudVisibility(userId: string, cloudId: string, isHidden: boolean) {
-    await apiRequest<ApiCloud>(`/clouds/${cloudId}`, {
+  async function updateCloudVisibility(identifier: string, cloudId: string, isHidden: boolean) {
+    await apiRequest<ActionResponse>(`/cloud/${cloudId}`, {
       method: 'PATCH',
       body: { is_hidden: isHidden },
     })
-    patchCachedCloud(userId, cloudId, { is_hidden: isHidden })
+    patchCachedCloud(identifier, cloudId, { is_hidden: isHidden })
   }
 
-  async function deleteClouds(userId: string, cloudIds: string[]) {
+  async function deleteClouds(identifier: string, cloudIds: string[]) {
     if (!cloudIds.length) return 0
 
     if (cloudIds.length === 1) {
-      await apiRequest(`/clouds/${cloudIds[0]}`, { method: 'DELETE' })
+      await apiRequest<ActionResponse>(`/cloud/${cloudIds[0]}`, { method: 'DELETE' })
     } else {
       for (let offset = 0; offset < cloudIds.length; offset += 100) {
-        await apiRequest('/clouds/batch-delete', {
-          method: 'POST',
-          body: { ids: cloudIds.slice(offset, offset + 100) },
+        await apiRequest<ActionResponse>('/cloud', {
+          method: 'DELETE',
+          body: {
+            cloud_ids: cloudIds.slice(offset, offset + 100).map(cloudId => ({ cloud_id: cloudId })),
+          },
         })
       }
     }
 
-    removeCachedClouds(userId, cloudIds)
+    removeCachedClouds(identifier, cloudIds)
     return cloudIds.length
   }
 
   return {
     getProfile,
     getClouds,
-    getLikeStats,
     getError,
     isLoaded,
     isLoading,
diff --git a/src/types/api.ts b/src/types/api.ts
index 377a390..9a96902 100644
--- a/src/types/api.ts
+++ b/src/types/api.ts
@@ -1,50 +1,84 @@
-import type { Cloud, CloudType, Profile, UserCollection } from '@/types/database'
+import type { Cloud, CloudType, Profile } from '@/types/database'
 
+export interface BackendUserProfile {
+  id: string
+  name: string
+  email: string
+  avatar_id: string | null
+  cloud_count: number
+  received_like_count: number
+  last_online: string | null
+  role: Profile['role']
+  is_disabled: boolean
+  created_at: string
+}
+
+export interface BackendCloudType {
+  id: number
+  name: string
+  genus: string | null
+  icon_id: string | null
+  rarity: number
+  description: string | null
+  created_at: string
+}
+
+export interface BackendCloudOwner {
+  id: string
+  name: string
+}
+
+export interface BackendCloudInfo {
+  id: string
+  owner: BackendCloudOwner
+  type: BackendCloudType
+  latitude: number
+  longitude: number
+  description: string | null
+  captured_at: string | null
+  uploaded_at: string
+  updated_at: string
+  received_like_count: number
+  status: Cloud['status']
+  is_hidden: boolean
+}
+
+export interface ActionResponse {
+  status_code: number
+  message: string
+}
+
+export interface RegisterResponse extends ActionResponse {
+  email_sent: boolean
+}
+
+export interface LoginResponse {
+  access_token: string
+}
+
+export interface CloudCreateResponse extends ActionResponse {
+  cloud_id: string
+}
+
+// Internal view model. The backend profile is normalized here so existing
+// layout/admin consumers do not need to understand the wire representation.
 export interface AuthUser {
   id: string
   email: string
-  email_verified: boolean
   username: string
-  avatar_url: string | null
+  avatar_id: string | null
   role: Profile['role']
   is_disabled: boolean
   cloud_count: number
-  public_cloud_count: number
-  collection_count: number
+  received_like_count: number
   created_at: string
 }
 
-export interface AuthResponse {
-  access_token: string
-  token_type: 'bearer'
-  expires_in: number
-  user: AuthUser
-}
-
-export interface MeResponse {
-  user: AuthUser
-}
-
-export interface PublicProfile {
-  id: string
-  username: string
-  avatar_url: string | null
-  created_at: string
-}
-
-export interface ApiPage<T> {
-  items: T[]
-  page: number
-  page_size: number
-  total: number
-  total_pages: number
-}
-
 export interface ApiCloudTypeSummary {
   id: number
   name: string
-  name_en: string
   rarity: CloudType['rarity']
+  rarity_value: number
 }
 
 export interface ApiCloudOwner {
@@ -58,58 +92,7 @@ export interface ApiCloud extends Cloud {
   owner: ApiCloudOwner | null
   cloud_type_name: string | null
   cloud_type_rarity: CloudType['rarity'] | null
+  cloud_type_rarity_value: number | null
   username: string | null
-  favorite_count: number
-  is_favorited: boolean
-}
-
-export interface LikeStatsPhoto {
-  cloud_id: string
-  image_url: string
-  thumbnail_url: string
-  favorite_count: number
-  captured_at: string | null
-  created_at: string
-}
-
-export interface LikeStats {
-  user_id: string
-  username: string
-  total_likes: number
-  photos: LikeStatsPhoto[]
-}
-
-export interface ApiCollection extends UserCollection {
-  cloud_type: ApiCloudTypeSummary
-  first_cloud: Pick<
-    ApiCloud,
-    'id' | 'image_url' | 'thumbnail_url' | 'captured_at' | 'created_at' | 'location_name'
-  > | null
-}
-
-export interface UnlockedBadge {
-  cloud_type_id: number
-  cloud_name: string
-  cloud_name_en: string
-  rarity: CloudType['rarity']
-  unlocked_at: string
-}
-
-export interface CloudCreateResponse {
-  cloud: ApiCloud
-  unlocked_badge: UnlockedBadge | null
-}
-
-export interface AdminStats {
-  users: number
-  images: number
-  today_uploads: number
-  pending: number
-  approved: number
-  rejected: number
-  hidden: number
-}
-
-export interface AdminUserItem {
-  user: AuthUser
+  received_like_count: number
 }
diff --git a/src/types/database.ts b/src/types/database.ts
index 3da73ec..012df05 100644
--- a/src/types/database.ts
+++ b/src/types/database.ts
@@ -1,11 +1,11 @@
 export interface CloudType {
   id: number
   name: string
-  name_en: string
   genus: string
+  icon_id: string | null
   rarity: 'common' | 'uncommon' | 'rare'
+  rarity_value: number
   description: string | null
-  icon_url: string | null
   created_at: string
 }
 
@@ -13,12 +13,10 @@ export interface Cloud {
   id: string
   user_id: string
   cloud_type_id: number | null
-  custom_cloud_type: string | null
   image_url: string
   thumbnail_url: string | null
   latitude: number | null
   longitude: number | null
-  location_name: string | null
   description: string | null
   captured_at: string | null
   status: 'pending' | 'approved' | 'rejected'
@@ -29,24 +27,8 @@ export interface Cloud {
 export interface Profile {
   id: string
   username: string
-  avatar_url: string | null
+  avatar_id: string | null
   role: 'user' | 'admin'
   is_disabled: boolean
   created_at: string
 }
-
-export interface UserCollection {
-  id: string
-  user_id: string
-  cloud_type_id: number
-  first_cloud_id: string | null
-  unlocked_at: string
-}
-
-export interface Reaction {
-  id: string
-  user_id: string
-  cloud_id: string
-  emoji: string
-  created_at: string
-}
diff --git a/src/views/admin/AdminView.vue b/src/views/admin/AdminView.vue
index 0479f19..f17eafb 100644
--- a/src/views/admin/AdminView.vue
+++ b/src/views/admin/AdminView.vue
@@ -1,14 +1,13 @@
 <script setup lang="ts">
 import { computed, onMounted, ref, watch, type Component } from 'vue'
-import { NAlert, NButton, NEmpty, NIcon, NPopover, NSkeleton, NTag, useMessage } from 'naive-ui'
+import { NAlert, NButton, NEmpty, NIcon, NInput, NPopover, NSkeleton, NTag, useMessage } from 'naive-ui'
 import {
   Check,
   ChevronUp,
   ClipboardCheck,
   Dashboard,
-  Eye,
-  EyeOff,
   Home,
+  Key,
   LayoutSidebarLeftCollapse,
   LayoutSidebarLeftExpand,
   Logout,
@@ -24,10 +23,9 @@ import {
 import { useRouter } from 'vue-router'
 import ImageDetailModal from '@/components/cloud/ImageDetailModal.vue'
 import MiniLocationMap from '@/components/cloud/MiniLocationMap.vue'
-import { apiRequest } from '@/lib/api'
+import { apiRequest, toApiCloud, toAuthUser } from '@/lib/api'
 import { useAuthStore } from '@/stores/auth'
-import type { AdminStats, AdminUserItem, ApiCloud, ApiPage } from '@/types/api'
-import type { CloudType, Profile } from '@/types/database'
+import type { ActionResponse, ApiCloud, AuthUser, BackendCloudInfo, BackendUserProfile } from '@/types/api'
 
 type AdminTab = 'dashboard' | 'review' | 'users' | 'images'
 type CloudStatus = 'pending' | 'approved' | 'rejected'
@@ -37,19 +35,17 @@ interface AdminCloud {
   id: string
   user_id: string
   cloud_type_id: number | null
-  custom_cloud_type: string | null
   image_url: string
   thumbnail_url: string | null
   latitude: number | null
   longitude: number | null
-  location_name: string | null
   description: string | null
   captured_at: string | null
   created_at: string
   status: CloudStatus
   is_hidden: boolean
   cloudTypeName: string
-  cloudTypeRarity: CloudType['rarity']
+  cloudTypeRarity: number
   username: string
 }
 
@@ -82,19 +78,17 @@ const dashboardStats = ref<DashboardStats>({
   rejected: 0,
   hidden: 0,
 })
-const users = ref<Profile[]>([])
+const users = ref<AuthUser[]>([])
 const images = ref<AdminCloud[]>([])
 const selectedReviewIds = ref<Set<string>>(new Set())
 const activeReviewId = ref<string | null>(null)
 const selectedImageIds = ref<Set<string>>(new Set())
 const imageFilter = ref<ImageFilter>('all')
 const selectedImage = ref<AdminCloud | null>(null)
-
-const rarityMeta = {
-  common: { label: '常见', chip: 'border-sky-200 bg-sky-100 text-sky-700' },
-  uncommon: { label: '少见', chip: 'border-amber-200 bg-amber-100 text-amber-700' },
-  rare: { label: '罕见', chip: 'border-rose-200 bg-rose-100 text-rose-700' },
-} satisfies Record<CloudType['rarity'], { label: string; chip: string }>
+const passwordTarget = ref<AuthUser | null>(null)
+const newPassword = ref('')
+const confirmPassword = ref('')
+const passwordError = ref('')
 
 const statusMeta = {
   pending: { label: '待审核', chip: 'border-amber-200 bg-amber-100 text-amber-700' },
@@ -105,8 +99,8 @@ const statusMeta = {
 const tabs = [
   { key: 'dashboard', label: '数据看板', description: '运行概览与内容分布', icon: Dashboard },
   { key: 'review', label: '内容审核', description: '处理待审核上传', icon: ClipboardCheck },
-  { key: 'users', label: '用户管理', description: '角色与账号状态', icon: Users },
-  { key: 'images', label: '图片管理', description: '内容状态与可见性', icon: Photo },
+  { key: 'users', label: '用户管理', description: '角色与登录密码', icon: Users },
+  { key: 'images', label: '图片管理', description: '内容审核与删除', icon: Photo },
 ] satisfies Array<{ key: AdminTab; label: string; description: string; icon: Component }>
 
 const pendingImages = computed(() => images.value.filter(item => item.status === 'pending'))
@@ -144,7 +138,9 @@ const cloudTypeStats = computed(() => {
 
 const reviewedCount = computed(() => dashboardStats.value.approved + dashboardStats.value.rejected)
 const approvalRate = computed(() => getPercentage(dashboardStats.value.approved, reviewedCount.value))
-const publicImageCount = computed(() => Math.max(0, dashboardStats.value.images - dashboardStats.value.hidden))
+const publicImageCount = computed(() =>
+  images.value.filter(item => item.status === 'approved' && !item.is_hidden).length,
+)
 const recentImages = computed(() => images.value.slice(0, 5))
 const cloudTypeMaxCount = computed(() => Math.max(1, ...cloudTypeStats.value.map(item => item.count)))
 const reviewStatusStats = computed(() => [
@@ -178,19 +174,17 @@ function toAdminCloud(row: ApiCloud): AdminCloud {
     id: row.id,
     user_id: row.user_id,
     cloud_type_id: row.cloud_type_id,
-    custom_cloud_type: row.custom_cloud_type,
     image_url: row.image_url,
     thumbnail_url: row.thumbnail_url,
     latitude: row.latitude,
     longitude: row.longitude,
-    location_name: row.location_name,
     description: row.description,
     captured_at: row.captured_at,
     created_at: row.created_at,
     status: row.status,
     is_hidden: row.is_hidden,
-    cloudTypeName: row.cloud_type_name || row.custom_cloud_type || '未知云型',
-    cloudTypeRarity: row.cloud_type_rarity || 'common',
+    cloudTypeName: row.cloud_type_name || '未知云型',
+    cloudTypeRarity: row.cloud_type_rarity_value ?? 0,
     username: row.username || '匿名用户',
   }
 }
@@ -219,27 +213,42 @@ function getErrorMessage(error: unknown, fallback: string) {
   return error instanceof Error ? error.message : fallback
 }
 
-async function fetchStats() {
-  const stats = await apiRequest<AdminStats>('/admin/stats')
+function syncDashboardStats() {
+  const now = new Date()
+  const isToday = (value: string) => {
+    const date = new Date(value)
+    return date.getFullYear() === now.getFullYear()
+      && date.getMonth() === now.getMonth()
+      && date.getDate() === now.getDate()
+  }
+
   dashboardStats.value = {
-    users: stats.users,
-    images: stats.images,
-    todayUploads: stats.today_uploads,
-    pending: stats.pending,
-    approved: stats.approved,
-    rejected: stats.rejected,
-    hidden: stats.hidden,
+    users: users.value.length,
+    images: images.value.length,
+    todayUploads: images.value.filter(item => isToday(item.created_at)).length,
+    pending: images.value.filter(item => item.status === 'pending').length,
+    approved: images.value.filter(item => item.status === 'approved').length,
+    rejected: images.value.filter(item => item.status === 'rejected').length,
+    hidden: images.value.filter(item => item.is_hidden).length,
   }
 }
 
 async function fetchUsers() {
-  const result = await apiRequest<ApiPage<AdminUserItem>>('/admin/users?page=1&page_size=100')
-  users.value = result.items.map(item => item.user)
+  const rows = await apiRequest<BackendUserProfile[]>('/admin/users')
+  users.value = rows.map(toAuthUser)
 }
 
 async function fetchImages() {
-  const result = await apiRequest<ApiPage<ApiCloud>>('/admin/clouds?page=1&page_size=120')
-  images.value = result.items.map(toAdminCloud)
+  const rows: BackendCloudInfo[] = []
+  const pageSize = 100
+
+  for (let page = 1; ; page++) {
+    const current = await apiRequest<BackendCloudInfo[]>(`/admin/clouds?page=${page}&page_size=${pageSize}`)
+    rows.push(...current)
+    if (current.length < pageSize) break
+  }
+
+  images.value = rows.map(toApiCloud).map(toAdminCloud)
   selectedReviewIds.value = new Set([...selectedReviewIds.value].filter(id => images.value.some(item => item.id === id)))
   selectedImageIds.value = new Set([...selectedImageIds.value].filter(id => images.value.some(item => item.id === id)))
 }
@@ -249,11 +258,8 @@ async function loadAdminData() {
   loadError.value = ''
 
   try {
-    await Promise.all([
-      fetchStats(),
-      fetchUsers(),
-      fetchImages(),
-    ])
+    await Promise.all([fetchUsers(), fetchImages()])
+    syncDashboardStats()
   } catch (error) {
     loadError.value = error instanceof Error ? error.message : '管理后台加载失败'
   } finally {
@@ -305,21 +311,13 @@ function toggleAllFilteredImageSelection() {
   setSelectedImageIds(filteredImages.value.map(item => item.id))
 }
 
-function patchImages(ids: string[], patch: Partial<AdminCloud>) {
-  const idSet = new Set(ids)
-  images.value = images.value.map(item => (idSet.has(item.id) ? { ...item, ...patch } : item))
-  if (selectedImage.value && idSet.has(selectedImage.value.id)) {
-    selectedImage.value = { ...selectedImage.value, ...patch }
-  }
-}
-
 function chunkIds(ids: string[]) {
   return Array.from({ length: Math.ceil(ids.length / 100) }, (_, index) =>
     ids.slice(index * 100, (index + 1) * 100),
   )
 }
 
-async function updateCloudStatus(ids: string[], status: CloudStatus) {
+async function updateCloudStatus(ids: string[], status: Exclude<CloudStatus, 'pending'>) {
   if (!ids.length) return
 
   actionLoading.value = true
@@ -327,17 +325,20 @@ async function updateCloudStatus(ids: string[], status: CloudStatus) {
 
   try {
     for (const chunk of chunkIds(ids)) {
-      await apiRequest('/admin/clouds/status', {
-        method: 'PATCH',
-        body: { ids: chunk, status },
+      await apiRequest<ActionResponse>('/admin/clouds/review', {
+        method: 'POST',
+        body: {
+          cloud_ids: chunk.map(cloudId => ({ cloud_id: cloudId })),
+          status,
+        },
       })
     }
 
-    patchImages(ids, { status })
+    await fetchImages()
+    syncDashboardStats()
     setSelectedReviewIds([...selectedReviewIds.value].filter(id => !ids.includes(id)))
     setSelectedImageIds([...selectedImageIds.value].filter(id => !ids.includes(id)))
-    await fetchStats()
-    message.success(`已${status === 'approved' ? '通过' : '拒绝'} ${ids.length} 张图片`)
+    message.success('审核操作已完成，列表已刷新')
   } catch (error) {
     const text = getErrorMessage(error, '审核操作失败')
     loadError.value = text
@@ -347,37 +348,6 @@ async function updateCloudStatus(ids: string[], status: CloudStatus) {
   }
 }
 
-async function updateImageVisibility(ids: string[], isHidden: boolean) {
-  if (!ids.length) return
-
-  actionLoading.value = true
-  loadError.value = ''
-
-  try {
-    for (const chunk of chunkIds(ids)) {
-      await apiRequest('/admin/clouds/visibility', {
-        method: 'PATCH',
-        body: { ids: chunk, is_hidden: isHidden },
-      })
-    }
-
-    patchImages(ids, { is_hidden: isHidden })
-    setSelectedImageIds([...selectedImageIds.value].filter(id => !ids.includes(id)))
-    await fetchStats()
-    message.success(isHidden ? `已隐藏 ${ids.length} 张图片` : `已公开 ${ids.length} 张图片`)
-  } catch (error) {
-    const text = getErrorMessage(error, '可见性更新失败')
-    loadError.value = text
-    message.error(text)
-  } finally {
-    actionLoading.value = false
-  }
-}
-
-async function toggleImageVisibility(cloud: AdminCloud) {
-  await updateImageVisibility([cloud.id], !cloud.is_hidden)
-}
-
 async function deleteImages(clouds: AdminCloud[]) {
   if (!clouds.length) return
 
@@ -392,22 +362,33 @@ async function deleteImages(clouds: AdminCloud[]) {
   loadError.value = ''
 
   try {
-    const idsToDelete = clouds.map(cloud => cloud.id)
-    for (const chunk of chunkIds(idsToDelete)) {
-      await apiRequest('/admin/clouds/batch-delete', {
-        method: 'POST',
-        body: { ids: chunk },
-      })
+    const deletedIds: string[] = []
+    let firstError = ''
+
+    for (const cloud of clouds) {
+      try {
+        await apiRequest<ActionResponse>(`/admin/clouds/${cloud.id}`, { method: 'DELETE' })
+        deletedIds.push(cloud.id)
+      } catch (error) {
+        firstError ||= getErrorMessage(error, '图片删除失败')
+      }
     }
 
-    images.value = images.value.filter(item => !idsToDelete.includes(item.id))
-    if (selectedImage.value && idsToDelete.includes(selectedImage.value.id)) {
+    await fetchImages()
+    syncDashboardStats()
+    if (selectedImage.value && deletedIds.includes(selectedImage.value.id)) {
       selectedImage.value = null
     }
-    setSelectedReviewIds([...selectedReviewIds.value].filter(id => !idsToDelete.includes(id)))
-    setSelectedImageIds([...selectedImageIds.value].filter(id => !idsToDelete.includes(id)))
-    await fetchStats()
-    message.success(clouds.length === 1 ? '图片已删除' : `已删除 ${clouds.length} 张图片`)
+    setSelectedReviewIds([...selectedReviewIds.value].filter(id => !deletedIds.includes(id)))
+    setSelectedImageIds([...selectedImageIds.value].filter(id => !deletedIds.includes(id)))
+
+    if (deletedIds.length === clouds.length) {
+      message.success(clouds.length === 1 ? '图片已删除' : `已删除 ${clouds.length} 张图片`)
+    } else {
+      const text = `已删除 ${deletedIds.length} 张，${clouds.length - deletedIds.length} 张失败${firstError ? `：${firstError}` : ''}`
+      loadError.value = text
+      message.error(text)
+    }
   } catch (error) {
     const text = getErrorMessage(error, '图片删除失败')
     loadError.value = text
@@ -421,7 +402,7 @@ async function deleteImage(cloud: AdminCloud) {
   await deleteImages([cloud])
 }
 
-async function updateUserRole(user: Profile, role: Profile['role']) {
+async function updateUserRole(user: AuthUser, role: AuthUser['role']) {
   if (user.id === authStore.user?.id && role !== 'admin') {
     message.warning('不能移除自己的管理员权限')
     return
@@ -431,12 +412,12 @@ async function updateUserRole(user: Profile, role: Profile['role']) {
   loadError.value = ''
 
   try {
-    const result = await apiRequest<AdminUserItem>(`/admin/users/${user.id}`, {
+    await apiRequest<ActionResponse>(`/admin/users/${user.id}`, {
       method: 'PATCH',
-      body: { role },
+      body: { user_role: role },
     })
-    users.value = users.value.map(item => item.id === user.id ? result.user : item)
-    message.success('用户角色已更新')
+    users.value = users.value.map(item => item.id === user.id ? { ...item, role } : item)
+    message.success('用户角色已更新；该用户需要重新登录')
   } catch (error) {
     const text = getErrorMessage(error, '用户角色更新失败')
     loadError.value = text
@@ -446,27 +427,42 @@ async function updateUserRole(user: Profile, role: Profile['role']) {
   }
 }
 
-async function toggleUserDisabled(user: Profile) {
-  if (user.id === authStore.user?.id) {
-    message.warning('不能禁用当前登录的管理员账号')
+function openPasswordReset(user: AuthUser) {
+  passwordTarget.value = user
+  newPassword.value = ''
+  confirmPassword.value = ''
+  passwordError.value = ''
+}
+
+function closePasswordReset() {
+  if (actionLoading.value) return
+  passwordTarget.value = null
+}
+
+async function resetUserPassword() {
+  const user = passwordTarget.value
+  if (!user) return
+
+  passwordError.value = ''
+  if (newPassword.value.length < 8) {
+    passwordError.value = '新密码至少需要 8 位。'
+    return
+  }
+  if (newPassword.value !== confirmPassword.value) {
+    passwordError.value = '两次输入的密码不一致。'
     return
   }
 
   actionLoading.value = true
-  loadError.value = ''
-
   try {
-    const nextDisabled = !user.is_disabled
-    const result = await apiRequest<AdminUserItem>(`/admin/users/${user.id}`, {
+    await apiRequest<ActionResponse>(`/admin/users/${user.id}/password`, {
       method: 'PATCH',
-      body: { is_disabled: nextDisabled },
+      body: { new_password: newPassword.value },
     })
-    users.value = users.value.map(item => item.id === user.id ? result.user : item)
-    message.success(nextDisabled ? '用户已禁用' : '用户已恢复')
+    passwordTarget.value = null
+    message.success('密码已重置；该用户需要重新登录')
   } catch (error) {
-    const text = getErrorMessage(error, '用户状态更新失败')
-    loadError.value = text
-    message.error(text)
+    passwordError.value = getErrorMessage(error, '密码重置失败')
   } finally {
     actionLoading.value = false
   }
@@ -877,7 +873,9 @@ onMounted(loadAdminData)
                 <img :src="item.thumbnail_url || item.image_url" :alt="item.cloudTypeName" class="h-11 w-13 object-cover" />
                 <span class="min-w-0">
                   <span class="block truncate text-sm font-semibold text-slate-900">{{ item.cloudTypeName }}</span>
-                  <span class="mt-0.5 block truncate text-xs text-slate-500">{{ item.username }} · {{ item.location_name || '未填写位置' }}</span>
+                  <span class="mt-0.5 block truncate text-xs text-slate-500">
+                    {{ item.username }} · {{ formatCoordinate(item.latitude) }}, {{ formatCoordinate(item.longitude) }}
+                  </span>
                 </span>
                 <span class="hidden truncate text-xs text-slate-500 sm:block">{{ formatDateTime(item.created_at) }}</span>
                 <span class="border px-2 py-1 text-xs font-medium" :class="statusMeta[item.status].chip">
@@ -985,8 +983,8 @@ onMounted(loadAdminData)
                       <p class="truncate text-sm font-semibold text-slate-900">{{ activeReviewImage.cloudTypeName }}</p>
                       <p class="mt-0.5 truncate text-xs text-slate-500">内容编号 {{ activeReviewImage.id }}</p>
                     </div>
-                    <span class="shrink-0 whitespace-nowrap border px-2 py-1 text-xs font-medium" :class="rarityMeta[activeReviewImage.cloudTypeRarity].chip">
-                      {{ rarityMeta[activeReviewImage.cloudTypeRarity].label }}
+                    <span class="shrink-0 whitespace-nowrap border border-sky-200 bg-sky-100 px-2 py-1 text-xs font-medium text-sky-700">
+                      稀有度 {{ activeReviewImage.cloudTypeRarity }}
                     </span>
                   </div>
                   <button
@@ -1048,10 +1046,6 @@ onMounted(loadAdminData)
                     <dt class="text-xs font-medium text-slate-400">上传时间</dt>
                     <dd class="mt-1 text-sm font-medium text-slate-800">{{ formatDateTime(activeReviewImage.created_at) }}</dd>
                   </div>
-                  <div class="py-3">
-                    <dt class="text-xs font-medium text-slate-400">位置名称</dt>
-                    <dd class="mt-1 text-sm font-medium text-slate-800">{{ activeReviewImage.location_name || '未填写位置名称' }}</dd>
-                  </div>
                   <div class="py-3">
                     <dt class="text-xs font-medium text-slate-400">模糊化坐标</dt>
                     <dd class="mt-1 font-mono text-xs leading-5 text-slate-700">
@@ -1109,26 +1103,39 @@ onMounted(loadAdminData)
 
         <section v-else-if="activeTab === 'users'">
           <div class="oc-panel-card overflow-hidden border border-slate-200 bg-white">
-            <div class="grid grid-cols-[1.1fr_0.8fr_0.7fr_0.9fr_1.2fr] border-b border-slate-200 bg-slate-50 px-4 py-3 text-xs font-semibold uppercase tracking-[0.14em] text-slate-500">
+            <div class="hidden grid-cols-[minmax(0,1.1fr)_minmax(0,0.7fr)_minmax(0,0.7fr)_minmax(0,0.9fr)_minmax(0,1.5fr)] gap-3 border-b border-slate-200 bg-slate-50 px-4 py-3 text-xs font-semibold uppercase tracking-[0.14em] text-slate-500 lg:grid">
               <span>用户</span>
               <span>角色</span>
               <span>状态</span>
               <span>注册时间</span>
               <span>操作</span>
             </div>
-            <div v-for="user in users" :key="user.id" class="grid grid-cols-[1.1fr_0.8fr_0.7fr_0.9fr_1.2fr] items-center gap-3 border-b border-slate-100 px-4 py-4 last:border-b-0">
-              <div class="min-w-0">
+            <div
+              v-for="user in users"
+              :key="user.id"
+              class="grid gap-4 border-b border-slate-100 px-4 py-4 last:border-b-0 sm:grid-cols-2 lg:grid-cols-[minmax(0,1.1fr)_minmax(0,0.7fr)_minmax(0,0.7fr)_minmax(0,0.9fr)_minmax(0,1.5fr)] lg:items-center lg:gap-3"
+            >
+              <div class="min-w-0 sm:col-span-2 lg:col-span-1">
                 <p class="truncate font-medium text-slate-950">{{ user.username }}</p>
-                <p class="mt-1 truncate text-xs text-slate-400">{{ user.id }}</p>
+                <p class="mt-1 truncate text-xs text-slate-400">{{ user.email }}</p>
               </div>
-              <NTag size="small" :bordered="false" :type="user.role === 'admin' ? 'success' : 'default'">
-                {{ user.role === 'admin' ? '管理员' : '用户' }}
-              </NTag>
-              <NTag size="small" :bordered="false" :type="user.is_disabled ? 'error' : 'success'">
-                {{ user.is_disabled ? '已禁用' : '正常' }}
-              </NTag>
-              <span class="text-sm text-slate-500">{{ formatDateTime(user.created_at) }}</span>
-              <div class="flex flex-wrap gap-2">
+              <div class="flex items-center justify-between gap-3 lg:block">
+                <span class="text-xs font-medium text-slate-400 lg:hidden">角色</span>
+                <NTag size="small" :bordered="false" :type="user.role === 'admin' ? 'success' : 'default'">
+                  {{ user.role === 'admin' ? '管理员' : '用户' }}
+                </NTag>
+              </div>
+              <div class="flex items-center justify-between gap-3 lg:block">
+                <span class="text-xs font-medium text-slate-400 lg:hidden">状态</span>
+                <NTag size="small" :bordered="false" :type="user.is_disabled ? 'error' : 'success'">
+                  {{ user.is_disabled ? '已禁用' : '正常' }}
+                </NTag>
+              </div>
+              <div class="flex items-center justify-between gap-3 text-sm text-slate-500 lg:block">
+                <span class="text-xs font-medium text-slate-400 lg:hidden">注册时间</span>
+                <span>{{ formatDateTime(user.created_at) }}</span>
+              </div>
+              <div class="flex flex-wrap gap-2 sm:col-span-2 lg:col-span-1">
                 <NButton
                   size="small"
                   secondary
@@ -1146,12 +1153,14 @@ onMounted(loadAdminData)
                   type="default"
                   secondary
                   strong
-                  :class="user.is_disabled ? 'oc-panel-button oc-panel-button--teal' : 'oc-panel-button oc-panel-button--danger'"
+                  class="oc-panel-button oc-panel-button--neutral"
                   :disabled="user.id === authStore.user?.id"
                   :loading="actionLoading"
-                  @click="toggleUserDisabled(user)"
+                  :title="user.id === authStore.user?.id ? '请在账号设置中修改自己的密码' : '设置新密码'"
+                  @click="openPasswordReset(user)"
                 >
-                  {{ user.is_disabled ? '恢复' : '禁用' }}
+                  <template #icon><NIcon><Key /></NIcon></template>
+                  重置密码
                 </NButton>
               </div>
             </div>
@@ -1162,7 +1171,7 @@ onMounted(loadAdminData)
           <div class="oc-panel-card mb-4 flex flex-col gap-3 border border-slate-200 bg-white p-4 md:flex-row md:items-center md:justify-between">
             <div>
               <h2 class="text-xl font-bold text-slate-950">图片管理</h2>
-              <p class="oc-field-help">最近 {{ images.length }} 张图片，可调整审核状态、可见性或删除。</p>
+              <p class="oc-field-help">共 {{ images.length }} 张图片，可调整审核状态或删除。</p>
             </div>
             <div class="flex flex-wrap gap-2">
               <select
@@ -1205,26 +1214,6 @@ onMounted(loadAdminData)
                 >
                   批量拒绝 {{ selectedManagedCount }}
                 </NButton>
-                <NButton
-                  secondary
-                  strong
-                  type="default"
-                  class="oc-panel-button oc-panel-button--amber"
-                  :loading="actionLoading"
-                  @click="updateImageVisibility(Array.from(selectedImageIds), true)"
-                >
-                  批量隐藏 {{ selectedManagedCount }}
-                </NButton>
-                <NButton
-                  secondary
-                  strong
-                  type="default"
-                  class="oc-panel-button oc-panel-button--teal"
-                  :loading="actionLoading"
-                  @click="updateImageVisibility(Array.from(selectedImageIds), false)"
-                >
-                  批量公开 {{ selectedManagedCount }}
-                </NButton>
                 <NButton
                   secondary
                   strong
@@ -1248,7 +1237,9 @@ onMounted(loadAdminData)
                 <div class="flex items-start justify-between gap-3">
                   <div class="min-w-0">
                     <p class="truncate font-semibold text-slate-950">{{ item.cloudTypeName }}</p>
-                    <p class="mt-1 truncate text-sm text-slate-500">{{ item.username }} · {{ item.location_name || '未填写位置' }}</p>
+                    <p class="mt-1 truncate text-sm text-slate-500">
+                      {{ item.username }} · {{ formatCoordinate(item.latitude) }}, {{ formatCoordinate(item.longitude) }}
+                    </p>
                   </div>
                   <div class="flex items-start gap-2">
                     <NTag size="small" :bordered="false" :class="statusMeta[item.status].chip">
@@ -1266,15 +1257,6 @@ onMounted(loadAdminData)
                   <NButton size="small" type="default" secondary strong class="oc-panel-button oc-panel-button--neutral" @click="selectedImage = item">查看</NButton>
                   <NButton size="small" type="default" secondary strong class="oc-panel-button oc-panel-button--teal" :disabled="item.status === 'approved'" :loading="actionLoading" @click="updateCloudStatus([item.id], 'approved')">通过</NButton>
                   <NButton size="small" type="default" secondary strong class="oc-panel-button oc-panel-button--danger" :disabled="item.status === 'rejected'" :loading="actionLoading" @click="updateCloudStatus([item.id], 'rejected')">拒绝</NButton>
-                  <NButton size="small" type="default" secondary strong class="oc-panel-button oc-panel-button--amber" :loading="actionLoading" @click="toggleImageVisibility(item)">
-                    <template #icon>
-                      <NIcon>
-                        <Eye v-if="item.is_hidden" />
-                        <EyeOff v-else />
-                      </NIcon>
-                    </template>
-                    {{ item.is_hidden ? '公开' : '隐藏' }}
-                  </NButton>
                   <NButton size="small" type="default" secondary strong class="oc-panel-button oc-panel-button--danger" :loading="actionLoading" @click="deleteImage(item)">
                     <template #icon><NIcon><Trash /></NIcon></template>
                     删除
@@ -1292,6 +1274,71 @@ onMounted(loadAdminData)
       </main>
     </div>
 
+    <Teleport to="body">
+      <div
+        v-if="passwordTarget"
+        class="fixed inset-0 z-[140] flex items-center justify-center bg-slate-950/60 px-4 py-6"
+        @click="closePasswordReset"
+      >
+        <form class="oc-modal-shell w-full max-w-lg" @click.stop @submit.prevent="resetUserPassword">
+          <div class="flex items-start justify-between gap-4 border-b border-slate-200 px-5 py-4 sm:px-6 sm:py-5">
+            <div class="min-w-0">
+              <p class="oc-section-label">Admin Credential</p>
+              <h3 class="mt-2 text-xl font-semibold text-slate-900">重置用户密码</h3>
+              <p class="oc-field-help truncate">@{{ passwordTarget.username }} · {{ passwordTarget.email }}</p>
+            </div>
+            <button
+              type="button"
+              class="oc-icon-button"
+              aria-label="关闭密码重置窗口"
+              title="关闭密码重置窗口"
+              @click="closePasswordReset"
+            >
+              <NIcon size="20"><X /></NIcon>
+            </button>
+          </div>
+
+          <div class="grid gap-4 px-5 py-5 sm:px-6">
+            <NAlert v-if="passwordError" type="error" :show-icon="false" :bordered="false">
+              {{ passwordError }}
+            </NAlert>
+            <div>
+              <label class="oc-field-label">新密码 <span class="oc-field-required">*</span></label>
+              <NInput
+                v-model:value="newPassword"
+                type="password"
+                show-password-on="click"
+                placeholder="至少 8 位"
+                :input-props="{ autocomplete: 'new-password', name: 'admin-new-password', required: true }"
+              />
+            </div>
+            <div>
+              <label class="oc-field-label">确认新密码 <span class="oc-field-required">*</span></label>
+              <NInput
+                v-model:value="confirmPassword"
+                type="password"
+                show-password-on="click"
+                placeholder="再次输入新密码"
+                :input-props="{ autocomplete: 'new-password', name: 'admin-confirm-new-password', required: true }"
+              />
+            </div>
+            <p class="border border-amber-200 bg-amber-50 px-3 py-2.5 text-xs leading-5 text-amber-800">
+              保存后，该用户所有设备上的现有登录状态都会立即失效。
+            </p>
+          </div>
+
+          <div class="flex items-center justify-end gap-3 border-t border-slate-200 px-5 py-4 sm:px-6">
+            <NButton type="default" secondary strong class="oc-panel-button oc-panel-button--neutral" :disabled="actionLoading" @click="closePasswordReset">
+              取消
+            </NButton>
+            <NButton attr-type="submit" type="default" secondary strong class="oc-panel-button oc-panel-button--amber" :loading="actionLoading">
+              确认重置
+            </NButton>
+          </div>
+        </form>
+      </div>
+    </Teleport>
+
     <ImageDetailModal
       v-if="selectedImage"
       :open="!!selectedImage"
@@ -1300,8 +1347,8 @@ onMounted(loadAdminData)
       :image-alt="selectedImage.cloudTypeName"
       :title="selectedImage.cloudTypeName"
       :subtitle="`上传者：${selectedImage.username}`"
-      :badge-label="rarityMeta[selectedImage.cloudTypeRarity].label"
-      :badge-class="rarityMeta[selectedImage.cloudTypeRarity].chip"
+      :badge-label="`稀有度 ${selectedImage.cloudTypeRarity}`"
+      badge-class="border-sky-200 bg-sky-100 text-sky-700"
       @close="selectedImage = null"
     >
       <div class="grid gap-4 sm:grid-cols-2">
@@ -1336,7 +1383,6 @@ onMounted(loadAdminData)
       <MiniLocationMap
         :latitude="selectedImage.latitude"
         :longitude="selectedImage.longitude"
-        :location-name="selectedImage.location_name"
       />
     </ImageDetailModal>
   </div>
diff --git a/src/views/auth/AuthConfirmView.vue b/src/views/auth/AuthConfirmView.vue
index 68421f4..88c977f 100644
--- a/src/views/auth/AuthConfirmView.vue
+++ b/src/views/auth/AuthConfirmView.vue
@@ -1,89 +1,73 @@
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue'
+import { onMounted, onUnmounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { NButton, NCard, NResult, NSpin } from 'naive-ui'
-import { apiRequest } from '@/lib/api'
+import { useAuthStore } from '@/stores/auth'
 
+const authStore = useAuthStore()
 const route = useRoute()
 const router = useRouter()
-
 const state = ref<'loading' | 'success' | 'failed'>('loading')
+const error = ref('')
 const countdown = ref(5)
-let countdownTimer: ReturnType<typeof setInterval> | null = null
-const confirmationToken = typeof route.query.token === 'string' ? route.query.token : ''
+const token = typeof route.query.token === 'string' ? route.query.token : ''
+let timer: ReturnType<typeof setInterval> | null = null
 
 if (route.query.token !== undefined) {
-  window.history.replaceState(window.history.state, '', window.location.pathname)
+  window.history.replaceState(window.history.state, '', route.path)
 }
 
 function startCountdown() {
-  countdownTimer = setInterval(() => {
+  timer = setInterval(() => {
     countdown.value--
     if (countdown.value <= 0) {
-      if (countdownTimer) clearInterval(countdownTimer)
-      router.push('/login')
+      if (timer) clearInterval(timer)
+      void router.push('/login')
     }
   }, 1000)
 }
 
 onMounted(async () => {
+  if (!token) {
+    error.value = '确认链接缺少验证信息'
+    state.value = 'failed'
+    return
+  }
   try {
-    if (!confirmationToken) {
-      state.value = 'failed'
-      return
-    }
-
-    await apiRequest('/auth/confirm-email', {
-      method: 'POST',
-      auth: false,
-      body: { token: confirmationToken },
-    })
+    await authStore.confirmEmail(token)
     state.value = 'success'
     startCountdown()
-  } catch {
+  } catch (e: unknown) {
+    error.value = e instanceof Error ? e.message : '确认链接无效或已过期'
     state.value = 'failed'
   }
 })
 
-onUnmounted(() => {
-  if (countdownTimer) clearInterval(countdownTimer)
-})
+onUnmounted(() => { if (timer) clearInterval(timer) })
 </script>
 
 <template>
   <div class="min-h-[calc(100vh-4rem)] px-4 py-10">
     <div class="mx-auto max-w-3xl">
       <NCard class="oc-panel-card-xl">
-      <template v-if="state === 'success'">
-        <NResult status="success" title="邮箱认证成功" description="你的邮箱已确认，现在可以登录了。">
+        <NResult v-if="state === 'success'" status="success" title="邮箱确认成功" description="现在可以使用邮箱和密码登录。">
           <template #footer>
             <div class="space-y-4">
-              <p class="text-sm text-slate-500">{{ countdown }} 秒后自动跳转登录页面...</p>
-              <RouterLink to="/login" class="no-underline">
-                <NButton type="primary" class="oc-primary-button oc-primary-button--teal">立即登录</NButton>
-              </RouterLink>
+              <p class="text-sm text-slate-500">{{ countdown }} 秒后自动前往登录页面</p>
+              <RouterLink to="/login" class="no-underline"><NButton type="default" class="oc-panel-button oc-panel-button--teal">立即登录</NButton></RouterLink>
             </div>
           </template>
         </NResult>
-      </template>
-
-      <template v-else-if="state === 'failed'">
-        <NResult status="error" title="认证失败" description="邮箱确认链接无效或已过期，请重新注册。">
+        <NResult v-else-if="state === 'failed'" status="error" title="邮箱确认失败" :description="error">
           <template #footer>
-            <RouterLink to="/register" class="no-underline">
-              <NButton type="primary" class="oc-primary-button oc-primary-button--sky">重新注册</NButton>
-            </RouterLink>
+            <RouterLink to="/resend-confirmation" class="no-underline"><NButton type="default" class="oc-panel-button oc-panel-button--sky">重新发送验证邮件</NButton></RouterLink>
           </template>
         </NResult>
-      </template>
-
-      <template v-else>
-        <div class="flex flex-col items-center justify-center py-12 text-center">
+        <div v-else class="flex flex-col items-center justify-center py-12 text-center">
           <NSpin size="large" />
-          <h1 class="mt-6 text-2xl font-bold text-slate-900">正在验证...</h1>
+          <h1 class="mt-6 text-2xl font-bold text-slate-900">正在确认邮箱...</h1>
           <p class="mt-2 text-slate-500">请稍候</p>
         </div>
-      </template>
       </NCard>
     </div>
   </div>
diff --git a/src/views/auth/ForgotPasswordView.vue b/src/views/auth/ForgotPasswordView.vue
index e177096..0092adb 100644
--- a/src/views/auth/ForgotPasswordView.vue
+++ b/src/views/auth/ForgotPasswordView.vue
@@ -6,123 +6,61 @@ import { useAuthStore } from '@/stores/auth'
 
 const authStore = useAuthStore()
 const route = useRoute()
-
 const email = ref(typeof route.query.email === 'string' ? route.query.email : '')
 const error = ref('')
 const loading = ref(false)
 const submitted = ref(false)
 const cooldown = ref(0)
-let cooldownTimer: ReturnType<typeof setInterval> | null = null
+let timer: ReturnType<typeof setInterval> | null = null
 
-const resendButtonLabel = computed(() => {
-  if (loading.value) return '发送中...'
-  if (cooldown.value > 0) return `重新发送（${cooldown.value}s）`
-  return '重新发送'
-})
-
-function clearCooldownTimer() {
-  if (!cooldownTimer) return
-  clearInterval(cooldownTimer)
-  cooldownTimer = null
-}
+const buttonLabel = computed(() => loading.value ? '发送中...' : cooldown.value > 0 ? `重新发送（${cooldown.value}s）` : '重新发送')
 
 function startCooldown() {
-  clearCooldownTimer()
+  if (timer) clearInterval(timer)
   cooldown.value = 60
-  cooldownTimer = setInterval(() => {
+  timer = setInterval(() => {
     cooldown.value--
-    if (cooldown.value <= 0) {
-      cooldown.value = 0
-      clearCooldownTimer()
+    if (cooldown.value <= 0 && timer) {
+      clearInterval(timer)
+      timer = null
     }
   }, 1000)
 }
 
-async function handleSendResetEmail() {
+async function submit() {
   error.value = ''
-
-  if (!email.value.trim()) {
-    error.value = '请输入需要找回密码的邮箱。'
+  const value = email.value.trim()
+  if (!value || value.length > 64) {
+    error.value = '请输入不超过 64 个字符的有效邮箱'
     return
   }
-
   loading.value = true
   try {
-    await authStore.sendPasswordReset(email.value.trim())
+    await authStore.sendPasswordReset(value)
+    email.value = value
     submitted.value = true
     startCooldown()
   } catch (e: unknown) {
-    error.value = e instanceof Error ? e.message : '重置邮件发送失败，请稍后重试。'
+    error.value = e instanceof Error ? e.message : '重置邮件发送失败，请稍后重试'
   } finally {
     loading.value = false
   }
 }
 
-async function resendResetEmail() {
-  if (cooldown.value > 0 || loading.value) {
-    return
-  }
-
-  await handleSendResetEmail()
-}
-
-onUnmounted(() => {
-  clearCooldownTimer()
-})
+onUnmounted(() => { if (timer) clearInterval(timer) })
 </script>
 
 <template>
   <div class="min-h-[calc(100vh-4rem)] px-4 py-10">
-    <div class="mx-auto grid min-w-0 max-w-6xl gap-8 lg:grid-cols-[1.05fr_0.95fr] lg:items-center">
-      <section class="oc-panel-card-xl min-w-0 overflow-hidden border border-slate-200 bg-[linear-gradient(135deg,#eff6ff_0%,#ffffff_52%,#f2faf6_100%)] p-6 sm:p-8">
-        <p class="text-sm uppercase tracking-[0.26em] text-sky-700">Password Recovery</p>
-        <h1 class="mt-4 max-w-xl break-words text-4xl font-black leading-[1.05] text-slate-900 sm:text-5xl">
-          重新拿回你的
-          <span class="block text-sky-700">OpenCloud 账号</span>
-        </h1>
-        <p class="mt-6 max-w-lg text-base leading-8 text-slate-600">
-          输入注册邮箱后，我们会发送一封密码重置邮件。打开邮件中的链接，即可进入新的密码设置页面。
-        </p>
-        <div class="mt-8 grid gap-4 sm:grid-cols-2">
-          <div class="border border-slate-200 bg-white px-4 py-3">
-            <div class="oc-stat-label">Step 1</div>
-            <div class="mt-2 text-lg font-bold text-slate-900">发送邮件</div>
-            <div class="oc-field-help">使用注册邮箱请求重置链接</div>
-          </div>
-          <div class="border border-slate-200 bg-white px-4 py-3">
-            <div class="oc-stat-label">Step 2</div>
-            <div class="mt-2 text-lg font-bold text-slate-900">设置新密码</div>
-            <div class="oc-field-help">在专用页面完成新密码更新</div>
-          </div>
-        </div>
-      </section>
-
-      <NCard class="oc-panel-card-xl min-w-0">
-        <NResult
-          v-if="submitted"
-          status="success"
-          title="重置邮件已发送"
-          description="如果该邮箱已注册，请查收邮件中的重置链接。"
-        >
+    <div class="mx-auto max-w-2xl">
+      <NCard class="oc-panel-card-xl">
+        <NResult v-if="submitted" status="success" title="请求已受理" description="如果该邮箱符合条件，我们会发送密码重置邮件。">
           <template #footer>
             <div class="space-y-4">
-              <p class="text-sm text-slate-500">
-                目标邮箱：
-                <span class="font-semibold text-slate-700">{{ email }}</span>
-              </p>
+              <p class="text-sm text-slate-500">目标邮箱：<span class="font-semibold text-slate-700">{{ email }}</span></p>
               <div class="flex flex-wrap justify-center gap-3">
-                <NButton
-                  type="primary"
-                  class="oc-primary-button oc-primary-button--teal"
-                  :disabled="cooldown > 0"
-                  :loading="loading"
-                  @click="resendResetEmail"
-                >
-                  {{ resendButtonLabel }}
-                </NButton>
-                <RouterLink :to="{ path: '/login', query: { email } }" class="no-underline">
-                  <NButton type="default" secondary strong class="oc-panel-button oc-panel-button--neutral">返回登录</NButton>
-                </RouterLink>
+                <NButton type="default" class="oc-panel-button oc-panel-button--sky" :disabled="cooldown > 0" :loading="loading" @click="submit">{{ buttonLabel }}</NButton>
+                <RouterLink :to="{ path: '/login', query: { email } }" class="no-underline"><NButton type="default" class="oc-panel-button oc-panel-button--neutral">返回登录</NButton></RouterLink>
               </div>
             </div>
           </template>
@@ -130,48 +68,18 @@ onUnmounted(() => {
 
         <template v-else>
           <div class="mb-8">
-            <div class="text-sm uppercase tracking-[0.22em] text-slate-500">Reset Request</div>
-            <h2 class="mt-3 text-3xl font-bold text-slate-900">忘记密码</h2>
-            <p class="mt-2 text-sm text-slate-500">输入你的注册邮箱，我们会发送一封密码重置邮件。</p>
+            <div class="text-sm uppercase tracking-[0.22em] text-slate-500">Password Recovery</div>
+            <h1 class="mt-3 text-3xl font-bold text-slate-900">忘记密码</h1>
+            <p class="mt-2 text-sm text-slate-500">输入注册邮箱，我们会发送有效期为 30 分钟的重置链接。</p>
           </div>
-
-          <NForm @submit.prevent="handleSendResetEmail">
+          <NForm @submit.prevent="submit">
             <NFormItem label="邮箱">
-              <NInput
-                v-model:value="email"
-                type="text"
-                :input-props="{
-                  autocomplete: 'email',
-                  inputmode: 'email',
-                  name: 'email',
-                  required: true,
-                }"
-                placeholder="your@email.com"
-              />
+              <NInput v-model:value="email" maxlength="64" type="text" placeholder="your@email.com" :input-props="{ autocomplete: 'email', inputmode: 'email', name: 'email', required: true }" />
             </NFormItem>
-
-            <NAlert v-if="error" type="error" class="mb-4">
-              {{ error }}
-            </NAlert>
-
-            <NButton
-              attr-type="submit"
-              type="primary"
-              block
-              size="large"
-              class="oc-primary-button oc-primary-button--sky"
-              :loading="loading"
-            >
-              {{ loading ? '发送中...' : '发送重置邮件' }}
-            </NButton>
+            <NAlert v-if="error" type="error" class="mb-4">{{ error }}</NAlert>
+            <NButton attr-type="submit" type="primary" block size="large" class="oc-primary-button oc-primary-button--sky" :loading="loading">{{ loading ? '发送中...' : '发送重置邮件' }}</NButton>
           </NForm>
-
-          <div class="mt-6 flex flex-wrap items-center justify-between gap-3 text-sm text-slate-500">
-            <p>如果你已经记起密码，可以直接返回登录。</p>
-            <RouterLink :to="{ path: '/login', query: { email } }" class="font-semibold text-sky-700 hover:text-sky-800">
-              返回登录
-            </RouterLink>
-          </div>
+          <p class="mt-6 text-sm text-slate-500"><RouterLink :to="{ path: '/login', query: { email } }" class="font-semibold text-sky-700 hover:text-sky-800">返回登录</RouterLink></p>
         </template>
       </NCard>
     </div>
diff --git a/src/views/auth/LoginView.vue b/src/views/auth/LoginView.vue
index d5f2a30..8b93c7b 100644
--- a/src/views/auth/LoginView.vue
+++ b/src/views/auth/LoginView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { NAlert, NButton, NCard, NForm, NFormItem, NInput } from 'naive-ui'
 import { useAuthStore } from '@/stores/auth'
@@ -12,6 +12,7 @@ const email = ref(typeof route.query.email === 'string' ? route.query.email : ''
 const password = ref('')
 const error = ref('')
 const loading = ref(false)
+const needsEmailConfirmation = computed(() => error.value.includes('邮箱尚未验证'))
 
 function getSafeRedirect(value: unknown) {
   if (typeof value !== 'string' || !value.startsWith('/')) return '/'
@@ -51,19 +52,19 @@ async function handleLogin() {
             <span class="block text-teal-700">你眼中的每一朵云</span>
           </h1>
           <!-- <p class="mt-6 max-w-lg text-base leading-8 text-slate-600">
-            在地图、图鉴和画廊之间同步你的观测记录。上传新的云图后，图鉴会自动点亮，画廊也会按时间收纳你的作品。
+            在地图、百科和画廊之间浏览观测记录。上传新的云图后，审核通过的作品会进入公开画廊与地图。
           </p> -->
         </div>
         <div class="mt-8 grid min-w-0 grid-cols-2 gap-4">
           <div class="min-w-0 border border-slate-200 bg-white px-4 py-3">
             <div class="oc-stat-label">Collection</div>
             <div class="oc-stat-value">10</div>
-            <div class="oc-field-help">基础云属待收集</div>
+            <div class="oc-field-help">基础云属资料</div>
           </div>
           <div class="min-w-0 border border-slate-200 bg-white px-4 py-3">
             <div class="oc-stat-label">Mode</div>
             <div class="oc-stat-value">Atlas</div>
-            <div class="oc-field-help">地图、图鉴、画廊一体</div>
+            <div class="oc-field-help">地图、百科、画廊一体</div>
           </div>
         </div>
       </section>
@@ -106,6 +107,14 @@ async function handleLogin() {
 
           <NAlert v-if="error" type="error" class="mb-4">
             {{ error }}
+            <div v-if="needsEmailConfirmation" class="mt-2">
+              <RouterLink
+                :to="{ path: '/resend-confirmation', query: { email } }"
+                class="font-semibold text-rose-700 underline underline-offset-2"
+              >
+                重新发送验证邮件
+              </RouterLink>
+            </div>
           </NAlert>
 
           <NButton
@@ -121,15 +130,15 @@ async function handleLogin() {
         </NForm>
 
         <div class="mt-6 flex flex-wrap items-center justify-between gap-3 text-sm text-slate-500">
-          <p>
-            没有账号？
-            <RouterLink to="/register" class="font-semibold text-teal-700 hover:text-teal-800">去注册</RouterLink>
-          </p>
+          <span>
+            还没有账号？
+            <RouterLink to="/register" class="font-semibold text-sky-700 hover:text-sky-800">立即注册</RouterLink>
+          </span>
           <RouterLink
-            :to="email ? { path: '/forgot-password', query: { email } } : { path: '/forgot-password' }"
-            class="font-semibold text-teal-700 transition-colors hover:text-teal-800"
+            :to="{ path: '/forgot-password', query: { email } }"
+            class="font-semibold text-teal-700 hover:text-teal-800"
           >
-            忘记密码？
+            忘记密码
           </RouterLink>
         </div>
       </NCard>
diff --git a/src/views/auth/RegisterView.vue b/src/views/auth/RegisterView.vue
index 07177c8..8d8ed7e 100644
--- a/src/views/auth/RegisterView.vue
+++ b/src/views/auth/RegisterView.vue
@@ -1,44 +1,64 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
+import { useRoute } from 'vue-router'
 import { NAlert, NButton, NCard, NForm, NFormItem, NInput, NResult } from 'naive-ui'
+import { ApiError } from '@/lib/api'
 import { useAuthStore } from '@/stores/auth'
 
 const authStore = useAuthStore()
+const route = useRoute()
 
-const email = ref('')
+const name = ref('')
+const email = ref(typeof route.query.email === 'string' ? route.query.email : '')
 const password = ref('')
 const confirmPassword = ref('')
-const username = ref('')
 const error = ref('')
 const loading = ref(false)
-const emailSent = ref(false)
+const registered = ref(false)
+const emailDelivered = ref(true)
+const registerConflict = ref(false)
+const canResend = computed(() => registerConflict.value)
 
 async function handleRegister() {
   error.value = ''
+  registerConflict.value = false
+  const trimmedName = name.value.trim()
+  const trimmedEmail = email.value.trim()
 
-  if (!username.value.trim()) {
+  if (!trimmedName) {
     error.value = '请输入用户名'
     return
   }
-  if (username.value.length > 20) {
-    error.value = '用户名不能超过20个字符'
+  if (trimmedName.length > 16) {
+    error.value = '用户名不能超过 16 个字符'
+    return
+  }
+  if (!trimmedEmail || trimmedEmail.length > 64) {
+    error.value = '请输入不超过 64 个字符的有效邮箱'
     return
   }
   if (password.value.length < 8) {
-    error.value = '密码至少8位'
+    error.value = '密码至少需要 8 位'
     return
   }
   if (password.value !== confirmPassword.value) {
-    error.value = '两次密码不一致'
+    error.value = '两次输入的密码不一致'
     return
   }
 
   loading.value = true
   try {
-    await authStore.register(email.value, password.value, username.value.trim())
-    emailSent.value = true
+    const response = await authStore.register(trimmedName, trimmedEmail, password.value)
+    email.value = trimmedEmail
+    emailDelivered.value = response.email_sent
+    registered.value = true
   } catch (e: unknown) {
-    error.value = e instanceof Error ? e.message : '注册失败，请稍后重试'
+    if (e instanceof ApiError && e.status === 409) {
+      registerConflict.value = true
+      error.value = '邮箱或用户名已被占用；若邮箱尚未验证，可以尝试重发验证邮件。'
+    } else {
+      error.value = e instanceof Error ? e.message : '注册失败，请稍后重试'
+    }
   } finally {
     loading.value = false
   }
@@ -55,40 +75,41 @@ async function handleRegister() {
             加入天空探索者
             <span class="block text-sky-700">建立你的云图档案</span>
           </h1>
-          <!-- <p class="mt-6 max-w-lg text-base leading-8 text-slate-600">
-            注册后即可上传云图、点亮图鉴、在社区画廊里按时间展示你的观测记录。所有页面都会围绕你的个人云层档案同步更新。
-          </p> -->
         </div>
         <div class="mt-8 grid min-w-0 grid-cols-2 gap-4">
           <div class="min-w-0 border border-slate-200 bg-white px-4 py-3">
-            <div class="oc-stat-label">Review</div>
-            <div class="oc-stat-value">Queue</div>
-            <div class="oc-field-help">上传后进入审核队列</div>
+            <div class="oc-stat-label">Step 1</div>
+            <div class="oc-stat-value">Join</div>
+            <div class="oc-field-help">填写账号资料</div>
           </div>
           <div class="min-w-0 border border-slate-200 bg-white px-4 py-3">
-            <div class="oc-stat-label">Profile</div>
-            <div class="oc-stat-value">Journal</div>
-            <div class="oc-field-help">自动生成个人天空日志</div>
+            <div class="oc-stat-label">Step 2</div>
+            <div class="oc-stat-value">Verify</div>
+            <div class="oc-field-help">通过邮件确认邮箱</div>
           </div>
         </div>
       </section>
 
       <NCard class="oc-panel-card-xl min-w-0 h-full">
         <NResult
-          v-if="emailSent"
-          status="success"
+          v-if="registered"
+          :status="emailDelivered ? 'success' : 'warning'"
           title="确认你的邮箱"
-          description="确认邮件已经发送，请查收并点击链接完成注册。"
+          :description="emailDelivered
+            ? '确认邮件已经发送，请查收并点击链接完成注册。'
+            : '账号已创建，但验证邮件暂未送达。请使用重发验证功能，不要重复注册。'"
         >
           <template #footer>
             <div class="space-y-4">
-              <p class="text-sm text-slate-500">
-                目标邮箱：
-                <span class="font-semibold text-slate-700">{{ email }}</span>
-              </p>
-              <RouterLink to="/login" class="no-underline">
-                <NButton type="primary" class="oc-primary-button oc-primary-button--teal">去登录</NButton>
-              </RouterLink>
+              <p class="text-sm text-slate-500">目标邮箱：<span class="font-semibold text-slate-700">{{ email }}</span></p>
+              <div class="flex flex-wrap justify-center gap-3">
+                <RouterLink :to="{ path: '/resend-confirmation', query: { email } }" class="no-underline">
+                  <NButton type="default" class="oc-panel-button oc-panel-button--sky">重发验证邮件</NButton>
+                </RouterLink>
+                <RouterLink :to="{ path: '/login', query: { email } }" class="no-underline">
+                  <NButton type="default" class="oc-panel-button oc-panel-button--teal">去登录</NButton>
+                </RouterLink>
+              </div>
             </div>
           </template>
         </NResult>
@@ -97,86 +118,36 @@ async function handleRegister() {
           <div class="mb-8">
             <div class="text-sm uppercase tracking-[0.22em] text-slate-500">Create Account</div>
             <h2 class="mt-3 text-3xl font-bold text-slate-900">注册 OpenCloud</h2>
-            <p class="mt-2 text-sm text-slate-500">加入社区后即可开始记录、收集与展示云图。</p>
+            <p class="mt-2 text-sm text-slate-500">注册后，请先通过邮件确认邮箱再登录。</p>
           </div>
 
           <NForm @submit.prevent="handleRegister">
             <NFormItem label="用户名">
-              <NInput
-                v-model:value="username"
-                type="text"
-                :input-props="{
-                  autocomplete: 'username',
-                  name: 'username',
-                  required: true,
-                }"
-                placeholder="你的昵称"
-                maxlength="20"
-              />
+              <NInput v-model:value="name" maxlength="16" show-count placeholder="最多 16 个字符" :input-props="{ autocomplete: 'username', name: 'username', required: true }" />
             </NFormItem>
-
             <NFormItem label="邮箱">
-              <NInput
-                v-model:value="email"
-                type="text"
-                :input-props="{
-                  autocomplete: 'email',
-                  inputmode: 'email',
-                  name: 'email',
-                  required: true,
-                }"
-                placeholder="your@email.com"
-              />
+              <NInput v-model:value="email" maxlength="64" type="text" placeholder="your@email.com" :input-props="{ autocomplete: 'email', inputmode: 'email', name: 'email', required: true }" />
             </NFormItem>
-
             <NFormItem label="密码">
-              <NInput
-                v-model:value="password"
-                type="password"
-                show-password-on="click"
-                :input-props="{
-                  autocomplete: 'new-password',
-                  name: 'new-password',
-                  required: true,
-                }"
-                placeholder="至少8位"
-              />
+              <NInput v-model:value="password" type="password" show-password-on="click" placeholder="至少 8 位" :input-props="{ autocomplete: 'new-password', name: 'new-password', required: true }" />
             </NFormItem>
-
             <NFormItem label="确认密码">
-              <NInput
-                v-model:value="confirmPassword"
-                type="password"
-                show-password-on="click"
-                :input-props="{
-                  autocomplete: 'new-password',
-                  name: 'confirm-new-password',
-                  required: true,
-                }"
-                placeholder="再次输入密码"
-              />
+              <NInput v-model:value="confirmPassword" type="password" show-password-on="click" placeholder="再次输入密码" :input-props="{ autocomplete: 'new-password', name: 'confirm-new-password', required: true }" />
             </NFormItem>
 
             <NAlert v-if="error" type="error" class="mb-4">
               {{ error }}
+              <div v-if="canResend" class="mt-2">
+                <RouterLink :to="{ path: '/resend-confirmation', query: { email } }" class="font-semibold text-rose-700 underline underline-offset-2">重发验证邮件</RouterLink>
+              </div>
             </NAlert>
 
-            <NButton
-              attr-type="submit"
-              type="primary"
-              block
-              size="large"
-              class="oc-primary-button oc-primary-button--sky"
-              :loading="loading"
-            >
+            <NButton attr-type="submit" type="primary" block size="large" class="oc-primary-button oc-primary-button--sky" :loading="loading">
               {{ loading ? '注册中...' : '注册' }}
             </NButton>
           </NForm>
 
-          <p class="mt-6 text-sm text-slate-500">
-            已有账号？
-            <RouterLink to="/login" class="font-semibold text-sky-700 hover:text-sky-800">去登录</RouterLink>
-          </p>
+          <p class="mt-6 text-sm text-slate-500">已有账号？ <RouterLink :to="{ path: '/login', query: { email } }" class="font-semibold text-sky-700 hover:text-sky-800">去登录</RouterLink></p>
         </template>
       </NCard>
     </div>
diff --git a/src/views/auth/ResendConfirmationView.vue b/src/views/auth/ResendConfirmationView.vue
new file mode 100644
index 0000000..8724be3
--- /dev/null
+++ b/src/views/auth/ResendConfirmationView.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import { computed, onUnmounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+import { NAlert, NButton, NCard, NForm, NFormItem, NInput, NResult } from 'naive-ui'
+import { useAuthStore } from '@/stores/auth'
+
+const authStore = useAuthStore()
+const route = useRoute()
+const email = ref(typeof route.query.email === 'string' ? route.query.email : '')
+const error = ref('')
+const loading = ref(false)
+const submitted = ref(false)
+const cooldown = ref(0)
+let timer: ReturnType<typeof setInterval> | null = null
+
+const buttonLabel = computed(() => loading.value ? '发送中...' : cooldown.value > 0 ? `重新发送（${cooldown.value}s）` : '重新发送')
+
+function startCooldown() {
+  if (timer) clearInterval(timer)
+  cooldown.value = 60
+  timer = setInterval(() => {
+    cooldown.value--
+    if (cooldown.value <= 0 && timer) {
+      clearInterval(timer)
+      timer = null
+    }
+  }, 1000)
+}
+
+async function submit() {
+  error.value = ''
+  const value = email.value.trim()
+  if (!value || value.length > 64) {
+    error.value = '请输入不超过 64 个字符的有效邮箱'
+    return
+  }
+  loading.value = true
+  try {
+    await authStore.resendConfirmation(value)
+    email.value = value
+    submitted.value = true
+    startCooldown()
+  } catch (e: unknown) {
+    error.value = e instanceof Error ? e.message : '验证邮件发送失败，请稍后重试'
+  } finally {
+    loading.value = false
+  }
+}
+
+onUnmounted(() => { if (timer) clearInterval(timer) })
+</script>
+
+<template>
+  <div class="min-h-[calc(100vh-4rem)] px-4 py-10">
+    <div class="mx-auto max-w-2xl">
+      <NCard class="oc-panel-card-xl">
+        <NResult v-if="submitted" status="success" title="请求已受理" description="如果该邮箱符合条件，我们会发送新的验证邮件。">
+          <template #footer>
+            <div class="space-y-4">
+              <p class="text-sm text-slate-500">目标邮箱：<span class="font-semibold text-slate-700">{{ email }}</span></p>
+              <div class="flex flex-wrap justify-center gap-3">
+                <NButton type="default" class="oc-panel-button oc-panel-button--sky" :disabled="cooldown > 0" :loading="loading" @click="submit">{{ buttonLabel }}</NButton>
+                <RouterLink :to="{ path: '/login', query: { email } }" class="no-underline"><NButton type="default" class="oc-panel-button oc-panel-button--teal">返回登录</NButton></RouterLink>
+              </div>
+            </div>
+          </template>
+        </NResult>
+        <template v-else>
+          <div class="mb-8">
+            <div class="text-sm uppercase tracking-[0.22em] text-slate-500">Email Verification</div>
+            <h1 class="mt-3 text-3xl font-bold text-slate-900">重发验证邮件</h1>
+            <p class="mt-2 text-sm text-slate-500">输入注册邮箱。为保护账号，系统不会透露邮箱是否存在或已验证。</p>
+          </div>
+          <NForm @submit.prevent="submit">
+            <NFormItem label="邮箱"><NInput v-model:value="email" maxlength="64" type="text" placeholder="your@email.com" :input-props="{ autocomplete: 'email', inputmode: 'email', name: 'email', required: true }" /></NFormItem>
+            <NAlert v-if="error" type="error" class="mb-4">{{ error }}</NAlert>
+            <NButton attr-type="submit" type="primary" block size="large" class="oc-primary-button oc-primary-button--sky" :loading="loading">{{ loading ? '发送中...' : '发送验证邮件' }}</NButton>
+          </NForm>
+        </template>
+      </NCard>
+    </div>
+  </div>
+</template>
diff --git a/src/views/auth/ResetPasswordView.vue b/src/views/auth/ResetPasswordView.vue
index 342b2b8..a22dde3 100644
--- a/src/views/auth/ResetPasswordView.vue
+++ b/src/views/auth/ResetPasswordView.vue
@@ -1,206 +1,90 @@
 <script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref } from 'vue'
+import { computed, onUnmounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { NAlert, NButton, NCard, NForm, NFormItem, NInput, NResult, NSpin } from 'naive-ui'
-import { apiRequest } from '@/lib/api'
+import { NAlert, NButton, NCard, NForm, NFormItem, NInput, NResult } from 'naive-ui'
+import { useAuthStore } from '@/stores/auth'
 
+const authStore = useAuthStore()
 const route = useRoute()
 const router = useRouter()
-
+const email = typeof route.query.email === 'string' ? route.query.email : ''
+const token = typeof route.query.token === 'string' ? route.query.token : ''
 const password = ref('')
 const confirmPassword = ref('')
-const error = ref('')
-const state = ref<'checking' | 'ready' | 'invalid' | 'success'>('checking')
+const error = ref(!email || !token ? '密码重置链接缺少必要信息，请重新发送邮件。' : '')
+const invalid = ref(!email || !token)
+const success = ref(false)
 const loading = ref(false)
 const countdown = ref(5)
-const initialResetToken = typeof route.query.token === 'string' ? route.query.token : ''
-const resetToken = ref(initialResetToken)
-let countdownTimer: ReturnType<typeof setInterval> | null = null
+let timer: ReturnType<typeof setInterval> | null = null
 
-if (route.query.token !== undefined) {
-  window.history.replaceState(window.history.state, '', window.location.pathname)
+if (route.query.token !== undefined || route.query.email !== undefined) {
+  window.history.replaceState(window.history.state, '', route.path)
 }
 
-const canSubmit = computed(() =>
-  state.value === 'ready' && password.value.length >= 8 && password.value === confirmPassword.value,
-)
-
-function showInvalidRecoveryLink() {
-  error.value = '密码重置链接无效或已过期，请重新发送邮件。'
-  state.value = 'invalid'
-}
-
-function getResetErrorMessage(value: unknown) {
-  const message = value instanceof Error ? value.message : ''
-  if (message.includes('无效') || message.includes('过期') || message.includes('expired')) {
-    return '密码重置链接无效或已过期，请重新发送邮件。'
-  }
-
-  if (message.includes('8')) {
-    return '新密码至少需要 8 位。'
-  }
-
-  return message || '密码重置失败，请稍后重试。'
-}
+const canSubmit = computed(() => !invalid.value && password.value.length >= 8 && password.value === confirmPassword.value)
 
 function startCountdown() {
-  countdownTimer = setInterval(() => {
+  timer = setInterval(() => {
     countdown.value--
     if (countdown.value <= 0) {
-      if (countdownTimer) clearInterval(countdownTimer)
-      router.push('/login')
+      if (timer) clearInterval(timer)
+      void router.push({ path: '/login', query: { email } })
     }
   }, 1000)
 }
 
-async function initializeRecoverySession() {
-  if (!resetToken.value) {
-    showInvalidRecoveryLink()
-    return
-  }
-  state.value = 'ready'
-}
-
-async function handleResetPassword() {
+async function submit() {
   error.value = ''
-
   if (password.value.length < 8) {
-    error.value = '新密码至少需要 8 位。'
+    error.value = '新密码至少需要 8 位'
     return
   }
   if (password.value !== confirmPassword.value) {
-    error.value = '两次输入的密码不一致。'
+    error.value = '两次输入的密码不一致'
     return
   }
-
   loading.value = true
   try {
-    await apiRequest('/auth/reset-password', {
-      method: 'POST',
-      auth: false,
-      body: { token: resetToken.value, password: password.value },
-    })
-    countdown.value = 5
-    state.value = 'success'
+    await authStore.resetPassword(email, token, password.value)
+    success.value = true
     startCountdown()
-  } catch (e) {
-    error.value = getResetErrorMessage(e)
-    if (error.value === '密码重置链接无效或已过期，请重新发送邮件。') {
-      state.value = 'invalid'
-    }
+  } catch (e: unknown) {
+    error.value = e instanceof Error ? e.message : '密码重置失败，请稍后重试'
+    if (error.value.includes('无效') || error.value.includes('过期')) invalid.value = true
   } finally {
     loading.value = false
   }
 }
 
-onMounted(() => {
-  void initializeRecoverySession()
-})
-
-onUnmounted(() => {
-  if (countdownTimer) clearInterval(countdownTimer)
-})
+onUnmounted(() => { if (timer) clearInterval(timer) })
 </script>
 
 <template>
   <div class="min-h-[calc(100vh-4rem)] px-4 py-10">
     <div class="mx-auto max-w-2xl">
       <NCard class="oc-panel-card-xl">
-        <NResult
-          v-if="state === 'success'"
-          status="success"
-          title="密码已重置"
-          description="你已使用新密码完成更新，现在可以重新登录。"
-        >
+        <NResult v-if="success" status="success" title="密码已重置" description="请使用新密码重新登录。">
           <template #footer>
             <div class="space-y-4">
-              <p class="text-sm text-slate-500">{{ countdown }} 秒后自动跳转登录页面...</p>
-              <NButton type="primary" class="oc-primary-button oc-primary-button--teal" @click="router.push('/login')">立即登录</NButton>
+              <p class="text-sm text-slate-500">{{ countdown }} 秒后自动前往登录页面</p>
+              <NButton type="default" class="oc-panel-button oc-panel-button--teal" @click="router.push({ path: '/login', query: { email } })">立即登录</NButton>
             </div>
           </template>
         </NResult>
 
-        <template v-else-if="state === 'checking'">
-          <div class="flex flex-col items-center justify-center py-12 text-center">
-            <NSpin size="large" />
-            <h1 class="mt-6 text-2xl font-bold text-slate-900">正在验证重置链接...</h1>
-            <p class="mt-2 text-slate-500">请稍候</p>
-          </div>
-        </template>
-
         <template v-else>
           <div class="mb-8">
             <div class="text-sm uppercase tracking-[0.22em] text-slate-500">Password Recovery</div>
             <h1 class="mt-3 text-3xl font-bold text-slate-900">设置新密码</h1>
-            <p class="mt-2 text-sm text-slate-500">
-              {{
-                state === 'invalid'
-                  ? '当前重置链接不可用，请重新发送密码重置邮件。'
-                  : '请输入新的登录密码，提交后当前重置链接会失效。'
-              }}
-            </p>
+            <p class="mt-2 text-sm text-slate-500">提交成功后，此重置链接和现有登录会话都会失效。</p>
           </div>
-
-          <NForm @submit.prevent="handleResetPassword">
-            <input
-              type="text"
-              name="username"
-              autocomplete="username"
-              class="sr-only"
-              tabindex="-1"
-              aria-label="账户用户名"
-            />
-            <NFormItem label="新密码">
-              <NInput
-                v-model:value="password"
-                type="password"
-                show-password-on="click"
-                :input-props="{
-                  autocomplete: 'new-password',
-                  name: 'new-password',
-                  required: true,
-                }"
-                placeholder="至少 8 位"
-              />
-            </NFormItem>
-
-            <NFormItem label="确认新密码">
-              <NInput
-                v-model:value="confirmPassword"
-                type="password"
-                show-password-on="click"
-                :input-props="{
-                  autocomplete: 'new-password',
-                  name: 'confirm-new-password',
-                  required: true,
-                }"
-                placeholder="再次输入新密码"
-              />
-            </NFormItem>
-
-            <NAlert v-if="error" type="error" class="mb-4">
-              {{ error }}
-            </NAlert>
-
-            <RouterLink
-              v-if="state === 'invalid'"
-              to="/forgot-password"
-              class="mb-4 block text-sm font-semibold text-teal-700 hover:text-teal-800"
-            >
-              返回重新发送重置邮件
-            </RouterLink>
-
-            <NButton
-              attr-type="submit"
-              type="primary"
-              block
-              size="large"
-              class="oc-primary-button oc-primary-button--teal"
-              :disabled="!canSubmit"
-              :loading="loading"
-            >
-              保存新密码
-            </NButton>
+          <NForm @submit.prevent="submit">
+            <NFormItem label="新密码"><NInput v-model:value="password" type="password" show-password-on="click" placeholder="至少 8 位" :disabled="invalid" :input-props="{ autocomplete: 'new-password', name: 'new-password', required: true }" /></NFormItem>
+            <NFormItem label="确认新密码"><NInput v-model:value="confirmPassword" type="password" show-password-on="click" placeholder="再次输入新密码" :disabled="invalid" :input-props="{ autocomplete: 'new-password', name: 'confirm-new-password', required: true }" /></NFormItem>
+            <NAlert v-if="error" type="error" class="mb-4">{{ error }}</NAlert>
+            <RouterLink v-if="invalid" :to="{ path: '/forgot-password', query: { email } }" class="mb-4 block text-sm font-semibold text-teal-700 hover:text-teal-800">重新发送密码重置邮件</RouterLink>
+            <NButton attr-type="submit" type="primary" block size="large" class="oc-primary-button oc-primary-button--teal" :disabled="!canSubmit" :loading="loading">保存新密码</NButton>
           </NForm>
         </template>
       </NCard>
diff --git a/src/views/encyclopedia/CloudTypeView.vue b/src/views/encyclopedia/CloudTypeView.vue
index 4f11650..907f76f 100644
--- a/src/views/encyclopedia/CloudTypeView.vue
+++ b/src/views/encyclopedia/CloudTypeView.vue
@@ -1,126 +1,60 @@
 <script setup lang="ts">
 import { computed, onMounted, ref, watch } from 'vue'
-import { NAlert, NButton, NCard, NEmpty, NSkeleton, NTag } from 'naive-ui'
+import { NAlert, NButton, NEmpty, NSkeleton } from 'naive-ui'
 import { RouterLink, useRoute } from 'vue-router'
 import ImageDetailModal from '@/components/cloud/ImageDetailModal.vue'
 import MiniLocationMap from '@/components/cloud/MiniLocationMap.vue'
-import { apiRequest } from '@/lib/api'
-import { useAuthStore } from '@/stores/auth'
+import { apiRequest, imageUrl, toApiCloud } from '@/lib/api'
 import { useEncyclopediaStore } from '@/stores/encyclopedia'
-import type { ApiCloud, ApiPage } from '@/types/api'
-import type { CloudType } from '@/types/database'
-
-interface CloudGalleryItem {
-  id: string
-  image_url: string
-  thumbnail_url: string | null
-  latitude: number | null
-  longitude: number | null
-  location_name: string | null
-  description: string | null
-  captured_at: string | null
-  created_at: string
-  profiles: {
-    username: string
-  } | null
-}
+import type { ApiCloud, BackendCloudInfo } from '@/types/api'
 
+const PAGE_SIZE = 24
 const route = useRoute()
-const authStore = useAuthStore()
 const encyclopediaStore = useEncyclopediaStore()
-
 const loading = ref(true)
 const loadError = ref('')
-const gallery = ref<CloudGalleryItem[]>([])
-const selectedGalleryItem = ref<CloudGalleryItem | null>(null)
-const publicCount = ref(0)
-
-const rarityMeta = {
-  common: { label: '常见', chip: 'bg-sky-100 text-sky-700 border-sky-200', glow: 'from-sky-100 via-white to-cyan-50' },
-  uncommon: { label: '少见', chip: 'bg-amber-100 text-amber-700 border-amber-200', glow: 'from-amber-100 via-white to-orange-50' },
-  rare: { label: '罕见', chip: 'bg-rose-100 text-rose-700 border-rose-200', glow: 'from-rose-100 via-white to-orange-50' },
-} satisfies Record<CloudType['rarity'], { label: string; chip: string; glow: string }>
+const gallery = ref<ApiCloud[]>([])
+const selectedItem = ref<ApiCloud | null>(null)
+const currentPage = ref(1)
+const hasNextPage = ref(false)
 
 const cloudTypeId = computed(() => Number(route.params.id))
 const cloudType = computed(() => encyclopediaStore.cloudTypes.find(item => item.id === cloudTypeId.value) ?? null)
-const collectionEntry = computed(() => {
-  if (!authStore.isLoggedIn || !cloudType.value) return null
-  return encyclopediaStore.getCollectionEntry(cloudType.value.id)
-})
-const isUnlocked = computed(() => !!collectionEntry.value)
-const heroImage = computed(() => collectionEntry.value?.firstCloud?.image_url || gallery.value[0]?.image_url || null)
-
-function formatDate(iso: string | null) {
-  if (!iso) return '未知时间'
-  return new Date(iso).toLocaleDateString('zh-CN', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-  })
-}
-
-function formatGalleryTime(item: CloudGalleryItem) {
-  return formatDate(item.captured_at || item.created_at)
-}
+const heroImage = computed(() => cloudType.value?.icon_id ? imageUrl(cloudType.value.icon_id, 'original') : null)
 
 function formatDateTime(iso: string | null) {
-  if (!iso) return '未知时间'
+  if (!iso) return '未记录拍摄时间'
   return new Date(iso).toLocaleString('zh-CN', {
-    year: 'numeric',
-    month: 'numeric',
-    day: 'numeric',
-    hour: '2-digit',
-    minute: '2-digit',
+    year: 'numeric', month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit',
   })
 }
 
-function formatCoordinate(value: number | null) {
-  return value === null ? '未记录' : value.toFixed(2)
+async function loadGallery(page: number) {
+  const params = new URLSearchParams({ page: String(page), page_size: String(PAGE_SIZE) })
+  const rows = await apiRequest<BackendCloudInfo[]>(`/cloud/type/${cloudTypeId.value}?${params}`, { auth: false })
+  gallery.value = rows.map(toApiCloud)
+  currentPage.value = page
+  hasNextPage.value = rows.length === PAGE_SIZE
 }
 
-function openGalleryDetail(item: CloudGalleryItem) {
-  selectedGalleryItem.value = item
-}
-
-async function loadGallery(typeId: number) {
-  const result = await apiRequest<ApiPage<ApiCloud>>(`/cloud-types/${typeId}/clouds?page=1&page_size=24`, { auth: false })
-  gallery.value = result.items.map(row => ({
-    id: row.id,
-    image_url: row.image_url,
-    thumbnail_url: row.thumbnail_url,
-    latitude: row.latitude,
-    longitude: row.longitude,
-    location_name: row.location_name,
-    description: row.description,
-    captured_at: row.captured_at,
-    created_at: row.created_at,
-    profiles: row.username ? { username: row.username } : null,
-  }))
-  publicCount.value = result.total
-}
-
-async function loadPage() {
-  if (!Number.isFinite(cloudTypeId.value) || cloudTypeId.value <= 0) {
-    loadError.value = '云型不存在'
+async function loadPage(page = 1) {
+  if (!Number.isInteger(cloudTypeId.value) || cloudTypeId.value <= 0) {
+    loadError.value = '云类型不存在'
     loading.value = false
     return
   }
 
   loading.value = true
   loadError.value = ''
-
+  selectedItem.value = null
   try {
     await encyclopediaStore.fetchCloudTypes()
-    await encyclopediaStore.fetchMyCollection()
-
     if (!cloudType.value) {
-      loadError.value = '云型不存在'
+      loadError.value = '云类型不存在'
       gallery.value = []
-      publicCount.value = 0
       return
     }
-
-    await loadGallery(cloudType.value.id)
+    await loadGallery(page)
   } catch (error) {
     loadError.value = error instanceof Error ? error.message : '详情加载失败'
   } finally {
@@ -128,191 +62,81 @@ async function loadPage() {
   }
 }
 
-onMounted(loadPage)
-watch(() => route.params.id, loadPage)
-
-watch(() => route.params.id, () => {
-  selectedGalleryItem.value = null
-})
+onMounted(() => loadPage())
+watch(() => route.params.id, () => loadPage())
 </script>
 
 <template>
-  <div class="max-w-6xl mx-auto px-4 py-8">
-    <div class="mb-6">
-      <RouterLink to="/encyclopedia">
-        <NButton type="default" secondary strong class="oc-panel-button oc-panel-button--neutral">← 返回图鉴总览</NButton>
-      </RouterLink>
-    </div>
+  <div class="oc-container oc-container--content py-8">
+    <RouterLink to="/encyclopedia">
+      <NButton type="default" secondary strong class="oc-panel-button oc-panel-button--neutral">← 返回百科总览</NButton>
+    </RouterLink>
 
-    <div v-if="loading" class="space-y-6">
+    <div v-if="loading" class="mt-6 space-y-6">
       <NSkeleton class="h-80 w-full" />
-      <div class="grid gap-4 lg:grid-cols-3">
-        <NCard v-for="n in 3" :key="n" class="oc-panel-card border border-slate-200">
-          <NSkeleton class="h-4 w-1/3" />
-          <NSkeleton class="mt-4 h-7 w-1/2" />
-        </NCard>
-      </div>
+      <div class="grid gap-4 md:grid-cols-3"><NSkeleton v-for="n in 6" :key="n" class="h-56 w-full" /></div>
     </div>
 
-    <NAlert
-      v-else-if="loadError"
-      type="error"
-      :show-icon="false"
-      :bordered="false"
-      title="详情加载失败"
-    >
+    <NAlert v-else-if="loadError" class="mt-6" type="error" :show-icon="false" :bordered="false" title="详情加载失败">
       {{ loadError }}
     </NAlert>
 
     <template v-else-if="cloudType">
-      <section class="oc-panel-card overflow-hidden border border-slate-200 bg-white">
-        <div class="grid lg:grid-cols-[1.15fr_0.85fr]">
-          <div class="relative min-h-[360px] overflow-hidden">
-            <img
-              v-if="heroImage"
-              :src="heroImage"
-              :alt="cloudType.name"
-              class="absolute inset-0 h-full w-full object-cover"
-            />
-            <div
-              v-else
-              class="absolute inset-0 bg-gradient-to-br"
-              :class="rarityMeta[cloudType.rarity].glow"
-            ></div>
-            <div class="absolute inset-0 bg-gradient-to-t from-slate-950/78 via-slate-950/18 to-transparent"></div>
-            <div class="absolute bottom-8 left-8 right-8 text-white">
-              <NTag :bordered="false" class="border border-white/20 bg-white/12 text-white backdrop-blur">
-                {{ rarityMeta[cloudType.rarity].label }}
-              </NTag>
+      <section class="oc-panel-card mt-6 overflow-hidden border border-slate-200 bg-white">
+        <div class="grid lg:grid-cols-[1.05fr_0.95fr]">
+          <div class="relative min-h-80 bg-sky-50">
+            <img v-if="heroImage" :src="heroImage" :alt="cloudType.name" class="absolute inset-0 h-full w-full object-cover" />
+            <div v-else class="absolute inset-0 flex items-center justify-center pb-20 text-sm font-medium text-slate-500">无图片</div>
+            <div v-if="heroImage" class="absolute inset-0 bg-gradient-to-t from-slate-950/75 via-slate-950/10 to-transparent"></div>
+            <div class="absolute bottom-7 left-7 right-7" :class="heroImage ? 'text-white' : 'text-slate-900'">
+              <span
+                class="border px-2.5 py-1 text-xs"
+                :class="heroImage ? 'border-white/35 bg-slate-950/25 backdrop-blur' : 'border-slate-200 bg-white'"
+              >稀有度 {{ cloudType.rarity_value }}</span>
               <h1 class="mt-4 text-4xl font-bold">{{ cloudType.name }}</h1>
-              <p class="mt-2 text-lg text-white/82">{{ cloudType.name_en }}</p>
+              <p class="mt-2" :class="heroImage ? 'text-white/80' : 'text-slate-600'">{{ cloudType.genus || '未提供云属名称' }}</p>
             </div>
           </div>
-
-          <div class="flex flex-col justify-between bg-slate-50 p-8">
-            <div>
-              <p class="text-sm font-medium uppercase tracking-[0.22em] text-slate-500">Meteorology Note</p>
-              <p class="mt-5 text-base leading-8 text-slate-700">
-                {{ cloudType.description || '这类云的图像、形成条件和观测要点会随着图鉴完善逐步补充。' }}
-              </p>
-            </div>
-
-            <div class="oc-inset-panel mt-8">
-              <p class="text-sm text-slate-500">你的收集状态</p>
-              <template v-if="isUnlocked && collectionEntry">
-                <p class="oc-stat-value">已解锁</p>
-                <p class="mt-2 text-sm text-slate-600">首次解锁于 {{ formatDate(collectionEntry.unlocked_at) }}</p>
-              </template>
-              <template v-else>
-                <p class="oc-stat-value">尚未解锁</p>
-                <p class="mt-2 text-sm text-slate-600">拍到并上传这种云朵后，这枚徽章就会被点亮。</p>
-              </template>
-            </div>
+          <div class="p-8">
+            <p class="oc-section-label">Meteorology Note</p>
+            <p class="mt-5 text-base leading-8 text-slate-700">{{ cloudType.description || '暂未提供识别说明。' }}</p>
           </div>
         </div>
       </section>
 
-      <section class="mt-6 grid gap-4 md:grid-cols-3">
-        <NCard class="oc-panel-card border border-slate-200">
-          <p class="text-sm text-slate-500">稀有度</p>
-          <p class="oc-stat-value">{{ rarityMeta[cloudType.rarity].label }}</p>
-        </NCard>
-        <NCard class="oc-panel-card border border-slate-200">
-          <p class="text-sm text-slate-500">公开云图</p>
-          <p class="oc-stat-value">{{ publicCount }}</p>
-        </NCard>
-        <NCard class="oc-panel-card border border-slate-200">
-          <p class="text-sm text-slate-500">首次解锁</p>
-          <p class="mt-2 text-xl font-bold text-slate-900">
-            {{ collectionEntry ? formatDate(collectionEntry.unlocked_at) : '等待记录' }}
-          </p>
-        </NCard>
-      </section>
-
       <section class="mt-8">
-        <div class="mb-4 flex items-end justify-between gap-4">
-          <div>
-            <h2 class="text-2xl font-bold text-slate-900">该类型云图画廊</h2>
-            <p class="oc-field-help">来自社区公开可见的已通过云图。</p>
+        <div class="mb-5 flex items-end justify-between gap-4">
+          <div><h2 class="text-2xl font-bold text-slate-900">公开观测</h2><p class="oc-field-help">第 {{ currentPage }} 页，每页最多 {{ PAGE_SIZE }} 张。</p></div>
+          <div class="flex gap-3">
+            <NButton type="default" secondary strong class="oc-panel-button oc-panel-button--neutral" :disabled="currentPage === 1" @click="loadPage(currentPage - 1)">上一页</NButton>
+            <NButton type="default" secondary strong class="oc-panel-button oc-panel-button--sky" :disabled="!hasNextPage" @click="loadPage(currentPage + 1)">下一页</NButton>
           </div>
         </div>
 
-        <div v-if="gallery.length" class="grid gap-5 md:grid-cols-2 xl:grid-cols-3">
-          <button
-            v-for="item in gallery"
-            :key="item.id"
-            type="button"
-            class="oc-interactive-card overflow-hidden border border-slate-200 bg-white text-left transition-transform duration-300 hover:-translate-y-1"
-            @click="openGalleryDetail(item)"
-          >
-            <img :src="item.thumbnail_url || item.image_url" :alt="cloudType.name" class="h-56 w-full object-cover" />
-            <div class="p-5">
-              <div class="flex items-center justify-between gap-4">
-                <p class="text-sm font-medium text-slate-900">{{ item.profiles?.username || '匿名' }}</p>
-                <p class="text-xs text-slate-400">{{ formatGalleryTime(item) }}</p>
-              </div>
-              <p class="mt-2 text-sm text-slate-600">{{ item.location_name || '未填写位置' }}</p>
-              <p v-if="item.description" class="mt-3 line-clamp-3 text-sm leading-6 text-slate-500">
-                {{ item.description }}
-              </p>
-            </div>
+        <div v-if="gallery.length" class="grid gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+          <button v-for="item in gallery" :key="item.id" type="button" class="oc-interactive-card overflow-hidden border border-slate-200 bg-white text-left" @click="selectedItem = item">
+            <img :src="item.thumbnail_url || item.image_url" :alt="cloudType.name" class="h-48 w-full object-cover" />
+            <div class="p-4"><p class="font-medium text-slate-900">@{{ item.username }}</p><p class="mt-1 text-xs text-slate-500">{{ formatDateTime(item.captured_at || item.created_at) }}</p></div>
           </button>
         </div>
-
-        <div v-else class="border border-dashed border-slate-300 bg-white p-8">
-          <NEmpty description="还没有公开作品">
-            <template #extra>
-              <p class="text-sm text-slate-500">等第一位观测者上传这类云图后，这里就会展示出来。</p>
-            </template>
-          </NEmpty>
-        </div>
+        <div v-else class="oc-empty-card border border-dashed border-slate-300 bg-white p-10"><NEmpty description="这一页暂无公开云图" /></div>
       </section>
-
-      <ImageDetailModal
-        v-if="selectedGalleryItem"
-        :open="!!selectedGalleryItem"
-        :image-url="selectedGalleryItem.image_url"
-        :thumbnail-url="selectedGalleryItem.thumbnail_url"
-        :image-alt="cloudType.name"
-        :title="cloudType.name"
-        :subtitle="`上传者：${selectedGalleryItem.profiles?.username || '匿名'}`"
-        :badge-label="rarityMeta[cloudType.rarity].label"
-        :badge-class="rarityMeta[cloudType.rarity].chip"
-        @close="selectedGalleryItem = null"
-      >
-        <div class="grid gap-4 sm:grid-cols-2">
-          <div class="oc-inset-panel">
-            <p class="oc-section-label">上传时间</p>
-            <p class="mt-2 text-sm font-medium text-slate-900">{{ formatDateTime(selectedGalleryItem.created_at) }}</p>
-          </div>
-          <div class="oc-inset-panel">
-            <p class="oc-section-label">拍摄时间</p>
-            <p class="mt-2 text-sm font-medium text-slate-900">{{ formatDateTime(selectedGalleryItem.captured_at) }}</p>
-          </div>
-          <div class="oc-inset-panel">
-            <p class="oc-section-label">位置</p>
-            <p class="mt-2 text-sm font-medium text-slate-900">{{ selectedGalleryItem.location_name || '未填写位置名称' }}</p>
-          </div>
-          <div class="oc-inset-panel">
-            <p class="oc-section-label">模糊化经纬度</p>
-            <p class="mt-2 text-sm font-medium text-slate-900">
-              纬度 {{ formatCoordinate(selectedGalleryItem.latitude) }} / 经度 {{ formatCoordinate(selectedGalleryItem.longitude) }}
-            </p>
-          </div>
-        </div>
-
-        <div class="mt-5 border border-slate-200 bg-white p-5">
-          <p class="oc-section-label">图片说明</p>
-          <p class="mt-3 text-sm leading-7 text-slate-700">
-            {{ selectedGalleryItem.description || '上传者没有留下额外说明。' }}
-          </p>
-        </div>
-        <MiniLocationMap
-          :latitude="selectedGalleryItem.latitude"
-          :longitude="selectedGalleryItem.longitude"
-          :location-name="selectedGalleryItem.location_name"
-        />
-      </ImageDetailModal>
     </template>
+
+    <ImageDetailModal
+      v-if="selectedItem && cloudType"
+      :open="true"
+      :image-url="selectedItem.image_url"
+      :thumbnail-url="selectedItem.thumbnail_url"
+      :image-alt="cloudType.name"
+      :title="cloudType.name"
+      :subtitle="selectedItem.captured_at ? `拍摄于 ${formatDateTime(selectedItem.captured_at)}` : `上传于 ${formatDateTime(selectedItem.created_at)}`"
+      :badge-label="`稀有度 ${cloudType.rarity_value}`"
+      badge-class="border-slate-200 bg-slate-50 text-slate-600"
+      @close="selectedItem = null"
+    >
+      <p class="text-sm leading-7 text-slate-700">{{ selectedItem.description || '上传者没有留下额外说明。' }}</p>
+      <MiniLocationMap :latitude="selectedItem.latitude" :longitude="selectedItem.longitude" />
+    </ImageDetailModal>
   </div>
 </template>
diff --git a/src/views/encyclopedia/EncyclopediaView.vue b/src/views/encyclopedia/EncyclopediaView.vue
index c0ce7bf..443d36f 100644
--- a/src/views/encyclopedia/EncyclopediaView.vue
+++ b/src/views/encyclopedia/EncyclopediaView.vue
@@ -1,109 +1,36 @@
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import { NAlert, NEmpty, NIcon, NSkeleton } from 'naive-ui'
+import { onMounted } from 'vue'
+import { NEmpty, NSkeleton } from 'naive-ui'
 import { useRouter } from 'vue-router'
-import { useAuthStore } from '@/stores/auth'
+import { imageUrl } from '@/lib/api'
 import { useEncyclopediaStore } from '@/stores/encyclopedia'
-import EncyclopediaProgressCard from '@/components/cloud/EncyclopediaProgressCard.vue'
-import { Lock } from '@vicons/tabler'
-import type { CloudType } from '@/types/database'
 
 const router = useRouter()
-const authStore = useAuthStore()
 const encyclopediaStore = useEncyclopediaStore()
 
-const lockHint = ref('')
-let lockHintTimer: number | null = null
-
-const rarityMeta = {
-  common: { label: '常见', chip: 'bg-sky-100 text-sky-700 border-sky-200', glow: 'from-sky-100 to-white' },
-  uncommon: { label: '少见', chip: 'bg-amber-100 text-amber-700 border-amber-200', glow: 'from-amber-100 to-white' },
-  rare: { label: '罕见', chip: 'bg-rose-100 text-rose-700 border-rose-200', glow: 'from-rose-100 to-white' },
-} satisfies Record<CloudType['rarity'], { label: string; chip: string; glow: string }>
-
-function isUnlocked(cloudTypeId: number) {
-  return authStore.isLoggedIn && encyclopediaStore.isUnlocked(cloudTypeId)
+function typeImageUrl(iconId: string | null) {
+  return iconId ? imageUrl(iconId, 'preview') : ''
 }
 
-function getCollectionEntry(cloudTypeId: number) {
-  if (!authStore.isLoggedIn) return null
-  return encyclopediaStore.getCollectionEntry(cloudTypeId)
-}
-
-function formatUnlockedAt(iso: string) {
-  return new Date(iso).toLocaleDateString('zh-CN', {
-    month: 'numeric',
-    day: 'numeric',
-  })
-}
-
-function showLockHint(name: string) {
-  lockHint.value = `拍到 ${name} 后，这枚徽章就会亮起来。`
-  if (lockHintTimer) window.clearTimeout(lockHintTimer)
-  lockHintTimer = window.setTimeout(() => {
-    lockHint.value = ''
-    lockHintTimer = null
-  }, 2200)
-}
-
-function openCard(cloudType: CloudType) {
-  if (isUnlocked(cloudType.id)) {
-    router.push(`/encyclopedia/${cloudType.id}`)
-    return
-  }
-  showLockHint(cloudType.name)
-}
-
-onMounted(async () => {
-  await encyclopediaStore.fetchCloudTypes()
-  await encyclopediaStore.fetchMyCollection()
-})
+onMounted(() => encyclopediaStore.fetchCloudTypes())
 </script>
 
 <template>
   <div class="relative">
     <div class="oc-page-hero">
       <div class="oc-container oc-container--content oc-page-hero__inner">
-        <div class="oc-page-hero__split">
-          <div class="min-w-0">
-            <p class="oc-page-eyebrow">Cloud Encyclopedia</p>
-            <h1 class="oc-page-title">云朵图鉴</h1>
-            <p class="oc-page-description">
-              收集 10 种基础云属。每拍到一种新的云型，图鉴里就会点亮一枚徽章，并记录你第一次遇见它的时间。
-            </p>
-          </div>
-
-          <EncyclopediaProgressCard
-            :unlocked-count="authStore.isLoggedIn ? encyclopediaStore.unlockedCount : 0"
-            :total-count="encyclopediaStore.cloudTypes.length || 10"
-            :is-logged-in="authStore.isLoggedIn"
-          />
-        </div>
+        <p class="oc-page-eyebrow">Cloud Encyclopedia</p>
+        <h1 class="oc-page-title">云朵百科</h1>
+        <p class="oc-page-description">
+          浏览后端提供的云类型资料，了解云属名称、识别说明和社区公开观测记录。
+        </p>
       </div>
     </div>
 
     <div class="oc-container oc-container--content oc-page-content">
-      <NAlert
-        v-if="encyclopediaStore.collectionError && authStore.isLoggedIn"
-        class="mb-6"
-        type="warning"
-        :show-icon="false"
-        :bordered="false"
-        title="图鉴收藏数据暂时不可用"
-      >
-        图鉴收藏数据暂时不可用：{{ encyclopediaStore.collectionError }}
-      </NAlert>
-
       <div v-if="encyclopediaStore.loadingCloudTypes" class="grid gap-5 md:grid-cols-2 lg:grid-cols-3">
         <div v-for="n in 6" :key="n" class="oc-panel-card overflow-hidden border border-slate-200 bg-white">
-          <NSkeleton class="h-44 w-full border-b border-slate-200" />
-          <div class="p-5">
-            <NSkeleton class="h-3 w-1/3" />
-            <NSkeleton class="mt-3 h-6 w-2/5" />
-            <NSkeleton class="mt-2 h-3 w-1/2" />
-            <NSkeleton class="mt-5 h-4 w-full" :repeat="2" />
-            <NSkeleton class="mt-5 h-10 w-full" />
-          </div>
+          <NSkeleton class="h-80 w-full" />
         </div>
       </div>
 
@@ -112,114 +39,54 @@ onMounted(async () => {
           v-for="cloudType in encyclopediaStore.cloudTypes"
           :key="cloudType.id"
           type="button"
-          @click="openCard(cloudType)"
-          class="encyclopedia-type-card oc-interactive-card oc-panel-card flex h-full flex-col overflow-hidden border bg-white text-left"
-          :class="isUnlocked(cloudType.id) ? 'border-sky-200' : 'border-slate-200'"
+          class="oc-interactive-card oc-panel-card relative isolate min-h-80 overflow-hidden border border-slate-200 bg-sky-50 text-left"
+          @click="router.push(`/encyclopedia/${cloudType.id}`)"
         >
-          <div class="relative h-44 shrink-0 overflow-hidden border-b border-slate-200 bg-sky-50">
-            <img
-              v-if="getCollectionEntry(cloudType.id)?.firstCloud?.image_url"
-              :src="getCollectionEntry(cloudType.id)?.firstCloud?.thumbnail_url || getCollectionEntry(cloudType.id)?.firstCloud?.image_url || ''"
-              :alt="cloudType.name"
-              class="encyclopedia-type-card__image h-full w-full object-cover"
-              :class="isUnlocked(cloudType.id) ? '' : 'grayscale contrast-75'"
-            />
-            <div
-              v-else
-              class="flex h-full w-full items-center justify-center bg-gradient-to-br"
-              :class="isUnlocked(cloudType.id) ? rarityMeta[cloudType.rarity].glow : 'from-slate-200 to-slate-50'"
-            >
-              <span class="font-mono text-5xl font-bold text-slate-500/75">{{ cloudType.name.slice(0, 1) }}</span>
-            </div>
+          <img
+            v-if="cloudType.icon_id"
+            :src="typeImageUrl(cloudType.icon_id)"
+            :alt="`${cloudType.name}介绍图`"
+            class="absolute inset-0 -z-20 h-full w-full object-cover"
+          />
+          <div
+            v-if="cloudType.icon_id"
+            class="absolute inset-0 -z-10 bg-gradient-to-t from-slate-950/90 via-slate-950/55 to-slate-950/25"
+          ></div>
+          <div v-else class="absolute inset-0 -z-10 flex items-center justify-center text-sm font-medium text-slate-500">无图片</div>
 
-            <div v-if="!isUnlocked(cloudType.id)" class="absolute inset-0 flex items-center justify-center bg-slate-950/12">
-              <span class="encyclopedia-lock-badge inline-flex items-center gap-2 border border-slate-300 bg-white/92 px-3 py-2 text-xs font-semibold text-slate-700 backdrop-blur">
-                <NIcon size="15"><Lock /></NIcon>
-                尚未收录
+          <div class="flex min-h-80 flex-col p-5">
+            <div class="flex items-start justify-between gap-4">
+              <div>
+                <p class="oc-section-label" :class="cloudType.icon_id ? 'text-white/70' : 'text-slate-500'">Cloud Genus</p>
+                <h2 class="mt-2 text-xl font-bold" :class="cloudType.icon_id ? 'text-white' : 'text-slate-900'">{{ cloudType.name }}</h2>
+                <p
+                  class="mt-1 font-mono text-xs uppercase tracking-[0.12em]"
+                  :class="cloudType.icon_id ? 'text-white/75' : 'text-slate-500'"
+                >
+                  {{ cloudType.genus || '未提供云属名称' }}
+                </p>
+              </div>
+              <span
+                class="shrink-0 border px-2.5 py-1 text-xs font-medium"
+                :class="cloudType.icon_id ? 'border-white/35 bg-slate-950/25 text-white backdrop-blur' : 'border-slate-200 bg-white text-slate-600'"
+              >
+                稀有度 {{ cloudType.rarity_value }}
               </span>
             </div>
-
-            <div class="absolute left-4 top-4">
-              <span class="inline-flex border px-2.5 py-1 text-[11px] font-semibold uppercase tracking-[0.12em]" :class="rarityMeta[cloudType.rarity].chip">
-                {{ rarityMeta[cloudType.rarity].label }}
-              </span>
-            </div>
-          </div>
-
-          <div class="flex flex-1 flex-col p-5">
-            <p class="oc-section-label">Cloud Genus</p>
-            <h2 class="mt-2 text-xl font-bold text-slate-900">{{ cloudType.name }}</h2>
-            <p class="mt-1 font-mono text-xs uppercase tracking-[0.12em] text-slate-500">{{ cloudType.name_en }}</p>
-
-            <p class="mt-4 line-clamp-2 min-h-[3.25rem] text-sm leading-6 text-slate-600">
-              {{ cloudType.description || '云层特征和识别要点会显示在这里。' }}
+            <p class="mt-auto line-clamp-3 pt-16 text-sm leading-6" :class="cloudType.icon_id ? 'text-white/85' : 'text-slate-600'">
+              {{ cloudType.description || '暂未提供识别说明。' }}
             </p>
-
-            <div class="mt-5 flex items-center justify-between gap-3 border-t border-slate-200 pt-4 text-xs">
-              <template v-if="isUnlocked(cloudType.id) && getCollectionEntry(cloudType.id)">
-                <span class="font-semibold uppercase tracking-[0.12em] text-sky-800">已收录</span>
-                <span class="text-right text-slate-500">首次记录 {{ formatUnlockedAt(getCollectionEntry(cloudType.id)!.unlocked_at) }}</span>
-              </template>
-              <template v-else>
-                <span class="font-semibold uppercase tracking-[0.12em] text-slate-600">等待发现</span>
-                <span class="text-right text-slate-400">拍到后点亮</span>
-              </template>
-            </div>
+            <p
+              class="mt-4 border-t pt-4 text-xs font-semibold"
+              :class="cloudType.icon_id ? 'border-white/25 text-white' : 'border-slate-200 text-sky-700'"
+            >查看类型资料与公开云图 →</p>
           </div>
         </button>
       </div>
 
       <div v-else class="oc-empty-card border border-dashed border-slate-300 bg-white px-6 py-12">
-        <NEmpty description="暂时还没有图鉴数据" />
+        <NEmpty description="暂时还没有云类型资料" />
       </div>
     </div>
-
-    <div
-      v-if="lockHint"
-      class="encyclopedia-lock-hint fixed bottom-6 left-1/2 z-50 -translate-x-1/2 border border-slate-900 bg-slate-900 px-4 py-2 text-sm text-white"
-    >
-      {{ lockHint }}
-    </div>
   </div>
 </template>
-
-<style scoped>
-.encyclopedia-lock-badge {
-  box-shadow: var(--oc-shadow-xs);
-}
-
-.encyclopedia-lock-hint {
-  box-shadow: var(--oc-shadow-lg);
-}
-
-.encyclopedia-type-card:hover {
-  border-color: rgb(125 211 252);
-  box-shadow: var(--oc-shadow-lg) !important;
-  transform: translate(-1px, -1px);
-}
-
-.encyclopedia-type-card:active {
-  box-shadow: var(--oc-shadow-md) !important;
-  transform: translate(0, 0);
-}
-
-.encyclopedia-type-card__image {
-  transition: transform 500ms ease;
-}
-
-.encyclopedia-type-card:hover .encyclopedia-type-card__image {
-  transform: scale(1.035);
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .encyclopedia-type-card,
-  .encyclopedia-type-card__image {
-    transition-duration: 1ms;
-  }
-
-  .encyclopedia-type-card:hover,
-  .encyclopedia-type-card:hover .encyclopedia-type-card__image {
-    transform: none;
-  }
-}
-</style>
diff --git a/src/views/gallery/GalleryView.vue b/src/views/gallery/GalleryView.vue
index e0e0e88..2a7023e 100644
--- a/src/views/gallery/GalleryView.vue
+++ b/src/views/gallery/GalleryView.vue
@@ -1,26 +1,24 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { RouterLink } from 'vue-router'
 import { NAlert, NButton, NDropdown, NEmpty, NIcon, NSkeleton, NTag, useMessage } from 'naive-ui'
 import { Clock, Location, Search, Settings, User, X } from '@vicons/tabler'
 import CloudEditModal, { type CloudEditFormValue } from '@/components/cloud/CloudEditModal.vue'
 import ImageDetailModal from '@/components/cloud/ImageDetailModal.vue'
 import MiniLocationMap from '@/components/cloud/MiniLocationMap.vue'
-import { apiRequest } from '@/lib/api'
+import { ApiError, apiRequest, toApiCloud } from '@/lib/api'
 import { useAuthStore } from '@/stores/auth'
 import { useCloudsStore } from '@/stores/clouds'
 import { useProfileStore } from '@/stores/profile'
 
-import type { ApiCloud, ApiPage } from '@/types/api'
-import type { CloudType } from '@/types/database'
+import type { ApiCloud, BackendCloudInfo } from '@/types/api'
 
 interface GalleryCloud {
   id: string
   user_id: string
   cloud_type_id: number | null
-  custom_cloud_type: string | null
   image_url: string
   thumbnail_url: string | null
-  location_name: string | null
   description: string | null
   latitude: number | null
   longitude: number | null
@@ -29,7 +27,7 @@ interface GalleryCloud {
   status: 'pending' | 'approved' | 'rejected'
   is_hidden: boolean
   cloudTypeName: string
-  cloudTypeRarity: CloudType['rarity']
+  cloudTypeRarity: number
   username: string
 }
 
@@ -47,8 +45,7 @@ const selectedTypeId = ref<number | 'all'>('all')
 const searchQuery = ref('')
 const selectedCloud = ref<GalleryCloud | null>(null)
 const currentPage = ref(1)
-const totalCount = ref(0)
-const totalPages = computed(() => Math.max(1, Math.ceil(totalCount.value / PAGE_SIZE)))
+const hasNextPage = ref(false)
 const manageError = ref('')
 const editModalOpen = ref(false)
 const editSaving = ref(false)
@@ -56,11 +53,7 @@ const editInitialValue = ref<CloudEditFormValue | null>(null)
 
 let searchTimer: number | null = null
 
-const rarityMeta = {
-  common: { label: '常见', chip: 'bg-sky-100 text-sky-700 border-sky-200' },
-  uncommon: { label: '少见', chip: 'bg-amber-100 text-amber-700 border-amber-200' },
-  rare: { label: '罕见', chip: 'bg-rose-100 text-rose-700 border-rose-200' },
-} satisfies Record<CloudType['rarity'], { label: string; chip: string }>
+const rarityChip = 'border-slate-200 bg-slate-50 text-slate-600'
 
 function formatDateTime(iso: string | null) {
   if (!iso) return '未知时间'
@@ -93,10 +86,8 @@ function toGalleryCloud(row: ApiCloud) {
     id: row.id,
     user_id: row.user_id,
     cloud_type_id: row.cloud_type_id,
-    custom_cloud_type: row.custom_cloud_type,
     image_url: row.image_url,
     thumbnail_url: row.thumbnail_url,
-    location_name: row.location_name,
     description: row.description,
     latitude: row.latitude,
     longitude: row.longitude,
@@ -104,8 +95,8 @@ function toGalleryCloud(row: ApiCloud) {
     created_at: row.created_at,
     status: row.status,
     is_hidden: row.is_hidden,
-    cloudTypeName: row.cloud_type_name || row.custom_cloud_type || '未知',
-    cloudTypeRarity: row.cloud_type_rarity || 'common',
+    cloudTypeName: row.cloud_type_name || '未知',
+    cloudTypeRarity: row.cloud_type_rarity_value ?? 0,
     username: row.username || '匿名',
   } satisfies GalleryCloud
 }
@@ -116,14 +107,28 @@ async function loadPage(page: number) {
 
   try {
     const params = new URLSearchParams({ page: String(page), page_size: String(PAGE_SIZE) })
-    if (selectedTypeId.value !== 'all') params.set('type_id', String(selectedTypeId.value))
-    if (normalizedSearch.value) params.set('search', normalizedSearch.value)
+    if (normalizedSearch.value) {
+      params.set('filter', isUserSearch.value ? 'owner' : 'type')
+      params.set('value', normalizedSearch.value)
+    } else if (selectedTypeId.value !== 'all') {
+      const typeName = cloudsStore.cloudTypes.find(type => type.id === selectedTypeId.value)?.name
+      if (typeName) {
+        params.set('filter', 'type')
+        params.set('value', typeName)
+      }
+    }
 
-    const result = await apiRequest<ApiPage<ApiCloud>>(`/clouds?${params}`, { auth: false })
-    totalCount.value = result.total
-    galleryItems.value = result.items.map(toGalleryCloud)
+    const rows = await apiRequest<BackendCloudInfo[]>(`/cloud?${params}`, { auth: false })
+    galleryItems.value = rows.map(toApiCloud).map(toGalleryCloud)
+    hasNextPage.value = rows.length === PAGE_SIZE
     currentPage.value = page
   } catch (error) {
+    if (error instanceof ApiError && error.status === 404 && isUserSearch.value) {
+      galleryItems.value = []
+      hasNextPage.value = false
+      currentPage.value = page
+      return
+    }
     loadError.value = error instanceof Error ? error.message : '画廊加载失败'
   } finally {
     loading.value = false
@@ -131,7 +136,7 @@ async function loadPage(page: number) {
 }
 
 async function goToPage(page: number) {
-  if (page < 1 || page > totalPages.value || page === currentPage.value) return
+  if (page < 1 || page === currentPage.value || (page > currentPage.value && !hasNextPage.value)) return
   await loadPage(page)
   window.scrollTo({ top: 0, behavior: 'smooth' })
 }
@@ -172,12 +177,10 @@ function openEditModal() {
 
   manageError.value = ''
   editInitialValue.value = {
-    cloudCategoryId: selectedCloud.value.cloud_type_id ?? (selectedCloud.value.custom_cloud_type ? 'other' : null),
-    customCloudType: selectedCloud.value.custom_cloud_type || '',
+    cloudCategoryId: selectedCloud.value.cloud_type_id,
     capturedAt: formatDatetimeLocal(selectedCloud.value.captured_at),
     latitude: selectedCloud.value.latitude,
     longitude: selectedCloud.value.longitude,
-    locationName: selectedCloud.value.location_name || '',
     description: selectedCloud.value.description || '',
     isPublic: !selectedCloud.value.is_hidden,
   }
@@ -204,18 +207,14 @@ async function submitEditModal(value: CloudEditFormValue) {
     manageError.value = '请选择云型类别。'
     return
   }
-  if (value.cloudCategoryId === 'other' && !value.customCloudType.trim()) {
-    manageError.value = '请输入自定义云型名称。'
-    return
-  }
-  if (!value.capturedAt) {
-    manageError.value = '请选择拍摄时间。'
-    return
-  }
   const hasLat = typeof value.latitude === 'number' && !Number.isNaN(value.latitude)
   const hasLng = typeof value.longitude === 'number' && !Number.isNaN(value.longitude)
-  if (hasLat !== hasLng) {
-    manageError.value = '经纬度必须同时填写。'
+  if (!hasLat || !hasLng) {
+    manageError.value = '经纬度为必填项。'
+    return
+  }
+  if (value.description.trim().length > 128) {
+    manageError.value = '图片描述不能超过 128 个字符。'
     return
   }
 
@@ -225,13 +224,11 @@ async function submitEditModal(value: CloudEditFormValue) {
 
   try {
     const updated = await profileStore.updateCloud(authStore.user.id, current.id, {
-      cloud_type_id: value.cloudCategoryId === 'other' ? null : value.cloudCategoryId,
-      custom_cloud_type: value.cloudCategoryId === 'other' ? value.customCloudType.trim() : null,
-      latitude: hasLat ? blurCoordinate(value.latitude as number) : null,
-      longitude: hasLng ? blurCoordinate(value.longitude as number) : null,
-      location_name: value.locationName.trim() || null,
-      description: value.description.trim() || null,
-      captured_at: new Date(value.capturedAt).toISOString(),
+      type_id: value.cloudCategoryId,
+      latitude: blurCoordinate(value.latitude as number),
+      longitude: blurCoordinate(value.longitude as number),
+      description: value.description.trim(),
+      ...(value.capturedAt ? { captured_at: new Date(value.capturedAt).toISOString() } : {}),
       is_hidden: !value.isPublic,
     })
 
@@ -362,7 +359,7 @@ onUnmounted(() => {
               v-model="searchQuery"
               type="text"
               class="min-w-0 flex-1 bg-transparent text-sm text-slate-800 outline-none placeholder:text-slate-400"
-              placeholder="搜索云型名称，或输入 @用户名 查看某个用户的图片"
+              placeholder="输入完整云类型名称，或 @用户名进行精确搜索"
             />
             <button
               v-if="searchQuery"
@@ -382,7 +379,7 @@ onUnmounted(() => {
               正在按上传者搜索：{{ normalizedSearch.slice(1) || '请输入用户名' }}
             </template>
             <template v-else>
-              正在匹配云型名称和自定义云型：{{ normalizedSearch }}
+              正在精确匹配云型名称：{{ normalizedSearch }}
             </template>
           </p>
         </div>
@@ -444,7 +441,7 @@ onUnmounted(() => {
               <div class="flex items-center justify-between gap-3">
                 <p class="truncate text-sm font-semibold">{{ cloud.cloudTypeName }}</p>
                 <NTag size="small" :bordered="false" class="shrink-0 bg-white/12 text-white backdrop-blur">
-                  {{ rarityMeta[cloud.cloudTypeRarity].label }}
+                  稀有度 {{ cloud.cloudTypeRarity }}
                 </NTag>
               </div>
               <p class="mt-2 flex items-center gap-1.5 truncate text-xs text-white/82">
@@ -463,7 +460,7 @@ onUnmounted(() => {
                 <NIcon size="14">
                   <Location />
                 </NIcon>
-                <span class="truncate">{{ cloud.location_name || '未填写位置' }}</span>
+                <span class="truncate">{{ formatCoordinate(cloud.latitude) }}, {{ formatCoordinate(cloud.longitude) }}</span>
               </p>
             </div>
           </div>
@@ -478,7 +475,7 @@ onUnmounted(() => {
         </NEmpty>
       </section>
 
-      <div v-if="totalPages > 1" class="mt-8 flex items-center justify-center gap-2">
+      <div v-if="currentPage > 1 || hasNextPage" class="mt-8 flex items-center justify-center gap-2">
         <NButton
           secondary
           strong
@@ -490,28 +487,13 @@ onUnmounted(() => {
           上一页
         </NButton>
 
-        <template v-for="page in totalPages" :key="page">
-          <NButton
-            v-if="page === 1 || page === totalPages || Math.abs(page - currentPage) <= 2"
-            secondary
-            strong
-            :class="page === currentPage ? 'oc-panel-button oc-panel-button--sky' : 'oc-panel-button oc-panel-button--neutral'"
-            type="default"
-            @click="goToPage(page)"
-          >
-            {{ page }}
-          </NButton>
-          <span
-            v-else-if="page === 2 || page === totalPages - 1"
-            class="px-1 text-sm text-slate-400"
-          >...</span>
-        </template>
+        <span class="border border-slate-200 bg-white px-4 py-2 text-sm text-slate-600">第 {{ currentPage }} 页</span>
 
         <NButton
           secondary
           strong
           type="default"
-          :disabled="currentPage >= totalPages"
+          :disabled="!hasNextPage"
           class="oc-panel-button oc-panel-button--neutral"
           @click="goToPage(currentPage + 1)"
         >
@@ -519,10 +501,6 @@ onUnmounted(() => {
         </NButton>
       </div>
 
-      <div v-if="totalCount > 0" class="mt-2 text-center text-xs text-slate-400">
-        共 {{ totalCount }} 张照片，第 {{ currentPage }} / {{ totalPages }} 页
-      </div>
-
       <ImageDetailModal
         v-if="selectedCloud"
         :open="!!selectedCloud"
@@ -531,8 +509,8 @@ onUnmounted(() => {
         :image-alt="selectedCloud.cloudTypeName"
         :title="selectedCloud.cloudTypeName"
         :subtitle="`上传者：${selectedCloud.username}`"
-        :badge-label="rarityMeta[selectedCloud.cloudTypeRarity].label"
-        :badge-class="rarityMeta[selectedCloud.cloudTypeRarity].chip"
+        :badge-label="`稀有度 ${selectedCloud.cloudTypeRarity}`"
+        :badge-class="rarityChip"
         @close="closeDetail"
       >
         <div class="grid gap-4 sm:grid-cols-2">
@@ -546,7 +524,7 @@ onUnmounted(() => {
           </div>
           <div class="oc-inset-panel">
             <p class="oc-section-label">位置</p>
-            <p class="mt-2 text-sm font-medium text-slate-900">{{ selectedCloud.location_name || '未填写位置名称' }}</p>
+            <p class="mt-2 text-sm font-medium text-slate-900">已记录经纬度</p>
           </div>
           <div class="oc-inset-panel">
             <p class="oc-section-label">模糊化经纬度</p>
@@ -556,16 +534,22 @@ onUnmounted(() => {
           </div>
         </div>
 
-        <div class="mt-5 border border-slate-200 bg-white p-5">
+      <div class="mt-5 border border-slate-200 bg-white p-5">
           <p class="oc-section-label">图片说明</p>
           <p class="mt-3 text-sm leading-7 text-slate-700">
             {{ selectedCloud.description || '上传者没有留下额外说明。' }}
           </p>
-        </div>
-        <MiniLocationMap
+      </div>
+
+      <RouterLink
+        :to="{ name: 'user-profile', params: { id: selectedCloud.username } }"
+        class="oc-panel-button oc-panel-button--neutral mt-5 inline-flex"
+      >
+        查看 @{{ selectedCloud.username }} 的公开主页
+      </RouterLink>
+      <MiniLocationMap
           :latitude="selectedCloud.latitude"
           :longitude="selectedCloud.longitude"
-          :location-name="selectedCloud.location_name"
         />
 
         <template v-if="selectedCloudIsMine" #actions>
diff --git a/src/views/map/MapView.vue b/src/views/map/MapView.vue
index 9b97bcc..cb3bf52 100644
--- a/src/views/map/MapView.vue
+++ b/src/views/map/MapView.vue
@@ -3,10 +3,10 @@ import { computed, ref, onMounted, onUnmounted } from 'vue'
 import ImageDetailModal from '@/components/cloud/ImageDetailModal.vue'
 import MiniLocationMap from '@/components/cloud/MiniLocationMap.vue'
 import QuickUploadModal from '@/components/cloud/QuickUploadModal.vue'
-import { apiRequest } from '@/lib/api'
+import { apiRequest, toApiCloud } from '@/lib/api'
 import { loadAMap } from '@/lib/amap'
 import { useAuthStore } from '@/stores/auth'
-import type { ApiCloud } from '@/types/api'
+import type { ApiCloud, BackendCloudInfo } from '@/types/api'
 import { NIcon } from 'naive-ui'
 import { Adjustments, Calendar, CloudUpload, Minus, Plus, Refresh, Map, Satellite, X } from '@vicons/tabler'
 
@@ -16,10 +16,9 @@ interface CloudMarkerData {
   longitude: number
   imageUrl: string
   thumbnailUrl: string | null
-  locationName: string | null
   description: string | null
   cloudTypeName: string
-  rarity: 'common' | 'uncommon' | 'rare'
+  rarity: number
   username: string
   capturedAt: string
   createdAt: string
@@ -66,17 +65,8 @@ let zoomAnimationValue = currentZoom.value
 let zoomLastFrameTime = 0
 let zoomHoldStarted = false
 
-const rarityColors: Record<string, string> = {
-  common: '#cbd5e1',
-  uncommon: '#f59e0b',
-  rare: '#f43f5e',
-}
-
-const rarityMeta = {
-  common: { label: '常见', chip: 'bg-sky-100 text-sky-700 border-sky-200' },
-  uncommon: { label: '少见', chip: 'bg-amber-100 text-amber-700 border-amber-200' },
-  rare: { label: '罕见', chip: 'bg-rose-100 text-rose-700 border-rose-200' },
-} as const
+const markerBorder = '#64748b'
+const rarityChip = 'border-slate-200 bg-slate-50 text-slate-600'
 
 const selectedTimeLabel = computed(() => formatMinuteOfDay(selectedMinuteOfDay.value))
 const currentMinutePercent = computed(() => Math.min(100, Math.max(0, currentMinuteOfDay.value / 1439 * 100)))
@@ -178,7 +168,7 @@ function getMarkerOpacity(cloud: CloudMarkerData) {
 }
 
 function bubbleContent(cloud: CloudMarkerData): HTMLElement {
-  const border = rarityColors[cloud.rarity] || rarityColors.common
+  const border = markerBorder
   const bubbleImage = cloud.thumbnailUrl || cloud.imageUrl
   const opacity = getMarkerOpacity(cloud) ?? MIN_MARKER_OPACITY
 
@@ -199,9 +189,9 @@ function bubbleContent(cloud: CloudMarkerData): HTMLElement {
 }
 
 function hoverCardContent(cloud: CloudMarkerData): HTMLElement {
-  const border = rarityColors[cloud.rarity] || rarityColors.common
+  const border = markerBorder
   const cardImage = cloud.thumbnailUrl || cloud.imageUrl
-  const label = cloud.rarity === 'common' ? '常见' : cloud.rarity === 'uncommon' ? '少见' : '罕见'
+  const label = `稀有度 ${cloud.rarity}`
 
   const card = document.createElement('div')
   card.style.cssText = 'background:#fff;border-radius:14px;box-shadow:0 10px 30px rgba(0,0,0,0.18);overflow:hidden;width:200px;font-family:system-ui,-apple-system,sans-serif'
@@ -421,25 +411,24 @@ function toCloudMarker(row: ApiCloud): CloudMarkerData {
     longitude: row.longitude as number,
     imageUrl: row.image_url,
     thumbnailUrl: row.thumbnail_url,
-    locationName: row.location_name,
     description: row.description,
-    cloudTypeName: row.cloud_type_name || row.custom_cloud_type || '未知',
-    rarity: row.cloud_type_rarity || 'common',
+    cloudTypeName: row.cloud_type_name || '未知',
+    rarity: row.cloud_type_rarity_value ?? 0,
     username: row.username || '匿名',
     capturedAt: row.captured_at || row.created_at,
     createdAt: row.created_at,
   }
 }
 
-async function fetchCloudsByRange(field: 'captured_at' | 'created_at', start: Date, end: Date): Promise<CloudMarkerData[]> {
+async function fetchCloudsByRange(field: 'captured_at' | 'uploaded_at', start: Date, end: Date): Promise<CloudMarkerData[]> {
   const params = new URLSearchParams({
     start: start.toISOString(),
     end: end.toISOString(),
     time_field: field,
   })
   try {
-    const rows = await apiRequest<ApiCloud[]>(`/clouds/map?${params}`, { auth: false })
-    return rows.map(toCloudMarker)
+    const rows = await apiRequest<BackendCloudInfo[]>(`/cloud/map?${params}`, { auth: false })
+    return rows.map(toApiCloud).map(toCloudMarker)
   } catch (error) {
     statusText.value = `查询失败: ${error instanceof Error ? error.message : '未知错误'}`
     return []
@@ -836,8 +825,8 @@ onUnmounted(() => {
       :image-alt="previewCloud.cloudTypeName"
       :title="previewCloud.cloudTypeName"
       :subtitle="`上传者：${previewCloud.username}`"
-      :badge-label="rarityMeta[previewCloud.rarity].label"
-      :badge-class="rarityMeta[previewCloud.rarity].chip"
+      :badge-label="`稀有度 ${previewCloud.rarity}`"
+      :badge-class="rarityChip"
       @close="previewCloud = null"
     >
       <div class="grid gap-4 sm:grid-cols-2">
@@ -851,7 +840,9 @@ onUnmounted(() => {
         </div>
         <div class="oc-inset-panel">
           <p class="oc-section-label">位置</p>
-          <p class="mt-2 text-sm font-medium text-slate-900">{{ previewCloud.locationName || '未填写位置名称' }}</p>
+          <p class="mt-2 text-sm font-medium text-slate-900">
+            纬度 {{ formatCoordinate(previewCloud.latitude) }} / 经度 {{ formatCoordinate(previewCloud.longitude) }}
+          </p>
         </div>
         <div class="oc-inset-panel">
           <p class="oc-section-label">模糊化经纬度</p>
@@ -870,7 +861,6 @@ onUnmounted(() => {
       <MiniLocationMap
         :latitude="previewCloud.latitude"
         :longitude="previewCloud.longitude"
-        :location-name="previewCloud.locationName"
       />
     </ImageDetailModal>
 
diff --git a/src/views/profile/ProfileSettingsView.vue b/src/views/profile/ProfileSettingsView.vue
index 2f09458..717a378 100644
--- a/src/views/profile/ProfileSettingsView.vue
+++ b/src/views/profile/ProfileSettingsView.vue
@@ -1,13 +1,15 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
-import { RouterLink } from 'vue-router'
+import { RouterLink, useRouter } from 'vue-router'
 import { NAlert, NButton, NCard, NForm, NInput, useMessage } from 'naive-ui'
 import { useAuthStore } from '@/stores/auth'
 
 const authStore = useAuthStore()
+const router = useRouter()
 const message = useMessage()
 
 const usernameDraft = ref('')
+const currentPassword = ref('')
 const newPassword = ref('')
 const confirmNewPassword = ref('')
 const error = ref('')
@@ -29,8 +31,8 @@ async function saveUsername() {
     error.value = '昵称不能为空。'
     return
   }
-  if (nextUsername.length < 2) {
-    error.value = '昵称至少需要 2 个字符。'
+  if (nextUsername.length > 16) {
+    error.value = '昵称不能超过 16 个字符。'
     return
   }
   if (nextUsername === authStore.profile?.username) {
@@ -62,14 +64,19 @@ async function savePassword() {
     error.value = '两次输入的新密码不一致。'
     return
   }
+  if (!currentPassword.value) {
+    error.value = '请输入当前密码。'
+    return
+  }
 
   passwordSaving.value = true
   try {
-    await authStore.updatePassword(newPassword.value)
+    await authStore.updatePassword(currentPassword.value, newPassword.value)
+    currentPassword.value = ''
     newPassword.value = ''
     confirmNewPassword.value = ''
-    success.value = '密码已更新。'
-    message.success('密码已更新')
+    message.success('密码已更新，请重新登录')
+    await router.push('/login')
   } catch (e) {
     error.value = e instanceof Error ? e.message : '密码更新失败'
   } finally {
@@ -89,7 +96,7 @@ async function savePassword() {
         <p class="oc-page-eyebrow">Account Settings</p>
         <h1 class="oc-page-title">个人资料设置</h1>
         <p class="oc-page-description">
-          修改公开昵称和登录密码。昵称会显示在画廊、图鉴和地图中，且不能与其他用户重复。
+          修改公开昵称和登录密码。昵称会显示在画廊、百科和地图中，且不能与其他用户重复。
         </p>
       </div>
 
@@ -123,7 +130,7 @@ async function savePassword() {
               <NInput
                 v-model:value="usernameDraft"
                 placeholder="输入新的昵称"
-                maxlength="32"
+                maxlength="16"
                 show-count
               />
               <NButton
@@ -159,6 +166,17 @@ async function savePassword() {
                 aria-label="账户邮箱"
                 readonly
               />
+              <NInput
+                v-model:value="currentPassword"
+                type="password"
+                show-password-on="click"
+                :input-props="{
+                  autocomplete: 'current-password',
+                  name: 'current-password',
+                  required: true,
+                }"
+                placeholder="当前密码"
+              />
               <NInput
                 v-model:value="newPassword"
                 type="password"
diff --git a/src/views/profile/ProfileView.vue b/src/views/profile/ProfileView.vue
index dd8e667..5b0d6fc 100644
--- a/src/views/profile/ProfileView.vue
+++ b/src/views/profile/ProfileView.vue
@@ -10,7 +10,7 @@ import ContributionHeatmap from '@/components/profile/ContributionHeatmap.vue'
 import { useAuthStore } from '@/stores/auth'
 import { useCloudsStore } from '@/stores/clouds'
 import { useProfileStore, type ProfileCloudItem } from '@/stores/profile'
-import type { CloudType, Profile } from '@/types/database'
+import type { Profile } from '@/types/database'
 
 interface TimelineGroup {
   key: string
@@ -34,11 +34,7 @@ const editSaving = ref(false)
 const manageError = ref('')
 const editInitialValue = ref<CloudEditFormValue | null>(null)
 
-const rarityMeta = {
-  common: { label: '常见', chip: 'bg-sky-100 text-sky-700 border-sky-200' },
-  uncommon: { label: '少见', chip: 'bg-amber-100 text-amber-700 border-amber-200' },
-  rare: { label: '罕见', chip: 'bg-rose-100 text-rose-700 border-rose-200' },
-} satisfies Record<CloudType['rarity'], { label: string; chip: string }>
+const rarityChip = 'border-slate-200 bg-slate-50 text-slate-600'
 
 const statusMeta = {
   approved: { label: '已通过', chip: 'bg-emerald-100 text-emerald-700 border-emerald-200' },
@@ -46,35 +42,26 @@ const statusMeta = {
   rejected: { label: '未通过', chip: 'bg-rose-100 text-rose-700 border-rose-200' },
 } satisfies Record<ProfileCloudItem['status'], { label: string; chip: string }>
 
-const viewedUserId = computed(() => {
-  const routeUserId = typeof route.params.id === 'string' ? route.params.id : null
-  return routeUserId || authStore.user?.id || null
+const viewedIdentifier = computed(() => {
+  const routeUsername = typeof route.params.id === 'string' ? route.params.id : null
+  return routeUsername || authStore.user?.id || null
 })
 
-const isOwnProfile = computed(() => {
-  return !!viewedUserId.value && viewedUserId.value === authStore.user?.id
-})
+const isOwnProfile = computed(() => typeof route.params.id !== 'string')
 
-const loading = computed(() => profileStore.isLoading(viewedUserId.value, isOwnProfile.value))
+const loading = computed(() => profileStore.isLoading(viewedIdentifier.value, isOwnProfile.value))
 const errorMsg = computed(() => {
-  if (!viewedUserId.value) return '未找到要查看的用户。'
-  return profileStore.getError(viewedUserId.value, isOwnProfile.value)
+  if (!viewedIdentifier.value) return '未找到要查看的用户。'
+  return profileStore.getError(viewedIdentifier.value, isOwnProfile.value)
 })
-const profileData = computed<Profile | null>(() => profileStore.getProfile(viewedUserId.value))
-const clouds = computed<ProfileCloudItem[]>(() => profileStore.getClouds(viewedUserId.value, isOwnProfile.value))
-const receivedLikes = computed(() => profileStore.getLikeStats(viewedUserId.value)?.total_likes || 0)
+const profileData = computed<Profile | null>(() => profileStore.getProfile(viewedIdentifier.value))
+const clouds = computed<ProfileCloudItem[]>(() => profileStore.getClouds(viewedIdentifier.value, isOwnProfile.value))
+const receivedLikes = computed(() => isOwnProfile.value ? authStore.user?.received_like_count || 0 : 0)
 
 const pageTitle = computed(() => {
   return isOwnProfile.value ? '我的天空日志' : `${profileData.value?.username || '这位用户'}的天空日志`
 })
 
-// const profileSubtitle = computed(() => {
-//   if (isOwnProfile.value) {
-//     return '回看你的云图记录、收集进度和拍摄节奏。'
-//   }
-//   return '公开展示的云图记录会按时间顺序陈列在这里。'
-// })
-
 const totalShots = computed(() => clouds.value.length)
 
 const approvedShots = computed(() => {
@@ -224,7 +211,9 @@ function formatCoordinate(value: number | null) {
 }
 
 function formatCloudTime(item: ProfileCloudItem) {
-  return formatDateTime(item.captured_at || item.created_at)
+  return item.captured_at
+    ? `拍摄于 ${formatDateTime(item.captured_at)}`
+    : `上传于 ${formatDateTime(item.created_at)}`
 }
 
 function getProfileInitial(profile: Profile | null) {
@@ -274,12 +263,10 @@ function formatDatetimeLocal(iso: string | null) {
 function openEditModal(cloud: ProfileCloudItem) {
   manageError.value = ''
   editInitialValue.value = {
-    cloudCategoryId: cloud.cloud_type_id ?? (cloud.custom_cloud_type ? 'other' : null),
-    customCloudType: cloud.custom_cloud_type || '',
+    cloudCategoryId: cloud.cloud_type_id,
     capturedAt: formatDatetimeLocal(cloud.captured_at),
     latitude: cloud.latitude,
     longitude: cloud.longitude,
-    locationName: cloud.location_name || '',
     description: cloud.description || '',
     isPublic: !cloud.is_hidden,
   }
@@ -297,24 +284,20 @@ function blurCoordinate(value: number): number {
 }
 
 async function submitEditModal(value: CloudEditFormValue) {
-  if (!selectedCloud.value || !viewedUserId.value) return
+  if (!selectedCloud.value || !viewedIdentifier.value) return
 
   if (!value.cloudCategoryId) {
     manageError.value = '请选择云型类别。'
     return
   }
-  if (value.cloudCategoryId === 'other' && !value.customCloudType.trim()) {
-    manageError.value = '请输入自定义云型名称。'
-    return
-  }
-  if (!value.capturedAt) {
-    manageError.value = '请选择拍摄时间。'
-    return
-  }
   const hasLat = typeof value.latitude === 'number' && !Number.isNaN(value.latitude)
   const hasLng = typeof value.longitude === 'number' && !Number.isNaN(value.longitude)
-  if (hasLat !== hasLng) {
-    manageError.value = '经纬度必须同时填写。'
+  if (!hasLat || !hasLng) {
+    manageError.value = '经纬度为必填项。'
+    return
+  }
+  if (value.description.trim().length > 128) {
+    manageError.value = '图片描述不能超过 128 个字符。'
     return
   }
 
@@ -322,14 +305,12 @@ async function submitEditModal(value: CloudEditFormValue) {
   manageError.value = ''
 
   try {
-    const updated = await profileStore.updateCloud(viewedUserId.value, selectedCloud.value.id, {
-      cloud_type_id: value.cloudCategoryId === 'other' ? null : value.cloudCategoryId,
-      custom_cloud_type: value.cloudCategoryId === 'other' ? value.customCloudType.trim() : null,
-      latitude: hasLat ? blurCoordinate(value.latitude as number) : null,
-      longitude: hasLng ? blurCoordinate(value.longitude as number) : null,
-      location_name: value.locationName.trim() || null,
-      description: value.description.trim() || null,
-      captured_at: new Date(value.capturedAt).toISOString(),
+    const updated = await profileStore.updateCloud(viewedIdentifier.value, selectedCloud.value.id, {
+      type_id: value.cloudCategoryId,
+      latitude: blurCoordinate(value.latitude as number),
+      longitude: blurCoordinate(value.longitude as number),
+      description: value.description.trim(),
+      ...(value.capturedAt ? { captured_at: new Date(value.capturedAt).toISOString() } : {}),
       is_hidden: !value.isPublic,
     })
     selectedCloud.value = updated
@@ -342,13 +323,13 @@ async function submitEditModal(value: CloudEditFormValue) {
 }
 
 async function toggleSelectedCloudPrivacy() {
-  if (!selectedCloud.value || !viewedUserId.value) return
+  if (!selectedCloud.value || !viewedIdentifier.value) return
 
   manageError.value = ''
   const nextHidden = !selectedCloud.value.is_hidden
 
   try {
-    await profileStore.updateCloudVisibility(viewedUserId.value, selectedCloud.value.id, nextHidden)
+    await profileStore.updateCloudVisibility(viewedIdentifier.value, selectedCloud.value.id, nextHidden)
     selectedCloud.value = { ...selectedCloud.value, is_hidden: nextHidden }
   } catch (error) {
     manageError.value = error instanceof Error ? error.message : '私密状态更新失败'
@@ -356,14 +337,14 @@ async function toggleSelectedCloudPrivacy() {
 }
 
 async function deleteCloudByIds(cloudIds: string[]) {
-  if (!viewedUserId.value || !cloudIds.length) return
+  if (!viewedIdentifier.value || !cloudIds.length) return
   const confirmed = window.confirm(`确定删除 ${cloudIds.length} 张图片吗？删除后无法在页面中恢复。`)
   if (!confirmed) return
 
   manageError.value = ''
 
   try {
-    const deletedCount = await profileStore.deleteClouds(viewedUserId.value, cloudIds)
+    const deletedCount = await profileStore.deleteClouds(viewedIdentifier.value, cloudIds)
     if (selectedCloud.value && cloudIds.includes(selectedCloud.value.id)) {
       selectedCloud.value = null
       closeEditModal()
@@ -390,13 +371,13 @@ async function loadProfilePage(force = false) {
   clearCloudSelection()
   selectionMode.value = false
 
-  const targetUserId = viewedUserId.value
+  const targetIdentifier = viewedIdentifier.value
 
-  if (!targetUserId) {
+  if (!targetIdentifier) {
     return
   }
 
-  await profileStore.fetchProfilePage(targetUserId, isOwnProfile.value, force)
+  await profileStore.fetchProfilePage(targetIdentifier, isOwnProfile.value, force)
 
   if (isOwnProfile.value) {
     await cloudsStore.fetchCloudTypes()
@@ -458,8 +439,8 @@ watch(selectedUploadDate, async newValue => {
                 class="profile-avatar flex h-20 w-20 shrink-0 items-center justify-center border border-slate-300 bg-[linear-gradient(135deg,#eef9f3_0%,#d9efe3_100%)] text-3xl font-bold text-slate-900"
               >
                 <img
-                  v-if="profileData?.avatar_url"
-                  :src="profileData.avatar_url"
+                  v-if="profileData?.avatar_id"
+                  :src="profileData.avatar_id"
                   :alt="profileData.username"
                   class="h-full w-full object-cover"
                 />
@@ -491,7 +472,7 @@ watch(selectedUploadDate, async newValue => {
                   </RouterLink>
                 </div>
                 <div class="mt-5 flex flex-wrap items-center gap-3 text-sm text-slate-500">
-                  <span>注册于 {{ formatDate(profileData?.created_at || null) }}</span>
+                  <span v-if="isOwnProfile">注册于 {{ formatDate(profileData?.created_at || null) }}</span>
                 </div>
               </div>
             </div>
@@ -564,7 +545,7 @@ watch(selectedUploadDate, async newValue => {
             <div>
               <h2 class="text-2xl font-bold text-slate-900">天空日志</h2>
               <p class="oc-field-help">
-                按拍摄时间倒序展示，并按月份分组。热力图统计按上传日期计算。
+                按拍摄时间展示；未记录拍摄时间时回退为上传时间。热力图按上传日期计算。
               </p>
             </div>
             <div class="flex items-center gap-3">
@@ -669,8 +650,8 @@ watch(selectedUploadDate, async newValue => {
                         />
                         选择
                       </label>
-                      <span class="inline-flex border px-3 py-1 text-xs font-medium" :class="rarityMeta[item.cloudTypeRarity].chip">
-                        {{ rarityMeta[item.cloudTypeRarity].label }}
+                      <span class="inline-flex border px-3 py-1 text-xs font-medium" :class="rarityChip">
+                        稀有度 {{ item.cloudTypeRarity }}
                       </span>
                       <span
                         v-if="isOwnProfile"
@@ -695,7 +676,7 @@ watch(selectedUploadDate, async newValue => {
 
                   <div class="p-5">
                     <p class="truncate text-sm font-medium text-slate-900">
-                      {{ item.location_name || '未填写位置名称' }}
+                      纬度 {{ formatCoordinate(item.latitude) }} / 经度 {{ formatCoordinate(item.longitude) }}
                     </p>
                     <p class="mt-3 line-clamp-3 text-sm leading-6 text-slate-500">
                       {{ item.description || '没有留下额外说明。' }}
@@ -707,7 +688,7 @@ watch(selectedUploadDate, async newValue => {
           </div>
 
           <div v-else class="oc-empty-card border border-dashed border-slate-300 bg-white p-10">
-            <NEmpty :description="selectedUploadDate ? '这一天没有上传记录' : (isOwnProfile ? '还没有上传任何云图' : '这位用户还没有公开云图')">
+            <NEmpty :description="selectedUploadDate ? '这一天没有上传记录' : (isOwnProfile ? '还没有上传任何云图' : '该用户暂无公开云图')">
               <template #extra>
                 <RouterLink
                   v-if="isOwnProfile && !selectedUploadDate"
@@ -731,9 +712,9 @@ watch(selectedUploadDate, async newValue => {
       :thumbnail-url="selectedCloud.thumbnail_url"
       :image-alt="selectedCloud.cloudTypeName"
       :title="selectedCloud.cloudTypeName"
-      :subtitle="`拍摄时间：${formatCloudTime(selectedCloud)}`"
-      :badge-label="rarityMeta[selectedCloud.cloudTypeRarity].label"
-      :badge-class="rarityMeta[selectedCloud.cloudTypeRarity].chip"
+      :subtitle="formatCloudTime(selectedCloud)"
+      :badge-label="`稀有度 ${selectedCloud.cloudTypeRarity}`"
+      :badge-class="rarityChip"
       @close="selectedCloud = null"
     >
       <div class="grid gap-4 sm:grid-cols-2">
@@ -747,7 +728,7 @@ watch(selectedUploadDate, async newValue => {
         </div>
         <div class="oc-inset-panel">
           <p class="oc-section-label">位置</p>
-          <p class="mt-2 text-sm font-medium text-slate-900">{{ selectedCloud.location_name || '未填写位置名称' }}</p>
+          <p class="mt-2 text-sm font-medium text-slate-900">已记录经纬度</p>
         </div>
         <div class="oc-inset-panel">
           <p class="oc-section-label">模糊化经纬度</p>
@@ -775,7 +756,6 @@ watch(selectedUploadDate, async newValue => {
       <MiniLocationMap
         :latitude="selectedCloud.latitude"
         :longitude="selectedCloud.longitude"
-        :location-name="selectedCloud.location_name"
       />
 
       <template v-if="isOwnProfile" #actions>
diff --git a/src/views/upload/UploadView.vue b/src/views/upload/UploadView.vue
index 9a9baa8..6c6f515 100644
--- a/src/views/upload/UploadView.vue
+++ b/src/views/upload/UploadView.vue
@@ -1,23 +1,19 @@
 <script setup lang="ts">
 import { ref, computed, onMounted, onUnmounted, nextTick, watch } from 'vue'
-import { NAlert, NButton, NCard, NIcon, NProgress, NResult, NTag } from 'naive-ui'
+import { NAlert, NButton, NCard, NIcon, NProgress, NResult } from 'naive-ui'
 import { CloudUpload, Map as MapIcon, X } from '@vicons/tabler'
 import { useRouter } from 'vue-router'
 import { useCloudsStore } from '@/stores/clouds'
-import { useAuthStore } from '@/stores/auth'
-import { downloadCloudBadgeCard } from '@/lib/cloudBadges'
 import { useUpload } from '@/composables/useUpload'
 import MapPickerModal from '@/components/cloud/MapPickerModal.vue'
 
 const router = useRouter()
-const authStore = useAuthStore()
 const cloudsStore = useCloudsStore()
 const { items, uploading, overallProgress, currentItemIndex, totalItems, addFiles, removeItem, clearAll, validateAll, uploadAll } = useUpload()
 
 const activeId = ref<string | null>(null)
 const dragOver = ref(false)
 const successMsg = ref(false)
-const unlockedBadges = ref<Awaited<ReturnType<typeof uploadAll>>['unlockedBadges']>([])
 const errorMsg = ref('')
 const fileInput = ref<HTMLInputElement | null>(null)
 const mapPickerOpen = ref(false)
@@ -87,10 +83,6 @@ function confirmMapPicker(payload: { latitude: number; longitude: number }) {
   closeMapPicker()
 }
 
-function clearCoordinates() {
-  updateActiveCoordinates(null, null)
-}
-
 function updateActivePublicState(isPublic: boolean) {
   if (!activeItem.value) return
   activeItem.value.isHidden = !isPublic
@@ -112,43 +104,17 @@ async function handleSubmit() {
 
   const result = await uploadAll()
   if (result.ok) {
-    unlockedBadges.value = result.unlockedBadges
     successMsg.value = true
   } else {
-    errorMsg.value = '上传失败，请稍后重试'
+    errorMsg.value = result.errorMessage || '上传失败，请稍后重试'
   }
 }
 
 function resetAfterSuccess() {
   successMsg.value = false
-  unlockedBadges.value = []
   errorMsg.value = ''
 }
 
-async function saveBadge(badge: NonNullable<typeof unlockedBadges.value[number]>) {
-  await downloadCloudBadgeCard({
-    cloudName: badge.cloudName,
-    cloudNameEn: badge.cloudNameEn,
-    unlockedAt: badge.unlockedAt,
-    username: authStore.profile?.username || authStore.user?.email || 'OpenCloud 用户',
-    rarity: badge.rarity,
-  })
-}
-
-function rarityLabel(rarity: NonNullable<typeof unlockedBadges.value[number]>['rarity']) {
-  if (rarity === 'common') return '常见'
-  if (rarity === 'uncommon') return '少见'
-  return '罕见'
-}
-
-function formatUnlockedAt(iso: string) {
-  return new Date(iso).toLocaleDateString('zh-CN', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-  })
-}
-
 function onLatInput(e: Event) {
   const val = parseFloat((e.target as HTMLInputElement).value)
   if (activeItem.value) {
@@ -168,6 +134,7 @@ function onLngInput(e: Event) {
 }
 
 function formatDatetimeLocal(iso: string): string {
+  if (!iso) return ''
   const d = new Date(iso)
   const pad = (n: number) => String(n).padStart(2, '0')
   return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`
@@ -175,8 +142,8 @@ function formatDatetimeLocal(iso: string): string {
 
 function onCapturedAtChange(e: Event) {
   const val = (e.target as HTMLInputElement).value
-  if (activeItem.value && val) {
-    activeItem.value.capturedAt = new Date(val).toISOString()
+  if (activeItem.value) {
+    activeItem.value.capturedAt = val ? new Date(val).toISOString() : ''
     if (activeItem.value.errors.capturedAt) {
       delete activeItem.value.errors.capturedAt
     }
@@ -186,9 +153,7 @@ function onCapturedAtChange(e: Event) {
 function onCategoryChange(e: Event) {
   const val = (e.target as HTMLSelectElement).value
   if (!activeItem.value) return
-  if (val === 'other') {
-    activeItem.value.cloudCategoryId = 'other'
-  } else if (val === '') {
+  if (val === '') {
     activeItem.value.cloudCategoryId = null
   } else {
     activeItem.value.cloudCategoryId = Number(val)
@@ -209,48 +174,21 @@ onUnmounted(() => {
         <p class="oc-page-eyebrow">Cloud Upload</p>
         <h1 class="oc-page-title">上传云图</h1>
         <p class="oc-page-description">
-          批量整理你的云图记录。类别和拍摄时间必填，经纬度既可以手动输入，也可以在迷你地图里点选回填。
+          批量整理你的云图记录。类别和经纬度必填；拍摄时间可留空，也可以从图片 EXIF 自动读取。
         </p>
       </div>
     </section>
 
     <div class="oc-container oc-container--content oc-page-content">
-      <input ref="fileInput" type="file" accept="image/*" multiple class="hidden" @change="handleFileSelect" />
+      <input ref="fileInput" type="file" accept="image/jpeg,image/png,image/webp" multiple class="hidden" @change="handleFileSelect" />
 
     <div v-if="successMsg" class="flex items-center justify-center min-h-[60vh]">
       <div class="w-full max-w-5xl">
         <NResult status="success" title="已提交审核" />
 
-        <div v-if="unlockedBadges.length" class="mt-8 grid gap-5 md:grid-cols-2 xl:grid-cols-3">
-          <NCard
-            v-for="badge in unlockedBadges"
-            :key="badge.cloudTypeId"
-            class="oc-panel-card border border-amber-200 bg-[linear-gradient(180deg,#fffbeb_0%,#ffffff_100%)]"
-          >
-            <div class="flex h-16 w-16 items-center justify-center border border-amber-300 bg-amber-400 text-3xl text-white">
-              {{ badge.cloudName.slice(0, 1) }}
-            </div>
-            <div class="mt-5">
-              <div class="flex items-center gap-3">
-                <h3 class="text-2xl font-bold text-slate-900">{{ badge.cloudName }}</h3>
-                <NTag :bordered="false" type="warning">
-                  {{ rarityLabel(badge.rarity) }}
-                </NTag>
-              </div>
-              <p class="mt-1 text-sm text-slate-500">{{ badge.cloudNameEn }}</p>
-              <p class="mt-4 text-sm text-slate-600">解锁时间：{{ formatUnlockedAt(badge.unlockedAt) }}</p>
-            </div>
-
-            <div class="mt-6 flex gap-3">
-              <NButton secondary strong type="default" class="oc-panel-button oc-panel-button--sky flex-1" @click="saveBadge(badge)">保存分享卡片</NButton>
-              <NButton secondary strong type="default" class="oc-panel-button oc-panel-button--neutral flex-1" @click="router.push(`/encyclopedia/${badge.cloudTypeId}`)">查看详情</NButton>
-            </div>
-          </NCard>
-        </div>
-
         <div class="mt-8 flex flex-wrap items-center justify-center gap-3">
           <NButton secondary strong type="default" class="oc-panel-button oc-panel-button--neutral" @click="resetAfterSuccess">继续上传</NButton>
-          <NButton secondary strong type="default" class="oc-panel-button oc-panel-button--sky" @click="router.push('/encyclopedia')">前往图鉴</NButton>
+          <NButton secondary strong type="default" class="oc-panel-button oc-panel-button--sky" @click="router.push('/encyclopedia')">前往百科</NButton>
           <NButton secondary strong type="default" class="oc-panel-button oc-panel-button--neutral" @click="router.push('/profile')">返回个人主页</NButton>
         </div>
       </div>
@@ -283,7 +221,7 @@ onUnmounted(() => {
       >
         <NIcon size="48" class="mb-4 text-sky-600"><CloudUpload /></NIcon>
         <p class="mb-1 text-lg font-medium text-slate-700">点击或拖拽图片到此处</p>
-        <p class="text-sm text-slate-400">支持 JPG、PNG 格式，可一次选择多张</p>
+        <p class="text-sm text-slate-400">支持 JPEG、PNG、WebP，单张不超过 20MB，可一次选择多张</p>
       </div>
 
       <template v-else>
@@ -341,27 +279,16 @@ onUnmounted(() => {
                   >
                     <option value="" disabled>请选择</option>
                     <option v-for="ct in cloudsStore.cloudTypes" :key="ct.id" :value="ct.id">
-                      {{ ct.name }}（{{ ct.name_en }}）
+                      {{ ct.name }}{{ ct.genus ? '（' + ct.genus + '）' : '' }}
                     </option>
-                    <option value="other">其他</option>
                   </select>
-                  <div v-if="activeItem.cloudCategoryId === 'other'" class="mt-2">
-                    <input
-                      v-model="activeItem.customCloudType"
-                      type="text"
-                      placeholder="输入云的类型"
-                      @input="activeItem.errors = {}"
-                      class="oc-field-control"
-                    />
-                  </div>
                   <p v-if="activeItem.errors.cloudCategory" class="oc-field-error">{{ activeItem.errors.cloudCategory }}</p>
+                  <p v-if="activeItem.errors.file" class="oc-field-error">{{ activeItem.errors.file }}</p>
                 </div>
 
-                <!-- 拍摄时间 * -->
+                <!-- 拍摄时间 -->
                 <div>
-                  <label class="oc-field-label">
-                    拍摄时间 <span class="oc-field-required">*</span>
-                  </label>
+                  <label class="oc-field-label">拍摄时间</label>
                   <input
                     type="datetime-local"
                     :value="formatDatetimeLocal(activeItem.capturedAt)"
@@ -371,19 +298,9 @@ onUnmounted(() => {
                   <p v-if="activeItem.errors.capturedAt" class="oc-field-error">{{ activeItem.errors.capturedAt }}</p>
                 </div>
 
-                <!-- 经纬度 -->
+                <!-- 经纬度 * -->
                 <div>
-                  <div class="mb-1 flex items-center justify-between gap-3">
-                    <label class="oc-field-label mb-0">经纬度</label>
-                    <button
-                      v-if="activeItem.latitude !== null || activeItem.longitude !== null"
-                      type="button"
-                      @click="clearCoordinates"
-                      class="oc-text-button oc-text-button--muted text-xs"
-                    >
-                      清空
-                    </button>
-                  </div>
+                  <label class="oc-field-label">经纬度 <span class="oc-field-required">*</span></label>
                   <div class="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_auto] gap-2">
                     <div>
                       <input
@@ -419,18 +336,7 @@ onUnmounted(() => {
                       </button>
                     </div>
                   </div>
-                  <p class="mt-1 text-xs text-slate-400">选填，可手动输入，或点击右侧小地图图标选择</p>
-                </div>
-
-                <!-- 位置名称 -->
-                <div>
-                  <label class="oc-field-label">位置名称</label>
-                  <input
-                    v-model="activeItem.locationName"
-                    type="text"
-                    placeholder="如：北京、成都"
-                    class="oc-field-control"
-                  />
+                  <p class="mt-1 text-xs text-slate-400">必填，可手动输入，或点击右侧地图图标选择</p>
                 </div>
 
                 <!-- 图片描述 -->
@@ -439,9 +345,11 @@ onUnmounted(() => {
                   <textarea
                     v-model="activeItem.description"
                     rows="3"
+                    maxlength="128"
                     placeholder="描述一下这张图片..."
                     class="oc-field-control resize-none"
                   ></textarea>
+                  <p v-if="activeItem.errors.description" class="oc-field-error">{{ activeItem.errors.description }}</p>
                 </div>
 
                 <!-- 公开状态 -->