Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 john
|
6a7d6cec70 | ||
|
john
|
a67d5a137a | ||
|
john
|
0e26db1857 | ||
|
john
|
ed8bc6d1b1 | ||
 tkmind
|
7120d4b5ea |
+3
-4
@@ -41,11 +41,10 @@ VITE_MAIN_APP_URL=https://h5.tkmind.cn
|
||||
# Umami 仅允许从 MemindAdm 单点登录进入（必须与 memind-analytics 一致）
|
||||
MEMIND_UMAMI_SSO_SECRET=replace-with-the-same-random-secret-used-by-umami
|
||||
UMAMI_SSO_USERNAME=admin
|
||||
# SEO/GEO 看板拉取 Umami memind-pages API 时使用（勿提交到 Git）
|
||||
# UMAMI_ADMIN_PASSWORD=change-me-umami-admin
|
||||
|
||||
# Rybbit 仅允许从 MemindAdm 单点登录进入（必须与 105 Rybbit 一致）
|
||||
MEMIND_RYBBIT_SSO_SECRET=replace-with-the-same-random-secret-used-by-rybbit
|
||||
RYBBIT_SSO_EMAIL=admin@tkmind.cn
|
||||
RYBBIT_URL=https://rybbit.tkmind.cn
|
||||
# Rybbit 已退役（2026-08），勿再配置 MEMIND_RYBBIT_* / RYBBIT_*
|
||||
|
||||
# Plaza 帖子预览链接
|
||||
# VITE_PLAZA_BASE=https://plaza.tkmind.cn
|
||||
|
||||
@@ -32,3 +32,11 @@ bash scripts/check-release-ready.sh
|
||||
| Memind 后端 | 8081 / 8082 | 业务逻辑与 Portal；UI 不在此仓库 |
|
||||
|
||||
新增管理功能时：在本仓库添加 `src/admin/pages/*`、更新 `AdminNav.tsx` 与 `App.tsx`；若需新 API，在 `server/app.mjs` 挂载并复用 Memind 模块。Memind 侧仅实现共享业务，不在 `ops/` 做 UI。
|
||||
|
||||
## Analytics / SEO·GEO 看板
|
||||
|
||||
- 页面：`src/admin/pages/AnalyticsConfigPage.tsx`、`SeoGeoAnalyticsPage.tsx`
|
||||
- API：`server/umami-analytics.mjs` → 105 Umami `memind-pages`
|
||||
- 部署与环境变量：[docs/analytics-deploy.md](docs/analytics-deploy.md)
|
||||
- 跨仓库发布顺序：Memind `docs/analytics-release-runbook.md`（105 Umami → 103 Portal → gadm）
|
||||
- Rybbit 已退役，勿恢复相关配置
|
||||
|
||||
@@ -261,6 +261,24 @@ PY'
|
||||
| `scripts/remote_restart.sh` | 仅在远端重启 `vite preview` |
|
||||
| `scripts/.releaseignore-prod` | 生产发布包排除规则 |
|
||||
|
||||
## Analytics / SEO·GEO（Umami）
|
||||
|
||||
管理后台 **Analytics 配置** 与 **SEO / GEO 流量** 看板依赖 105 Umami。
|
||||
|
||||
| 文档 | 内容 |
|
||||
|------|------|
|
||||
| [docs/analytics-deploy.md](analytics-deploy.md) | gadm 环境变量、验收、故障排查 |
|
||||
| Memind [docs/analytics-release-runbook.md](../Memind/docs/analytics-release-runbook.md) | 跨仓库发布顺序（105 → 103 Portal → gadm） |
|
||||
|
||||
生产 `.env` 至少配置：
|
||||
|
||||
```env
|
||||
UMAMI_ADMIN_PASSWORD=<Umami admin 密码>
|
||||
MEMIND_UMAMI_SSO_SECRET=<与 105 Umami .env 一致>
|
||||
```
|
||||
|
||||
可选：`UMAMI_URL`、`UMAMI_WEBSITE_ID`、`UMAMI_SSO_USERNAME`。
|
||||
|
||||
## 规则文档
|
||||
|
||||
- `ENGINEERING_WORKFLOW_RULES.md`
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
# Analytics / SEO·GEO 部署说明
|
||||
|
||||
管理后台 **Analytics 配置** 与 **SEO / GEO 流量** 看板的生产配置与发布。
|
||||
|
||||
平台边界与字段口径见 Memind [docs/analytics-platform.md](https://git.tkmind.cn/tkmind/Memind/src/branch/main/docs/analytics-platform.md)。
|
||||
跨仓库发布顺序见 Memind [docs/analytics-release-runbook.md](https://git.tkmind.cn/tkmind/Memind/src/branch/main/docs/analytics-release-runbook.md)。
|
||||
|
||||
## 功能入口（gadm 5174）
|
||||
|
||||
| 路由 | 页面 | 说明 |
|
||||
|------|------|------|
|
||||
| `/analytics` | Analytics 配置 | Umami Website ID、域名、SSO 进入 Umami |
|
||||
| `/analytics/seo-geo` | SEO / GEO 流量 | 按页展示搜索引擎 / 生成式引擎来源访问 |
|
||||
|
||||
**Rybbit 已退役** — 相关 SSO 接口返回 410；勿再配置 `MEMIND_RYBBIT_*`。
|
||||
|
||||
## 依赖关系
|
||||
|
||||
```text
|
||||
SeoGeoAnalyticsPage
|
||||
-> GET /admin-api/analytics/seo-geo-pages
|
||||
-> server/umami-analytics.mjs
|
||||
-> 105 Umami API /api/websites/:id/memind-pages?discoveryChannel=seo|geo
|
||||
（memind-analytics overlay）
|
||||
|
||||
Analytics 配置 / Umami SSO
|
||||
-> GET /admin-api/analytics/sso
|
||||
-> Memind 共享 SSO 逻辑 + MEMIND_UMAMI_SSO_SECRET
|
||||
```
|
||||
|
||||
adm **不**直连浏览器到 Umami 写库；读统计通过服务端用 Umami 登录态拉 API。
|
||||
|
||||
## 生产环境变量（103 `.env`）
|
||||
|
||||
在 `/Users/john/Project/memind_adm/.env` 增加或确认：
|
||||
|
||||
```env
|
||||
# SEO/GEO 看板（必填）
|
||||
UMAMI_ADMIN_PASSWORD=<Umami admin 密码>
|
||||
|
||||
# 可选：覆盖默认
|
||||
UMAMI_URL=https://fxi.tkmind.cn
|
||||
UMAMI_WEBSITE_ID=<Memind Generated Pages 的 Website ID>
|
||||
UMAMI_SSO_USERNAME=admin
|
||||
|
||||
# Umami SSO（Analytics 配置页）
|
||||
MEMIND_UMAMI_SSO_SECRET=<与 105 /opt/memind-analytics/.env 一致>
|
||||
```
|
||||
|
||||
说明：
|
||||
|
||||
- `UMAMI_ADMIN_PASSWORD` 未配置时，SEO/GEO 看板 API 会报错「未配置 UMAMI_ADMIN_PASSWORD」
|
||||
- `websiteId` 也可在 gadm **Analytics 配置** 页面保存（写入 MindSpace admin 配置），服务端优先读库内配置
|
||||
- 103 必须能访问 `UMAMI_URL`（内网或公网，依网络拓扑）
|
||||
|
||||
## 发布
|
||||
|
||||
仅改 adm 前端或 `server/umami-analytics.mjs` 时：
|
||||
|
||||
```bash
|
||||
cd /Users/john/Project/memind_adm
|
||||
bash scripts/release-prod.sh --yes
|
||||
```
|
||||
|
||||
若改了 Umami `memind-pages` API 或 overlay，需 **先** 发 memind-analytics（105），再发 adm。
|
||||
|
||||
若改了 Memind discovery 埋点，需 **先** 发 Memind Portal（103），再有 SEO/GEO 分列数据。
|
||||
|
||||
完整顺序见 Memind `docs/analytics-release-runbook.md`。
|
||||
|
||||
## 发布后验收
|
||||
|
||||
```bash
|
||||
# Admin API 健康
|
||||
ssh john@10.10.0.2 'curl -sf http://127.0.0.1:8085/health'
|
||||
|
||||
# SEO/GEO API（需替换 cookie 或在内网浏览器登录后测）
|
||||
# 期望 200 + pages 数组，而非 500 / 未配置 UMAMI_ADMIN_PASSWORD
|
||||
```
|
||||
|
||||
浏览器：
|
||||
|
||||
1. `https://gadm.tkmind.cn/analytics` → 「打开 Umami 分析后台」跳转成功
|
||||
2. `https://gadm.tkmind.cn/analytics/seo-geo` → 表格加载；SEO / GEO Tab 切换正常
|
||||
3. 列口径与 Umami「所有生成页面明细 / public page」一致（页面、PV、UV、点击/表单/参与率等）
|
||||
|
||||
## 本地开发
|
||||
|
||||
```bash
|
||||
pnpm dev # 5174
|
||||
```
|
||||
|
||||
本地 `.env` 可指向本机或 105 Umami：
|
||||
|
||||
```env
|
||||
UMAMI_URL=http://127.0.0.1:3100
|
||||
UMAMI_ADMIN_PASSWORD=umami
|
||||
UMAMI_WEBSITE_ID=<local website id>
|
||||
MEMIND_UMAMI_SSO_SECRET=<local secret>
|
||||
```
|
||||
|
||||
Memind 本地 analytics 变量见 [local-analytics.md](https://git.tkmind.cn/tkmind/Memind/src/branch/main/docs/local-analytics.md)。
|
||||
|
||||
## 故障排查
|
||||
|
||||
| 现象 | 检查 |
|
||||
|------|------|
|
||||
| SEO/GEO 看板 500 | 103 `adm-api.log`；`UMAMI_ADMIN_PASSWORD`；105 Umami 是否 active |
|
||||
| Umami SSO 失败 | `MEMIND_UMAMI_SSO_SECRET` 与 105 `.env` 是否一致 |
|
||||
| 看板无 SEO/GEO 行 | Memind discovery 是否已发布；Umami 是否有带 `discovery_channel` 的事件 |
|
||||
| Rybbit 链接/报错 | 清理旧书签；代码已移除 Rybbit SSO |
|
||||
|
||||
## 相关代码
|
||||
|
||||
| 路径 | 说明 |
|
||||
|------|------|
|
||||
| `src/admin/pages/SeoGeoAnalyticsPage.tsx` | SEO/GEO 看板 UI |
|
||||
| `src/admin/pages/AnalyticsConfigPage.tsx` | Analytics 配置 |
|
||||
| `server/umami-analytics.mjs` | Umami memind-pages 代理 |
|
||||
| `server/app.mjs` | `/admin-api/analytics/*` 路由 |
|
||||
@@ -12,7 +12,9 @@
|
||||
"local_restart": "bash scripts/local_restart.sh",
|
||||
"pro_restart": "bash scripts/pro_restart.sh",
|
||||
"build": "vite build",
|
||||
"test:umami-analytics": "node --test server/umami-analytics.test.mjs",
|
||||
"test:orchestrator": "node --test server/orchestrator-routes.test.mjs",
|
||||
"verify:template-catalog-local": "node scripts/verify-template-catalog-local.mjs",
|
||||
"preview": "node scripts/preview.mjs",
|
||||
"dev:preview": "vite preview"
|
||||
},
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
#!/usr/bin/env node
|
||||
/**
|
||||
* Local smoke test for page template catalog admin API (memind_adm 8085).
|
||||
* Usage: node scripts/verify-template-catalog-local.mjs
|
||||
*/
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const root = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
|
||||
const base = process.env.ADM_DEV_BACKEND ?? 'http://127.0.0.1:8085';
|
||||
|
||||
function loadEnvFile(filePath) {
|
||||
if (!fs.existsSync(filePath)) return;
|
||||
for (const line of fs.readFileSync(filePath, 'utf8').split('\n')) {
|
||||
const trimmed = line.trim();
|
||||
if (!trimmed || trimmed.startsWith('#')) continue;
|
||||
const eq = trimmed.indexOf('=');
|
||||
if (eq <= 0) continue;
|
||||
const key = trimmed.slice(0, eq).trim();
|
||||
let value = trimmed.slice(eq + 1).trim();
|
||||
if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
|
||||
value = value.slice(1, -1);
|
||||
}
|
||||
if (!(key in process.env)) process.env[key] = value;
|
||||
}
|
||||
}
|
||||
|
||||
loadEnvFile(path.join(root, '.env'));
|
||||
|
||||
const username = process.env.H5_ADMIN_USERNAME?.trim() || 'admin';
|
||||
const password = process.env.H5_ADMIN_PASSWORD?.trim() || process.env.ADMIN_PASSWORD?.trim() || '';
|
||||
|
||||
async function request(method, urlPath, { body, cookie } = {}) {
|
||||
const res = await fetch(`${base}${urlPath}`, {
|
||||
method,
|
||||
headers: {
|
||||
...(body ? { 'Content-Type': 'application/json' } : {}),
|
||||
...(cookie ? { Cookie: cookie } : {}),
|
||||
},
|
||||
body: body ? JSON.stringify(body) : undefined,
|
||||
});
|
||||
const text = await res.text();
|
||||
let json = null;
|
||||
try {
|
||||
json = text ? JSON.parse(text) : null;
|
||||
} catch {
|
||||
json = { raw: text.slice(0, 300) };
|
||||
}
|
||||
return { status: res.status, json, setCookie: res.headers.getSetCookie?.() ?? [] };
|
||||
}
|
||||
|
||||
function cookieFromSetCookie(setCookie) {
|
||||
return setCookie.map((c) => c.split(';')[0]).join('; ');
|
||||
}
|
||||
|
||||
function assertOk(cond, msg) {
|
||||
if (!cond) throw new Error(msg);
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log(`==> Admin API base: ${base}`);
|
||||
|
||||
if (!password) {
|
||||
console.error('缺少 H5_ADMIN_PASSWORD（请在 memind_adm/.env 配置）');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const login = await request('POST', '/auth/login', {
|
||||
body: { username, password },
|
||||
});
|
||||
assertOk(login.status === 200, `登录失败 HTTP ${login.status}: ${JSON.stringify(login.json)}`);
|
||||
const cookie = cookieFromSetCookie(login.setCookie);
|
||||
assertOk(cookie, '登录未返回 session cookie');
|
||||
console.log(`✓ 管理员登录 (${username})`);
|
||||
|
||||
const catalog = await request('GET', '/admin-api/template-catalog', { cookie });
|
||||
assertOk(catalog.status === 200, `template-catalog HTTP ${catalog.status}: ${JSON.stringify(catalog.json)}`);
|
||||
assertOk(Array.isArray(catalog.json?.items), 'items 应为数组');
|
||||
assertOk(catalog.json.items.length >= 3, `应至少 seed 3 个 page-template skill，实际 ${catalog.json.items.length}`);
|
||||
const travel = catalog.json.items.find((item) => item.skillName === 'page-template-travel');
|
||||
assertOk(travel, '缺少 page-template-travel');
|
||||
console.log(
|
||||
`✓ GET /admin-api/template-catalog (${catalog.json.items.length} 项，travel=${travel.priceCents} 分)`,
|
||||
);
|
||||
|
||||
const originalSort = travel.sortOrder ?? 10;
|
||||
const patchedSort = originalSort === 11 ? 12 : 11;
|
||||
const update = await request('PUT', '/admin-api/template-catalog/page-template-travel', {
|
||||
cookie,
|
||||
body: { sortOrder: patchedSort },
|
||||
});
|
||||
assertOk(update.status === 200, `update HTTP ${update.status}: ${JSON.stringify(update.json)}`);
|
||||
assertOk(update.json?.item?.sortOrder === patchedSort, 'sortOrder 未更新');
|
||||
console.log(`✓ PUT sortOrder ${originalSort} → ${patchedSort}`);
|
||||
|
||||
const restore = await request('PUT', '/admin-api/template-catalog/page-template-travel', {
|
||||
cookie,
|
||||
body: { sortOrder: originalSort },
|
||||
});
|
||||
assertOk(restore.status === 200, `restore HTTP ${restore.status}`);
|
||||
console.log(`✓ PUT sortOrder 恢复为 ${originalSort}`);
|
||||
|
||||
const users = await request('GET', '/admin-api/users?page=1&pageSize=5&role=user', { cookie });
|
||||
assertOk(users.status === 200, `users HTTP ${users.status}`);
|
||||
const sampleUser = users.json?.users?.[0];
|
||||
assertOk(sampleUser?.id, '需要至少一个 user 账号做授权测试');
|
||||
|
||||
const grant = await request(
|
||||
'POST',
|
||||
`/admin-api/users/${sampleUser.id}/template-grants/page-template-travel`,
|
||||
{ cookie },
|
||||
);
|
||||
assertOk(grant.status === 200, `grant HTTP ${grant.status}: ${JSON.stringify(grant.json)}`);
|
||||
assertOk(grant.json?.ok === true, 'grant 应返回 ok:true');
|
||||
assertOk(
|
||||
Array.isArray(grant.json?.grantedSkills) && grant.json.grantedSkills.includes('page-template-travel'),
|
||||
'grant 应包含 page-template-travel',
|
||||
);
|
||||
console.log(`✓ POST template-grants → user ${sampleUser.username}`);
|
||||
|
||||
console.log('\n全部 template-catalog Admin API 联调通过。');
|
||||
}
|
||||
|
||||
main().catch((err) => {
|
||||
console.error('\n联调失败:', err.message);
|
||||
process.exit(1);
|
||||
});
|
||||
+46
-12
@@ -5,6 +5,7 @@ import { spawn } from 'node:child_process';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import express from 'express';
|
||||
import { listUsagePaged, listLedgerPaged, getUsageStats, getUsageSummary } from './pagination.mjs';
|
||||
import { fetchMemindDiscoveryPages } from './umami-analytics.mjs';
|
||||
|
||||
const projectRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
|
||||
|
||||
@@ -111,6 +112,7 @@ export function createAdminApp(services) {
|
||||
wordFilterService,
|
||||
planCatalogService,
|
||||
subscriptionService,
|
||||
templateCatalogService,
|
||||
planSyncService,
|
||||
} = services;
|
||||
const app = express();
|
||||
@@ -235,19 +237,23 @@ export function createAdminApp(services) {
|
||||
res.json({ url: `${baseUrl}/auth/memind?ticket=${encoded}.${signature}` });
|
||||
});
|
||||
|
||||
adminApi.get('/analytics/seo-geo-pages', requireAdmin, async (req, res) => {
|
||||
try {
|
||||
const config = loadMindSpaceConfig ? await loadMindSpaceConfig(pool) : null;
|
||||
const result = await fetchMemindDiscoveryPages(req.query, {
|
||||
env: process.env,
|
||||
analyticsConfig: config?.analytics ?? {},
|
||||
});
|
||||
res.json(result);
|
||||
} catch (error) {
|
||||
res.status(503).json({
|
||||
message: error instanceof Error ? error.message : '无法加载 SEO/GEO 页面统计',
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
adminApi.get('/analytics/rybbit-sso', requireAdmin, async (_req, res) => {
|
||||
const sharedSecret = process.env.MEMIND_RYBBIT_SSO_SECRET?.trim();
|
||||
if (!sharedSecret) return res.status(503).json({ message: '未配置 Rybbit 单点登录密钥' });
|
||||
const email = process.env.RYBBIT_SSO_EMAIL?.trim().toLowerCase();
|
||||
if (!email) return res.status(503).json({ message: '未配置 Rybbit 单点登录账号' });
|
||||
const baseUrl = String(process.env.RYBBIT_URL || 'https://rybbit.tkmind.cn').replace(/\/$/, '');
|
||||
const encoded = Buffer.from(JSON.stringify({
|
||||
email,
|
||||
exp: Math.floor(Date.now() / 1000) + 60,
|
||||
nonce: crypto.randomUUID(),
|
||||
})).toString('base64url');
|
||||
const signature = crypto.createHmac('sha256', sharedSecret).update(encoded).digest('base64url');
|
||||
res.json({ url: `${baseUrl}/api/auth/memind?ticket=${encoded}.${signature}` });
|
||||
return res.status(410).json({ message: 'Rybbit 已退役，请使用 Umami 与 SEO/GEO 流量看板' });
|
||||
});
|
||||
|
||||
adminApi.get('/users', requireAdmin, async (req, res) => {
|
||||
@@ -377,6 +383,7 @@ export function createAdminApp(services) {
|
||||
if (!updateMindSpaceConfig) return res.status(503).json({ message: 'MindSpace 配置未启用' });
|
||||
const result = await updateMindSpaceConfig(pool, {
|
||||
publicPageLimit: req.body?.publicPageLimit,
|
||||
seoGeo: req.body?.seoGeo,
|
||||
analytics: req.body?.analytics,
|
||||
});
|
||||
res.json({ config: result });
|
||||
@@ -1317,6 +1324,33 @@ export function createAdminApp(services) {
|
||||
res.json(result);
|
||||
});
|
||||
|
||||
// ── Page template catalog ─────────────────────────────────────────────────
|
||||
|
||||
adminApi.get('/template-catalog', requireAdmin, async (_req, res) => {
|
||||
if (!templateCatalogService?.adminListCatalog) {
|
||||
return res.status(503).json({ message: '模板商城未启用' });
|
||||
}
|
||||
res.json({ items: await templateCatalogService.adminListCatalog() });
|
||||
});
|
||||
|
||||
adminApi.put('/template-catalog/:skillName', requireAdmin, async (req, res) => {
|
||||
if (!templateCatalogService?.adminUpsertCatalog) {
|
||||
return res.status(503).json({ message: '模板商城未启用' });
|
||||
}
|
||||
const result = await templateCatalogService.adminUpsertCatalog(req.params.skillName, req.body ?? {});
|
||||
if (!result.ok) return res.status(400).json({ message: result.message });
|
||||
res.json(result);
|
||||
});
|
||||
|
||||
adminApi.post('/users/:userId/template-grants/:skillName', requireAdmin, async (req, res) => {
|
||||
if (!templateCatalogService?.adminGrantTemplate) {
|
||||
return res.status(503).json({ message: '模板商城未启用' });
|
||||
}
|
||||
const result = await templateCatalogService.adminGrantTemplate(req.params.userId, req.params.skillName);
|
||||
if (!result.ok) return res.status(400).json({ message: result.message });
|
||||
res.json(result);
|
||||
});
|
||||
|
||||
app.use('/admin-api', adminApi);
|
||||
|
||||
if (services.createOpsApi) {
|
||||
|
||||
@@ -165,6 +165,12 @@ export async function bootstrapAdminServices() {
|
||||
getPlanAsync: (planType) => planCatalogService.getPlan(planType),
|
||||
});
|
||||
subscriptionService._planCatalogService = planCatalogService;
|
||||
const { createPageTemplateCatalogService } = await importMemind('page-template-catalog.mjs');
|
||||
const templateCatalogService = createPageTemplateCatalogService(pool, {
|
||||
userAuth,
|
||||
h5Root,
|
||||
});
|
||||
await templateCatalogService.ensureReady();
|
||||
await ensureSystemTestAccountSchema(pool);
|
||||
const systemTestAccountService = createSystemTestAccountService(pool);
|
||||
|
||||
@@ -196,6 +202,7 @@ export async function bootstrapAdminServices() {
|
||||
wordFilterService,
|
||||
planCatalogService,
|
||||
subscriptionService,
|
||||
templateCatalogService,
|
||||
USER_COOKIE,
|
||||
userLoginCookies,
|
||||
clearUserSessionCookie,
|
||||
|
||||
@@ -117,6 +117,7 @@ ready
|
||||
wordFilterService,
|
||||
planCatalogService,
|
||||
subscriptionService,
|
||||
templateCatalogService,
|
||||
planSyncService,
|
||||
USER_COOKIE,
|
||||
userLoginCookies,
|
||||
@@ -146,6 +147,7 @@ ready
|
||||
wordFilterService,
|
||||
planCatalogService,
|
||||
subscriptionService,
|
||||
templateCatalogService,
|
||||
planSyncService,
|
||||
USER_COOKIE,
|
||||
userLoginCookies,
|
||||
|
||||
@@ -156,7 +156,7 @@ export async function listUsagePaged(pool, query) {
|
||||
);
|
||||
const [rows] = await pool.query(
|
||||
`SELECT r.id, r.user_id, u.username, u.display_name, r.agent_session_id, r.request_id,
|
||||
r.input_tokens, r.output_tokens, r.cost_cents, r.balance_after_cents, r.created_at
|
||||
r.input_tokens, r.output_tokens, r.cost_cents, r.balance_after_cents, r.billing_source, r.created_at
|
||||
FROM h5_usage_records r
|
||||
JOIN h5_users u ON u.id = r.user_id
|
||||
${where}
|
||||
@@ -176,6 +176,7 @@ export async function listUsagePaged(pool, query) {
|
||||
outputTokens: Number(row.output_tokens),
|
||||
costCents: Number(row.cost_cents),
|
||||
balanceAfterCents: Number(row.balance_after_cents),
|
||||
billingSource: row.billing_source ?? 'wallet',
|
||||
createdAt: Number(row.created_at),
|
||||
})),
|
||||
total: Number(total),
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
import crypto from 'node:crypto';
|
||||
|
||||
const TOKEN_TTL_MS = 55 * 60 * 1000;
|
||||
|
||||
let cachedToken = '';
|
||||
let cachedTokenAt = 0;
|
||||
let cachedBaseUrl = '';
|
||||
|
||||
function normalizeBaseUrl(value = '') {
|
||||
return String(value ?? '').trim().replace(/\/$/, '');
|
||||
}
|
||||
|
||||
function resolveUmamiCredentials(env = process.env, analyticsConfig = {}) {
|
||||
const baseUrl = normalizeBaseUrl(
|
||||
analyticsConfig?.analyticsUrl || env.UMAMI_URL || 'http://127.0.0.1:3100',
|
||||
);
|
||||
const username = String(env.UMAMI_SSO_USERNAME || env.UMAMI_ADMIN_USERNAME || 'admin').trim();
|
||||
const password = String(env.UMAMI_ADMIN_PASSWORD || '').trim();
|
||||
const sharedSecret = String(env.MEMIND_UMAMI_SSO_SECRET || '').trim();
|
||||
const websiteId = String(analyticsConfig?.websiteId || env.UMAMI_WEBSITE_ID || '').trim();
|
||||
return { baseUrl, username, password, sharedSecret, websiteId };
|
||||
}
|
||||
|
||||
async function loginUmamiViaSso({ baseUrl, username, sharedSecret }) {
|
||||
const encoded = Buffer.from(
|
||||
JSON.stringify({
|
||||
username,
|
||||
exp: Math.floor(Date.now() / 1000) + 60,
|
||||
nonce: crypto.randomUUID(),
|
||||
}),
|
||||
).toString('base64url');
|
||||
const signature = crypto.createHmac('sha256', sharedSecret).update(encoded).digest('base64url');
|
||||
const ticket = `${encoded}.${signature}`;
|
||||
const response = await fetch(
|
||||
`${baseUrl}/api/auth/memind?ticket=${encodeURIComponent(ticket)}`,
|
||||
{ signal: AbortSignal.timeout(10_000) },
|
||||
);
|
||||
const body = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
throw new Error(body?.error?.message || body?.message || `Umami SSO 登录失败 (${response.status})`);
|
||||
}
|
||||
const token = String(body?.token ?? '').trim();
|
||||
if (!token) throw new Error('Umami SSO 登录响应缺少 token');
|
||||
return token;
|
||||
}
|
||||
|
||||
async function loginUmami({ baseUrl, username, password, sharedSecret }) {
|
||||
if (sharedSecret) {
|
||||
return loginUmamiViaSso({ baseUrl, username, sharedSecret });
|
||||
}
|
||||
if (!password) {
|
||||
throw new Error('未配置 UMAMI_ADMIN_PASSWORD 或 MEMIND_UMAMI_SSO_SECRET，无法拉取 SEO/GEO 页面统计');
|
||||
}
|
||||
const response = await fetch(`${baseUrl}/api/auth/login`, {
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body: JSON.stringify({ username, password }),
|
||||
signal: AbortSignal.timeout(10_000),
|
||||
});
|
||||
const body = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
throw new Error(body?.message || `Umami 登录失败 (${response.status})`);
|
||||
}
|
||||
const token = String(body?.token ?? '').trim();
|
||||
if (!token) throw new Error('Umami 登录响应缺少 token');
|
||||
return token;
|
||||
}
|
||||
|
||||
async function getUmamiAuthToken(credentials) {
|
||||
const now = Date.now();
|
||||
if (
|
||||
cachedToken &&
|
||||
cachedBaseUrl === credentials.baseUrl &&
|
||||
now - cachedTokenAt < TOKEN_TTL_MS
|
||||
) {
|
||||
return cachedToken;
|
||||
}
|
||||
cachedToken = await loginUmami(credentials);
|
||||
cachedTokenAt = now;
|
||||
cachedBaseUrl = credentials.baseUrl;
|
||||
return cachedToken;
|
||||
}
|
||||
|
||||
export async function fetchMemindDiscoveryPages(
|
||||
query = {},
|
||||
{ env = process.env, analyticsConfig = {} } = {},
|
||||
) {
|
||||
const credentials = resolveUmamiCredentials(env, analyticsConfig);
|
||||
if (!credentials.websiteId) {
|
||||
throw new Error('未配置 Umami Website ID');
|
||||
}
|
||||
const channel = String(query.discoveryChannel ?? query.channel ?? '').trim().toLowerCase();
|
||||
if (channel !== 'seo' && channel !== 'geo') {
|
||||
throw new Error('discoveryChannel 必须是 seo 或 geo');
|
||||
}
|
||||
|
||||
const params = new URLSearchParams();
|
||||
params.set('discoveryChannel', channel);
|
||||
params.set('page', String(Math.max(Number(query.page) || 1, 1)));
|
||||
params.set('pageSize', String(Math.min(Math.max(Number(query.pageSize) || 10, 1), 100)));
|
||||
params.set('sortBy', String(query.sortBy || 'views'));
|
||||
params.set('sortOrder', String(query.sortOrder || 'desc'));
|
||||
if (query.startAt) params.set('startAt', String(query.startAt));
|
||||
if (query.endAt) params.set('endAt', String(query.endAt));
|
||||
if (query.timezone) params.set('timezone', String(query.timezone));
|
||||
if (query.generatedStartAt) params.set('generatedStartAt', String(query.generatedStartAt));
|
||||
if (query.generatedEndAt) params.set('generatedEndAt', String(query.generatedEndAt));
|
||||
|
||||
const token = await getUmamiAuthToken(credentials);
|
||||
const response = await fetch(
|
||||
`${credentials.baseUrl}/api/websites/${encodeURIComponent(credentials.websiteId)}/memind-pages?${params.toString()}`,
|
||||
{
|
||||
headers: {
|
||||
authorization: `Bearer ${token}`,
|
||||
'content-type': 'application/json',
|
||||
},
|
||||
signal: AbortSignal.timeout(15_000),
|
||||
},
|
||||
);
|
||||
const body = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
throw new Error(body?.message || `Umami memind-pages 请求失败 (${response.status})`);
|
||||
}
|
||||
return {
|
||||
discoveryChannel: channel,
|
||||
...body,
|
||||
};
|
||||
}
|
||||
|
||||
export function resolvePublicPageUrl(row = {}, fallbackHost = 'm.tkmind.cn') {
|
||||
const exact = String(row.pageUrl ?? '').trim();
|
||||
if (/^https?:\/\//i.test(exact)) return exact.split('#')[0];
|
||||
const hostname = String(row.hostname ?? '').trim();
|
||||
if (hostname === '127.0.0.1' || hostname === 'localhost') {
|
||||
return `http://${hostname}:8081${row.urlPath}`;
|
||||
}
|
||||
const host = hostname || fallbackHost;
|
||||
return `https://${host}${row.urlPath}`;
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
|
||||
import { fetchMemindDiscoveryPages } from './umami-analytics.mjs';
|
||||
|
||||
test('fetchMemindDiscoveryPages rejects invalid discoveryChannel', async () => {
|
||||
await assert.rejects(
|
||||
() => fetchMemindDiscoveryPages(
|
||||
{ discoveryChannel: 'direct' },
|
||||
{ env: { UMAMI_ADMIN_PASSWORD: 'secret' }, analyticsConfig: { websiteId: 'site-1' } },
|
||||
),
|
||||
/discoveryChannel 必须是 seo 或 geo/,
|
||||
);
|
||||
});
|
||||
|
||||
test('fetchMemindDiscoveryPages rejects missing website id', async () => {
|
||||
await assert.rejects(
|
||||
() => fetchMemindDiscoveryPages(
|
||||
{ discoveryChannel: 'seo', startAt: '1', endAt: '2' },
|
||||
{ env: { UMAMI_ADMIN_PASSWORD: 'secret' }, analyticsConfig: {} },
|
||||
),
|
||||
/未配置 Umami Website ID/,
|
||||
);
|
||||
});
|
||||
|
||||
test('fetchMemindDiscoveryPages rejects missing auth credentials', async () => {
|
||||
await assert.rejects(
|
||||
() => fetchMemindDiscoveryPages(
|
||||
{ discoveryChannel: 'geo', startAt: '1', endAt: '2' },
|
||||
{ env: {}, analyticsConfig: { websiteId: 'site-1' } },
|
||||
),
|
||||
/未配置 UMAMI_ADMIN_PASSWORD 或 MEMIND_UMAMI_SSO_SECRET/,
|
||||
);
|
||||
});
|
||||
@@ -13,12 +13,14 @@ import { MindSearchPage } from './admin/pages/MindSearchPage';
|
||||
import { ProvidersPage } from './admin/pages/ProvidersPage';
|
||||
import { SkillsPage } from './admin/pages/SkillsPage';
|
||||
import { SystemTestsPage } from './admin/pages/SystemTestsPage';
|
||||
import { TemplateCatalogPage } from './admin/pages/TemplateCatalogPage';
|
||||
import { UserDetailPage } from './admin/pages/UserDetailPage';
|
||||
import { UsersPage } from './admin/pages/UsersPage';
|
||||
import { WechatPage } from './admin/pages/WechatPage';
|
||||
import { AssetGatewayPage } from './admin/pages/AssetGatewayPage';
|
||||
import { BlockedWordsPage } from './admin/pages/BlockedWordsPage';
|
||||
import { AnalyticsConfigPage } from './admin/pages/AnalyticsConfigPage';
|
||||
import { SeoGeoAnalyticsPage } from './admin/pages/SeoGeoAnalyticsPage';
|
||||
import { SkillRuntimePage } from './admin/pages/SkillRuntimePage';
|
||||
import { OrchestratorPage } from './admin/pages/OrchestratorPage';
|
||||
import { defaultHomePath } from './lib/routes';
|
||||
@@ -121,12 +123,14 @@ function AdminApp({ user, onLogout }: { user: PortalUser; onLogout: () => void }
|
||||
<Route path="users/:userId" element={<UserDetailPage />} />
|
||||
<Route path="billing/*" element={<BillingPage />} />
|
||||
<Route path="image-quota" element={<ImageQuotaPage />} />
|
||||
<Route path="template-catalog" element={<TemplateCatalogPage />} />
|
||||
<Route path="capabilities" element={<CapabilitiesPage />} />
|
||||
<Route path="skills" element={<SkillsPage />} />
|
||||
<Route path="system-tests" element={<SystemTestsPage />} />
|
||||
<Route path="policies" element={<PoliciesPage />} />
|
||||
<Route path="mindspace" element={<MindSpacePage />} />
|
||||
<Route path="analytics" element={<AnalyticsConfigPage />} />
|
||||
<Route path="analytics/seo-geo" element={<SeoGeoAnalyticsPage />} />
|
||||
<Route path="memory-v2" element={<MemoryV2Page />} />
|
||||
<Route path="mindsearch" element={<MindSearchPage />} />
|
||||
<Route path="skill-runtime" element={<SkillRuntimePage />} />
|
||||
@@ -173,11 +177,13 @@ function loginRedirectPath(pathname: string, role: string | undefined) {
|
||||
pathname.startsWith('/users')
|
||||
|| pathname.startsWith('/billing')
|
||||
|| pathname.startsWith('/image-quota')
|
||||
|| pathname.startsWith('/template-catalog')
|
||||
|| pathname.startsWith('/capabilities')
|
||||
|| pathname.startsWith('/skills')
|
||||
|| pathname.startsWith('/system-tests')
|
||||
|| pathname.startsWith('/policies')
|
||||
|| pathname.startsWith('/mindspace')
|
||||
|| pathname.startsWith('/analytics')
|
||||
|| pathname.startsWith('/memory-v2')
|
||||
|| pathname.startsWith('/skill-runtime')
|
||||
|| pathname.startsWith('/orchestrator')
|
||||
|
||||
@@ -24,6 +24,7 @@ const NAV_SECTIONS: NavSection[] = [
|
||||
items: [
|
||||
{ to: '/billing', label: '计费中心', end: false },
|
||||
{ to: '/image-quota', label: '图片额度' },
|
||||
{ to: '/template-catalog', label: '页面模板' },
|
||||
],
|
||||
},
|
||||
{
|
||||
@@ -32,6 +33,7 @@ const NAV_SECTIONS: NavSection[] = [
|
||||
{ to: '/wechat', label: '服务号' },
|
||||
{ to: '/mindspace', label: 'MindSpace 配置' },
|
||||
{ to: '/analytics', label: 'Analytics 配置' },
|
||||
{ to: '/analytics/seo-geo', label: 'SEO / GEO 流量' },
|
||||
{ to: '/memory-v2', label: 'Memory V2' },
|
||||
{ to: '/mindsearch', label: 'MindSearch' },
|
||||
{ to: '/skill-runtime', label: 'Skill Runtime' },
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useCallback, useEffect, useState, type FormEvent } from 'react';
|
||||
import { getMindSpaceAdminConfig, getRybbitSsoUrl, getUmamiSsoUrl, updateMindSpaceAdminConfig } from '../../api/client';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { getMindSpaceAdminConfig, getUmamiSsoUrl, updateMindSpaceAdminConfig } from '../../api/client';
|
||||
|
||||
const initial = {
|
||||
enabled: false,
|
||||
@@ -17,7 +18,6 @@ export function AnalyticsConfigPage() {
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
const [openingUmami, setOpeningUmami] = useState(false);
|
||||
const [openingRybbit, setOpeningRybbit] = useState(false);
|
||||
|
||||
const load = useCallback(async () => {
|
||||
setLoading(true);
|
||||
@@ -63,28 +63,15 @@ export function AnalyticsConfigPage() {
|
||||
}
|
||||
};
|
||||
|
||||
const openRybbit = async () => {
|
||||
setOpeningRybbit(true);
|
||||
setError(null);
|
||||
try {
|
||||
window.location.assign(await getRybbitSsoUrl());
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : '无法打开 Rybbit');
|
||||
setOpeningRybbit(false);
|
||||
}
|
||||
};
|
||||
|
||||
return <div className="admin-page">
|
||||
<div className="admin-page-head"><h2>Analytics 配置</h2><p className="muted">进入统计后台，或配置 Memind 生成页面的 Umami 统计。</p></div>
|
||||
<div className="admin-page-head"><h2>Analytics 配置</h2><p className="muted">配置 Umami 并进入统计后台。Rybbit 已退役，见 Memind 文档 analytics-platform.md。</p></div>
|
||||
{error && <p className="banner banner-error">{error}</p>}
|
||||
{message && <p className="banner banner-info">{message}</p>}
|
||||
<section className="admin-card">
|
||||
<h2>Rybbit 行为分析</h2>
|
||||
<p className="muted">查看页面访问、用户会话、停留时间、点击和会话回放等行为明细。</p>
|
||||
<h2>SEO / GEO 页面流量</h2>
|
||||
<p className="muted">按页面查看搜索引擎与生成式引擎来源访问，表格口径与 Umami「所有生成页面明细」一致。</p>
|
||||
<div className="admin-actions">
|
||||
<button type="button" className="send-btn" onClick={() => void openRybbit()} disabled={openingRybbit}>
|
||||
{openingRybbit ? '正在进入 Rybbit...' : '打开 Rybbit 分析后台'}
|
||||
</button>
|
||||
<Link to="/analytics/seo-geo" className="send-btn">打开 SEO / GEO 流量看板</Link>
|
||||
</div>
|
||||
</section>
|
||||
<section className="admin-card">
|
||||
@@ -96,6 +83,7 @@ export function AnalyticsConfigPage() {
|
||||
<label className="admin-form-row"><span>Umami 地址</span><input value={config.analyticsUrl} disabled={loading || busy} onChange={(e) => setConfig({ ...config, analyticsUrl: e.target.value })} placeholder="http://127.0.0.1:3100" /></label>
|
||||
<label className="admin-form-row"><span>统计域名</span><input value={config.domains} disabled={loading || busy} onChange={(e) => setConfig({ ...config, domains: e.target.value })} placeholder="127.0.0.1,localhost" /></label>
|
||||
<label className="admin-form-row"><span>匿名化密钥 {config.idSecretConfigured ? '（已配置，留空保持不变）' : ''}</span><input type="password" value={secret} disabled={loading || busy} onChange={(e) => setSecret(e.target.value)} placeholder={config.idSecretConfigured ? '留空保持当前密钥' : '输入本地随机密钥'} autoComplete="new-password" /></label>
|
||||
<p className="muted">SEO/GEO 看板通过 <code>MEMIND_UMAMI_SSO_SECRET</code>（推荐，与 105 Umami 一致）或 <code>UMAMI_ADMIN_PASSWORD</code> 访问 Umami API；生产 Umami 若开启 SSO-only 则只需前者。</p>
|
||||
<div className="admin-actions"><button type="submit" className="send-btn" disabled={busy || loading}>{busy ? '保存中...' : '保存配置'}</button><button type="button" className="ghost-btn" onClick={() => void load()} disabled={busy}>重新加载</button></div>
|
||||
</form>
|
||||
</section>
|
||||
|
||||
@@ -450,6 +450,11 @@ function UsageRecordsTable({
|
||||
result: PagedResult<UsageRecord>;
|
||||
onPage: (page: number) => void;
|
||||
}) {
|
||||
const formatBillingSource = (row: UsageRecord) => {
|
||||
if (row.billingSource === 'subscription') return '套餐额度';
|
||||
return `¥${formatYuan(row.costCents)}`;
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="admin-table-wrap">
|
||||
@@ -474,8 +479,10 @@ function UsageRecordsTable({
|
||||
</td>
|
||||
<td className="billing-num">{row.inputTokens.toLocaleString()}</td>
|
||||
<td className="billing-num">{row.outputTokens.toLocaleString()}</td>
|
||||
<td className="billing-num">¥{formatYuan(row.costCents)}</td>
|
||||
<td className="billing-num">¥{formatYuan(row.balanceAfterCents)}</td>
|
||||
<td className="billing-num">{formatBillingSource(row)}</td>
|
||||
<td className="billing-num">
|
||||
{row.billingSource === 'subscription' ? '—' : `¥${formatYuan(row.balanceAfterCents)}`}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
|
||||
@@ -238,7 +238,9 @@ export function DashboardPage() {
|
||||
<td>
|
||||
in {row.inputTokens} / out {row.outputTokens}
|
||||
</td>
|
||||
<td>¥{formatYuan(row.costCents)}</td>
|
||||
<td>
|
||||
{row.billingSource === 'subscription' ? '套餐额度' : `¥${formatYuan(row.costCents)}`}
|
||||
</td>
|
||||
</tr>
|
||||
))
|
||||
)}
|
||||
|
||||
@@ -1,14 +1,37 @@
|
||||
import { useCallback, useEffect, useState, type FormEvent } from 'react';
|
||||
import { getMindSpaceAdminConfig, updateMindSpaceAdminConfig } from '../../api/client';
|
||||
import type { MindSpaceAdminConfig } from '../../types';
|
||||
import type { MindSpaceAdminConfig, MindSpaceSeoGeoConfig } from '../../types';
|
||||
|
||||
function defaultSeoGeoConfig(): MindSpaceSeoGeoConfig {
|
||||
return {
|
||||
enabled: false,
|
||||
seo: {
|
||||
enabled: false,
|
||||
canonical: true,
|
||||
sitemap: false,
|
||||
robotsTxt: false,
|
||||
baiduPush: false,
|
||||
},
|
||||
geo: {
|
||||
enabled: false,
|
||||
jsonLd: false,
|
||||
llmsTxt: false,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function safeConfig(config: MindSpaceAdminConfig | null): MindSpaceAdminConfig {
|
||||
return config ?? { publicPageLimit: 10, analytics: { enabled: false, websiteId: '', analyticsUrl: 'http://127.0.0.1:3100', domains: '127.0.0.1,localhost', idSecretConfigured: false } };
|
||||
return config ?? {
|
||||
publicPageLimit: 10,
|
||||
seoGeo: defaultSeoGeoConfig(),
|
||||
analytics: { enabled: false, websiteId: '', analyticsUrl: 'http://127.0.0.1:3100', domains: '127.0.0.1,localhost', idSecretConfigured: false },
|
||||
};
|
||||
}
|
||||
|
||||
export function MindSpacePage() {
|
||||
const [config, setConfig] = useState<MindSpaceAdminConfig | null>(null);
|
||||
const [limit, setLimit] = useState('10');
|
||||
const [seoGeo, setSeoGeo] = useState<MindSpaceSeoGeoConfig>(defaultSeoGeoConfig());
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -22,6 +45,7 @@ export function MindSpacePage() {
|
||||
const nextConfig = await getMindSpaceAdminConfig();
|
||||
setConfig(nextConfig);
|
||||
setLimit(String(nextConfig.publicPageLimit));
|
||||
setSeoGeo(nextConfig.seoGeo ?? defaultSeoGeoConfig());
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : '加载 MindSpace 配置失败');
|
||||
} finally {
|
||||
@@ -39,10 +63,14 @@ export function MindSpacePage() {
|
||||
setError(null);
|
||||
setMessage(null);
|
||||
try {
|
||||
const nextConfig = await updateMindSpaceAdminConfig({ publicPageLimit: Number(limit) });
|
||||
const nextConfig = await updateMindSpaceAdminConfig({
|
||||
publicPageLimit: Number(limit),
|
||||
seoGeo,
|
||||
});
|
||||
setConfig(nextConfig);
|
||||
setLimit(String(nextConfig.publicPageLimit));
|
||||
setMessage(`已更新为 ${nextConfig.publicPageLimit}，主站会立即按新值校验。`);
|
||||
setSeoGeo(nextConfig.seoGeo ?? defaultSeoGeoConfig());
|
||||
setMessage(`已更新 MindSpace 配置，SEO/GEO 总开关：${nextConfig.seoGeo?.enabled ? '开启' : '关闭'}。`);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : '保存 MindSpace 配置失败');
|
||||
} finally {
|
||||
@@ -52,6 +80,15 @@ export function MindSpacePage() {
|
||||
|
||||
const current = safeConfig(config);
|
||||
|
||||
const updateSeoGeo = (patch: Partial<MindSpaceSeoGeoConfig>) => {
|
||||
setSeoGeo((currentSeoGeo) => ({
|
||||
...currentSeoGeo,
|
||||
...patch,
|
||||
seo: { ...currentSeoGeo.seo, ...(patch.seo ?? {}) },
|
||||
geo: { ...currentSeoGeo.geo, ...(patch.geo ?? {}) },
|
||||
}));
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="admin-page">
|
||||
<div className="admin-page-head">
|
||||
@@ -62,12 +99,12 @@ export function MindSpacePage() {
|
||||
{error && <p className="banner banner-error">{error}</p>}
|
||||
{message && <p className="banner banner-info">{message}</p>}
|
||||
|
||||
<form className="admin-form" onSubmit={handleSave}>
|
||||
<section className="admin-card">
|
||||
<h2>公开页面上限</h2>
|
||||
<p className="muted">
|
||||
当前值：{loading ? '—' : current.publicPageLimit}。建议在修改后同步检查主站发布流程。
|
||||
</p>
|
||||
<form className="admin-form" onSubmit={handleSave}>
|
||||
<label className="admin-form-row">
|
||||
<span>每个用户最多可在线的公开页面数</span>
|
||||
<input
|
||||
@@ -80,16 +117,97 @@ export function MindSpacePage() {
|
||||
required
|
||||
/>
|
||||
</label>
|
||||
<div className="admin-actions">
|
||||
<button type="submit" className="send-btn" disabled={busy || loading}>
|
||||
{busy ? '保存中...' : '保存配置'}
|
||||
</button>
|
||||
<button type="button" className="ghost-btn" onClick={() => void load()} disabled={busy}>
|
||||
重新加载
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
|
||||
<section className="admin-card">
|
||||
<h2>SEO / GEO</h2>
|
||||
<p className="muted">
|
||||
仅对「已确认公开、access_mode=public、status=online」的发布页生效。私有、密码、登录可见或未确认页面会强制 noindex，不会进入 sitemap / llms.txt。
|
||||
</p>
|
||||
<div className="admin-form">
|
||||
<label className="admin-form-row">
|
||||
<span>启用 SEO / GEO 总开关</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={seoGeo.enabled}
|
||||
onChange={(e) => updateSeoGeo({ enabled: e.target.checked })}
|
||||
disabled={loading || busy}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>SEO：页面 meta + canonical 注入</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={seoGeo.seo.enabled}
|
||||
onChange={(e) => updateSeoGeo({ seo: { ...seoGeo.seo, enabled: e.target.checked } })}
|
||||
disabled={loading || busy || !seoGeo.enabled}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>SEO：sitemap.xml</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={seoGeo.seo.sitemap}
|
||||
onChange={(e) => updateSeoGeo({ seo: { ...seoGeo.seo, sitemap: e.target.checked } })}
|
||||
disabled={loading || busy || !seoGeo.enabled || !seoGeo.seo.enabled}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>SEO：robots.txt</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={seoGeo.seo.robotsTxt}
|
||||
onChange={(e) => updateSeoGeo({ seo: { ...seoGeo.seo, robotsTxt: e.target.checked } })}
|
||||
disabled={loading || busy || !seoGeo.enabled || !seoGeo.seo.enabled}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>SEO：百度主动推送</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={seoGeo.seo.baiduPush}
|
||||
onChange={(e) => updateSeoGeo({ seo: { ...seoGeo.seo, baiduPush: e.target.checked } })}
|
||||
disabled={loading || busy || !seoGeo.enabled || !seoGeo.seo.enabled}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>GEO：JSON-LD 结构化数据</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={seoGeo.geo.jsonLd}
|
||||
onChange={(e) => updateSeoGeo({ geo: { ...seoGeo.geo, jsonLd: e.target.checked, enabled: e.target.checked || seoGeo.geo.llmsTxt } })}
|
||||
disabled={loading || busy || !seoGeo.enabled}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>GEO：llms.txt（AI 搜索发现）</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={seoGeo.geo.llmsTxt}
|
||||
onChange={(e) => updateSeoGeo({ geo: { ...seoGeo.geo, llmsTxt: e.target.checked, enabled: seoGeo.geo.jsonLd || e.target.checked } })}
|
||||
disabled={loading || busy || !seoGeo.enabled}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>GEO 子开关（结构化 + 发现层）</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={seoGeo.geo.enabled}
|
||||
onChange={(e) => updateSeoGeo({ geo: { ...seoGeo.geo, enabled: e.target.checked } })}
|
||||
disabled={loading || busy || !seoGeo.enabled}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
</section>
|
||||
<div className="admin-actions">
|
||||
<button type="submit" className="send-btn" disabled={busy || loading}>
|
||||
{busy ? '保存中...' : '保存配置'}
|
||||
</button>
|
||||
<button type="button" className="ghost-btn" onClick={() => void load()} disabled={busy}>
|
||||
重新加载
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,342 @@
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { getSeoGeoAnalyticsPages, getUmamiSsoUrl } from '../../api/client';
|
||||
|
||||
type DiscoveryChannel = 'seo' | 'geo';
|
||||
|
||||
type PageRow = {
|
||||
urlPath: string;
|
||||
pageUrl?: string;
|
||||
hostname?: string;
|
||||
pageTitle: string;
|
||||
views: number;
|
||||
visitors: number;
|
||||
visits: number;
|
||||
clicks: number;
|
||||
engagedVisits: number;
|
||||
forms: number;
|
||||
generatedAt?: string | null;
|
||||
generatedAtInferred?: boolean;
|
||||
firstSeenAt?: string | null;
|
||||
};
|
||||
|
||||
type PageSort =
|
||||
| 'generatedAt'
|
||||
| 'views'
|
||||
| 'visitors'
|
||||
| 'visits'
|
||||
| 'clicks'
|
||||
| 'engagedVisits'
|
||||
| 'forms'
|
||||
| 'pageTitle'
|
||||
| 'firstSeenAt';
|
||||
|
||||
function formatNumber(value: number) {
|
||||
return new Intl.NumberFormat('zh-CN').format(Number(value) || 0);
|
||||
}
|
||||
|
||||
function resolvePageUrl(row: PageRow) {
|
||||
const exact = String(row.pageUrl ?? '').trim();
|
||||
if (/^https?:\/\//i.test(exact)) return exact;
|
||||
const hostname = String(row.hostname ?? '').trim();
|
||||
if (hostname === '127.0.0.1' || hostname === 'localhost') {
|
||||
return `http://${hostname}:8081${row.urlPath}`;
|
||||
}
|
||||
return hostname ? `https://${hostname}${row.urlPath}` : row.urlPath;
|
||||
}
|
||||
|
||||
function defaultRange() {
|
||||
const end = new Date();
|
||||
const start = new Date(end);
|
||||
start.setDate(start.getDate() - 29);
|
||||
return {
|
||||
startDate: start.toISOString().slice(0, 10),
|
||||
endDate: end.toISOString().slice(0, 10),
|
||||
};
|
||||
}
|
||||
|
||||
function toRangeMs(startDate: string, endDate: string) {
|
||||
const startAt = new Date(`${startDate}T00:00:00`).getTime();
|
||||
const endAt = new Date(`${endDate}T23:59:59.999`).getTime();
|
||||
return { startAt, endAt };
|
||||
}
|
||||
|
||||
export function SeoGeoAnalyticsPage() {
|
||||
const initialRange = useMemo(() => defaultRange(), []);
|
||||
const [channel, setChannel] = useState<DiscoveryChannel>('seo');
|
||||
const [startDate, setStartDate] = useState(initialRange.startDate);
|
||||
const [endDate, setEndDate] = useState(initialRange.endDate);
|
||||
const [generatedStartDate, setGeneratedStartDate] = useState('');
|
||||
const [generatedEndDate, setGeneratedEndDate] = useState('');
|
||||
const [sortBy, setSortBy] = useState<PageSort>('views');
|
||||
const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
|
||||
const [page, setPage] = useState(1);
|
||||
const [rows, setRows] = useState<PageRow[]>([]);
|
||||
const [total, setTotal] = useState(0);
|
||||
const [totalViews, setTotalViews] = useState(0);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [openingUmami, setOpeningUmami] = useState(false);
|
||||
|
||||
const pageCount = Math.max(1, Math.ceil(total / 10));
|
||||
|
||||
const load = useCallback(async () => {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
const { startAt, endAt } = toRangeMs(startDate, endDate);
|
||||
const result = await getSeoGeoAnalyticsPages({
|
||||
discoveryChannel: channel,
|
||||
startAt,
|
||||
endAt,
|
||||
timezone: 'Asia/Shanghai',
|
||||
page,
|
||||
pageSize: 10,
|
||||
sortBy,
|
||||
sortOrder,
|
||||
generatedStartAt: generatedStartDate
|
||||
? new Date(`${generatedStartDate}T00:00:00`).getTime()
|
||||
: undefined,
|
||||
generatedEndAt: generatedEndDate
|
||||
? new Date(`${generatedEndDate}T23:59:59.999`).getTime()
|
||||
: undefined,
|
||||
});
|
||||
setRows(Array.isArray(result.data) ? result.data : []);
|
||||
setTotal(Number(result.total) || 0);
|
||||
setTotalViews(Number(result.totalViews) || 0);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : '加载 SEO/GEO 页面统计失败');
|
||||
setRows([]);
|
||||
setTotal(0);
|
||||
setTotalViews(0);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [
|
||||
channel,
|
||||
endDate,
|
||||
generatedEndDate,
|
||||
generatedStartDate,
|
||||
page,
|
||||
sortBy,
|
||||
sortOrder,
|
||||
startDate,
|
||||
]);
|
||||
|
||||
useEffect(() => {
|
||||
void load();
|
||||
}, [load]);
|
||||
|
||||
useEffect(() => {
|
||||
setPage(1);
|
||||
}, [channel, startDate, endDate, generatedStartDate, generatedEndDate, sortBy, sortOrder]);
|
||||
|
||||
const openUmami = async () => {
|
||||
setOpeningUmami(true);
|
||||
setError(null);
|
||||
try {
|
||||
window.location.assign(await getUmamiSsoUrl());
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : '无法打开 Umami');
|
||||
setOpeningUmami(false);
|
||||
}
|
||||
};
|
||||
|
||||
const overview = useMemo(() => {
|
||||
const pages = rows.length;
|
||||
const views = rows.reduce((sum, row) => sum + Number(row.views || 0), 0);
|
||||
const visitors = rows.reduce((sum, row) => sum + Number(row.visitors || 0), 0);
|
||||
const clicks = rows.reduce((sum, row) => sum + Number(row.clicks || 0), 0);
|
||||
const engaged = rows.reduce((sum, row) => sum + Number(row.engagedVisits || 0), 0);
|
||||
const forms = rows.reduce((sum, row) => sum + Number(row.forms || 0), 0);
|
||||
return { pages, views, visitors, clicks, engaged, forms };
|
||||
}, [rows]);
|
||||
|
||||
return (
|
||||
<div className="admin-page">
|
||||
<div className="admin-page-head">
|
||||
<h2>SEO / GEO 流量</h2>
|
||||
<p className="muted">
|
||||
按页面查看来自搜索引擎（SEO）与生成式引擎（GEO）的真实用户访问，表格口径与 Umami「所有生成页面明细」一致。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{error && <p className="banner banner-error">{error}</p>}
|
||||
|
||||
<section className="admin-card">
|
||||
<div className="admin-actions" style={{ marginBottom: 16, flexWrap: 'wrap', gap: 8 }}>
|
||||
<button
|
||||
type="button"
|
||||
className={channel === 'seo' ? 'send-btn' : 'ghost-btn'}
|
||||
onClick={() => setChannel('seo')}
|
||||
>
|
||||
SEO 流量
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className={channel === 'geo' ? 'send-btn' : 'ghost-btn'}
|
||||
onClick={() => setChannel('geo')}
|
||||
>
|
||||
GEO 流量
|
||||
</button>
|
||||
<button type="button" className="ghost-btn" onClick={() => void load()} disabled={loading}>
|
||||
{loading ? '刷新中…' : '刷新数据'}
|
||||
</button>
|
||||
<button type="button" className="ghost-btn" onClick={() => void openUmami()} disabled={openingUmami}>
|
||||
{openingUmami ? '正在进入 Umami…' : '打开 Umami 完整看板'}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="admin-form" style={{ marginBottom: 16 }}>
|
||||
<label className="admin-form-row">
|
||||
<span>统计日期从</span>
|
||||
<input type="date" value={startDate} max={endDate} onChange={(e) => setStartDate(e.target.value)} />
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>统计日期到</span>
|
||||
<input type="date" value={endDate} min={startDate} onChange={(e) => setEndDate(e.target.value)} />
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>生成日期从</span>
|
||||
<input
|
||||
type="date"
|
||||
value={generatedStartDate}
|
||||
max={generatedEndDate || undefined}
|
||||
onChange={(e) => setGeneratedStartDate(e.target.value)}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>生成日期到</span>
|
||||
<input
|
||||
type="date"
|
||||
value={generatedEndDate}
|
||||
min={generatedStartDate || undefined}
|
||||
onChange={(e) => setGeneratedEndDate(e.target.value)}
|
||||
/>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>排序字段</span>
|
||||
<select value={sortBy} onChange={(e) => setSortBy(e.target.value as PageSort)}>
|
||||
<option value="views">浏览量</option>
|
||||
<option value="visitors">访客</option>
|
||||
<option value="visits">访问</option>
|
||||
<option value="clicks">点击</option>
|
||||
<option value="engagedVisits">参与</option>
|
||||
<option value="forms">表单</option>
|
||||
<option value="generatedAt">生成日期</option>
|
||||
<option value="pageTitle">Title</option>
|
||||
<option value="firstSeenAt">首次访问</option>
|
||||
</select>
|
||||
</label>
|
||||
<label className="admin-form-row">
|
||||
<span>顺序</span>
|
||||
<select value={sortOrder} onChange={(e) => setSortOrder(e.target.value as 'asc' | 'desc')}>
|
||||
<option value="desc">降序</option>
|
||||
<option value="asc">升序</option>
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className="admin-metrics-grid" style={{ display: 'flex', gap: 12, flexWrap: 'wrap', marginBottom: 16 }}>
|
||||
<div className="admin-card metric-card" style={{ minWidth: 140, padding: 16 }}>
|
||||
<div className="muted">当前页合计浏览量</div>
|
||||
<strong>{formatNumber(overview.views)}</strong>
|
||||
</div>
|
||||
<div className="admin-card metric-card" style={{ minWidth: 140, padding: 16 }}>
|
||||
<div className="muted">筛选期总浏览量</div>
|
||||
<strong>{formatNumber(totalViews)}</strong>
|
||||
</div>
|
||||
<div className="admin-card metric-card" style={{ minWidth: 140, padding: 16 }}>
|
||||
<div className="muted">有 {channel.toUpperCase()} 流量的页面</div>
|
||||
<strong>{formatNumber(total)}</strong>
|
||||
</div>
|
||||
<div className="admin-card metric-card" style={{ minWidth: 140, padding: 16 }}>
|
||||
<div className="muted">点击 / 参与 / 表单</div>
|
||||
<strong>{formatNumber(overview.clicks)} / {formatNumber(overview.engaged)} / {formatNumber(overview.forms)}</strong>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="admin-table-wrap">
|
||||
<table className="admin-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Title</th>
|
||||
<th>页面 URL</th>
|
||||
<th>浏览量</th>
|
||||
<th>访客</th>
|
||||
<th>访问</th>
|
||||
<th>点击</th>
|
||||
<th>参与</th>
|
||||
<th>表单</th>
|
||||
<th>贡献值</th>
|
||||
<th>生成日期</th>
|
||||
<th>筛选期首次访问</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{loading ? (
|
||||
<tr>
|
||||
<td colSpan={11}>正在加载…</td>
|
||||
</tr>
|
||||
) : rows.length === 0 ? (
|
||||
<tr>
|
||||
<td colSpan={11}>当前日期范围内暂无 {channel.toUpperCase()} 来源的页面访问数据</td>
|
||||
</tr>
|
||||
) : (
|
||||
rows.map((row) => {
|
||||
const pageUrl = resolvePageUrl(row);
|
||||
const contribution = totalViews
|
||||
? `${((Number(row.views) / totalViews) * 100).toFixed(2)}%`
|
||||
: '0.00%';
|
||||
return (
|
||||
<tr key={`${row.urlPath}-${row.firstSeenAt ?? ''}`}>
|
||||
<td className="admin-table-path" title={row.pageTitle}>{row.pageTitle}</td>
|
||||
<td className="admin-table-path">
|
||||
<a href={pageUrl} target="_blank" rel="noreferrer" title={pageUrl}>
|
||||
{pageUrl}
|
||||
</a>
|
||||
</td>
|
||||
<td>{formatNumber(row.views)}</td>
|
||||
<td>{formatNumber(row.visitors)}</td>
|
||||
<td>{formatNumber(row.visits)}</td>
|
||||
<td>{formatNumber(row.clicks)}</td>
|
||||
<td>{formatNumber(row.engagedVisits)}</td>
|
||||
<td>{formatNumber(row.forms)}</td>
|
||||
<td>{contribution}</td>
|
||||
<td>
|
||||
{row.generatedAt
|
||||
? `${new Date(row.generatedAt).toLocaleDateString('zh-CN')}${row.generatedAtInferred ? '（首访回推）' : ''}`
|
||||
: '—'}
|
||||
</td>
|
||||
<td>
|
||||
{row.firstSeenAt
|
||||
? new Date(row.firstSeenAt).toLocaleString('zh-CN')
|
||||
: '—'}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div className="admin-actions" style={{ marginTop: 16 }}>
|
||||
<button type="button" className="ghost-btn" disabled={page <= 1 || loading} onClick={() => setPage((p) => p - 1)}>
|
||||
上一页
|
||||
</button>
|
||||
<span className="muted">
|
||||
第 {page} / {pageCount} 页，共 {formatNumber(total)} 个页面
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
className="ghost-btn"
|
||||
disabled={page >= pageCount || loading}
|
||||
onClick={() => setPage((p) => p + 1)}
|
||||
>
|
||||
下一页
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,267 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { fetchAdminTemplateCatalog, updateAdminTemplateCatalogItem } from '../../api/client';
|
||||
import type { AdminTemplateCatalogItem } from '../../types';
|
||||
|
||||
type DraftRow = {
|
||||
label: string;
|
||||
description: string;
|
||||
previewUrl: string;
|
||||
priceYuan: string;
|
||||
billingMode: AdminTemplateCatalogItem['billingMode'];
|
||||
status: AdminTemplateCatalogItem['status'];
|
||||
sortOrder: string;
|
||||
};
|
||||
|
||||
const STATUS_LABELS: Record<AdminTemplateCatalogItem['status'], string> = {
|
||||
draft: '草稿',
|
||||
active: '上架',
|
||||
archived: '下架',
|
||||
};
|
||||
|
||||
const BILLING_LABELS: Record<AdminTemplateCatalogItem['billingMode'], string> = {
|
||||
free: '免费',
|
||||
one_time: '一次性',
|
||||
subscription: '订阅',
|
||||
};
|
||||
|
||||
function toDraft(item: AdminTemplateCatalogItem): DraftRow {
|
||||
return {
|
||||
label: item.label,
|
||||
description: item.description ?? '',
|
||||
previewUrl: item.previewUrl ?? '',
|
||||
priceYuan: item.priceCents > 0 ? (item.priceCents / 100).toFixed(item.priceCents % 100 === 0 ? 0 : 2) : '0',
|
||||
billingMode: item.billingMode,
|
||||
status: item.status,
|
||||
sortOrder: String(item.sortOrder ?? 0),
|
||||
};
|
||||
}
|
||||
|
||||
function resolvePreviewSrc(previewUrl: string | null | undefined) {
|
||||
if (!previewUrl) return null;
|
||||
if (/^https?:\/\//i.test(previewUrl)) return previewUrl;
|
||||
const portalOrigin = import.meta.env.VITE_PORTAL_ORIGIN?.trim() || 'http://127.0.0.1:5173';
|
||||
return `${portalOrigin.replace(/\/$/, '')}${previewUrl.startsWith('/') ? previewUrl : `/${previewUrl}`}`;
|
||||
}
|
||||
|
||||
export function TemplateCatalogPage() {
|
||||
const [items, setItems] = useState<AdminTemplateCatalogItem[]>([]);
|
||||
const [drafts, setDrafts] = useState<Record<string, DraftRow>>({});
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [busySkill, setBusySkill] = useState<string | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
|
||||
const portalPreviewBase =
|
||||
import.meta.env.VITE_PORTAL_ORIGIN?.trim()?.replace(/\/$/, '') || 'http://127.0.0.1:5173';
|
||||
|
||||
const load = async () => {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
const catalog = await fetchAdminTemplateCatalog();
|
||||
setItems(catalog);
|
||||
setDrafts(Object.fromEntries(catalog.map((item) => [item.skillName, toDraft(item)])));
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : '加载模板目录失败');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
void load();
|
||||
}, []);
|
||||
|
||||
const sortedItems = useMemo(
|
||||
() => [...items].sort((a, b) => a.sortOrder - b.sortOrder || a.label.localeCompare(b.label, 'zh-CN')),
|
||||
[items],
|
||||
);
|
||||
|
||||
const updateDraft = (skillName: string, patch: Partial<DraftRow>) => {
|
||||
setDrafts((current) => ({
|
||||
...current,
|
||||
[skillName]: { ...(current[skillName] ?? toDraft(items.find((item) => item.skillName === skillName)!)), ...patch },
|
||||
}));
|
||||
};
|
||||
|
||||
const saveItem = async (skillName: string) => {
|
||||
const draft = drafts[skillName];
|
||||
if (!draft) return;
|
||||
const priceYuan = Number(draft.priceYuan);
|
||||
const sortOrder = Number(draft.sortOrder);
|
||||
if (!Number.isFinite(priceYuan) || priceYuan < 0) {
|
||||
setError('价格必须是非负数');
|
||||
return;
|
||||
}
|
||||
if (!Number.isFinite(sortOrder)) {
|
||||
setError('排序必须是数字');
|
||||
return;
|
||||
}
|
||||
setBusySkill(skillName);
|
||||
setError(null);
|
||||
setMessage(null);
|
||||
try {
|
||||
const result = await updateAdminTemplateCatalogItem(skillName, {
|
||||
label: draft.label.trim(),
|
||||
description: draft.description.trim(),
|
||||
previewUrl: draft.previewUrl.trim() || null,
|
||||
priceCents: Math.round(priceYuan * 100),
|
||||
billingMode: draft.billingMode,
|
||||
status: draft.status,
|
||||
sortOrder: Math.floor(sortOrder),
|
||||
});
|
||||
setMessage(`已保存「${result.item?.label ?? skillName}」`);
|
||||
await load();
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : '保存失败');
|
||||
} finally {
|
||||
setBusySkill(null);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="admin-page">
|
||||
<div className="admin-page-head">
|
||||
<h2>页面模板商城</h2>
|
||||
<p className="muted">
|
||||
管理 Portal 聊天页「模板商城」中的可定价 page-template skill：改价、上下架、封面与排序。用户授权请在「用户管理 →
|
||||
用户详情」中操作。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{error && <p className="banner banner-error">{error}</p>}
|
||||
{message && <p className="banner banner-info">{message}</p>}
|
||||
|
||||
<section className="admin-card">
|
||||
{loading && items.length === 0 ? (
|
||||
<p className="muted">加载中…</p>
|
||||
) : sortedItems.length === 0 ? (
|
||||
<p className="muted">暂无模板条目。请确认 Memind 已 seed page-template-* skill。</p>
|
||||
) : (
|
||||
<div className="admin-table-wrap">
|
||||
<table className="admin-table template-catalog-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>封面</th>
|
||||
<th>Skill / 名称</th>
|
||||
<th>描述</th>
|
||||
<th>价格（元）</th>
|
||||
<th>计费</th>
|
||||
<th>状态</th>
|
||||
<th>排序</th>
|
||||
<th>预览 URL</th>
|
||||
<th />
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{sortedItems.map((item) => {
|
||||
const draft = drafts[item.skillName] ?? toDraft(item);
|
||||
const previewSrc = resolvePreviewSrc(draft.previewUrl || item.previewUrl);
|
||||
const livePreviewUrl = `${portalPreviewBase}/api/mindspace/v1/template-catalog/${encodeURIComponent(item.skillName)}/preview`;
|
||||
return (
|
||||
<tr key={item.skillName}>
|
||||
<td>
|
||||
{previewSrc ? (
|
||||
<img src={previewSrc} alt="" className="template-catalog-thumb" loading="lazy" />
|
||||
) : (
|
||||
<div className="template-catalog-thumb template-catalog-thumb-fallback" aria-hidden="true" />
|
||||
)}
|
||||
</td>
|
||||
<td>
|
||||
<div className="mono">{item.skillName}</div>
|
||||
<input
|
||||
className="admin-inline-input"
|
||||
value={draft.label}
|
||||
onChange={(event) => updateDraft(item.skillName, { label: event.target.value })}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
<textarea
|
||||
className="admin-inline-textarea"
|
||||
rows={3}
|
||||
value={draft.description}
|
||||
onChange={(event) => updateDraft(item.skillName, { description: event.target.value })}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
<input
|
||||
className="admin-inline-input admin-inline-input-narrow"
|
||||
inputMode="decimal"
|
||||
value={draft.priceYuan}
|
||||
onChange={(event) => updateDraft(item.skillName, { priceYuan: event.target.value })}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
<select
|
||||
className="admin-inline-input"
|
||||
value={draft.billingMode}
|
||||
onChange={(event) =>
|
||||
updateDraft(item.skillName, {
|
||||
billingMode: event.target.value as AdminTemplateCatalogItem['billingMode'],
|
||||
})
|
||||
}
|
||||
>
|
||||
{Object.entries(BILLING_LABELS).map(([value, label]) => (
|
||||
<option key={value} value={value}>
|
||||
{label}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<select
|
||||
className="admin-inline-input"
|
||||
value={draft.status}
|
||||
onChange={(event) =>
|
||||
updateDraft(item.skillName, {
|
||||
status: event.target.value as AdminTemplateCatalogItem['status'],
|
||||
})
|
||||
}
|
||||
>
|
||||
{Object.entries(STATUS_LABELS).map(([value, label]) => (
|
||||
<option key={value} value={value}>
|
||||
{label}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<input
|
||||
className="admin-inline-input admin-inline-input-narrow"
|
||||
inputMode="numeric"
|
||||
value={draft.sortOrder}
|
||||
onChange={(event) => updateDraft(item.skillName, { sortOrder: event.target.value })}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
<input
|
||||
className="admin-inline-input"
|
||||
placeholder="/assets/template-previews/..."
|
||||
value={draft.previewUrl}
|
||||
onChange={(event) => updateDraft(item.skillName, { previewUrl: event.target.value })}
|
||||
/>
|
||||
<a href={livePreviewUrl} target="_blank" rel="noreferrer" className="admin-inline-link">
|
||||
在线预览
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<button
|
||||
type="button"
|
||||
className="send-btn"
|
||||
disabled={busySkill === item.skillName}
|
||||
onClick={() => void saveItem(item.skillName)}
|
||||
>
|
||||
{busySkill === item.skillName ? '保存中…' : '保存'}
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Link, Navigate, useParams } from 'react-router-dom';
|
||||
import { getAdminUser, rechargeUser, updateAdminUser, fetchUserImageQuota, setUserImageQuota } from '../../api/client';
|
||||
import { getAdminUser, rechargeUser, updateAdminUser, fetchUserImageQuota, setUserImageQuota, fetchAdminTemplateCatalog, grantUserPageTemplate } from '../../api/client';
|
||||
import { CapabilitySettings } from '../../components/CapabilitySettings';
|
||||
import { PolicySettings } from '../../components/PolicySettings';
|
||||
import { SkillSettings } from '../../components/SkillSettings';
|
||||
import { useAdminUsers } from '../hooks/useAdminUsers';
|
||||
import { formatYuan } from '../utils/format';
|
||||
import type { ImageQuotaView, PortalUser } from '../../types';
|
||||
import type { AdminTemplateCatalogItem, ImageQuotaView, PortalUser } from '../../types';
|
||||
|
||||
function formatBytes(bytes: number) {
|
||||
if (bytes < 1024) return `${bytes} B`;
|
||||
@@ -27,6 +27,9 @@ export function UserDetailPage() {
|
||||
const [imageQuotaLoading, setImageQuotaLoading] = useState(false);
|
||||
const [imageRemaining, setImageRemaining] = useState('');
|
||||
const [imageGrantNote, setImageGrantNote] = useState('');
|
||||
const [templateCatalog, setTemplateCatalog] = useState<AdminTemplateCatalogItem[]>([]);
|
||||
const [templateCatalogLoading, setTemplateCatalogLoading] = useState(false);
|
||||
const [grantingTemplate, setGrantingTemplate] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!user?.spaceQuotaBytes) return;
|
||||
@@ -91,6 +94,28 @@ export function UserDetailPage() {
|
||||
setImageRemaining(String(imageQuota.remaining));
|
||||
}, [imageQuota?.remaining, imageQuota?.unlimited]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!user || user.role !== 'user') {
|
||||
setTemplateCatalog([]);
|
||||
return;
|
||||
}
|
||||
let cancelled = false;
|
||||
setTemplateCatalogLoading(true);
|
||||
void fetchAdminTemplateCatalog()
|
||||
.then((items) => {
|
||||
if (!cancelled) setTemplateCatalog(items);
|
||||
})
|
||||
.catch(() => {
|
||||
if (!cancelled) setTemplateCatalog([]);
|
||||
})
|
||||
.finally(() => {
|
||||
if (!cancelled) setTemplateCatalogLoading(false);
|
||||
});
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [user?.id, user?.role]);
|
||||
|
||||
const handleRecharge = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!user) return;
|
||||
@@ -148,6 +173,23 @@ export function UserDetailPage() {
|
||||
: `剩余 ${imageQuota.remaining ?? 0} / 总计 ${imageQuota.total ?? 0}（套餐 ${imageQuota.limit} + 充值 ${imageQuota.bonus}，已用 ${imageQuota.used}）`
|
||||
: '';
|
||||
|
||||
const handleTemplateGrant = async (skillName: string) => {
|
||||
if (!user) return;
|
||||
setMessage(null);
|
||||
setLocalError(null);
|
||||
setError(null);
|
||||
setGrantingTemplate(skillName);
|
||||
try {
|
||||
await grantUserPageTemplate(user.id, skillName);
|
||||
const label = templateCatalog.find((item) => item.skillName === skillName)?.label ?? skillName;
|
||||
setMessage(`已为用户开通「${label}」`);
|
||||
} catch (err) {
|
||||
setLocalError(err instanceof Error ? err.message : '模板授权失败');
|
||||
} finally {
|
||||
setGrantingTemplate(null);
|
||||
}
|
||||
};
|
||||
|
||||
if (!loading && !user && !error) {
|
||||
return <Navigate to="/users" replace />;
|
||||
}
|
||||
@@ -315,6 +357,39 @@ export function UserDetailPage() {
|
||||
<p className="muted">当前总额约 {currentQuotaMb} MB。</p>
|
||||
</section>
|
||||
|
||||
<section className="admin-card">
|
||||
<h2>页面模板授权</h2>
|
||||
<p className="muted">
|
||||
为用户免费开通可定价 page-template skill（写入购买记录并启用 skill）。完整目录与改价见
|
||||
{' '}
|
||||
<Link to="/template-catalog">页面模板</Link>。
|
||||
</p>
|
||||
{templateCatalogLoading ? (
|
||||
<p className="muted">加载模板目录…</p>
|
||||
) : templateCatalog.length === 0 ? (
|
||||
<p className="muted">暂无模板目录。</p>
|
||||
) : (
|
||||
<div className="template-grant-list">
|
||||
{templateCatalog.map((item) => (
|
||||
<div key={item.skillName} className="template-grant-row">
|
||||
<div>
|
||||
<strong>{item.label}</strong>
|
||||
<div className="muted mono">{item.skillName}</div>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
className="ghost-btn"
|
||||
disabled={grantingTemplate === item.skillName}
|
||||
onClick={() => void handleTemplateGrant(item.skillName)}
|
||||
>
|
||||
{grantingTemplate === item.skillName ? '开通中…' : '免费开通'}
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
|
||||
<CapabilitySettings users={users} userId={user.id} userOnly />
|
||||
<SkillSettings users={users} userId={user.id} userOnly />
|
||||
<PolicySettings users={users} userId={user.id} userOnly />
|
||||
|
||||
+73
-2
@@ -62,6 +62,8 @@ import type {
|
||||
WechatWebNotification,
|
||||
MindSearchConfig,
|
||||
MindSearchServiceTestResult,
|
||||
AdminTemplateCatalogItem,
|
||||
AdminTemplateCatalogPatch,
|
||||
} from '../types';
|
||||
import type {
|
||||
OrchestratorCanaryReadiness,
|
||||
@@ -511,9 +513,56 @@ export async function getUmamiSsoUrl(): Promise<string> {
|
||||
return result.url;
|
||||
}
|
||||
|
||||
export type SeoGeoAnalyticsQuery = {
|
||||
discoveryChannel: 'seo' | 'geo';
|
||||
startAt: number;
|
||||
endAt: number;
|
||||
timezone?: string;
|
||||
page?: number;
|
||||
pageSize?: number;
|
||||
sortBy?: string;
|
||||
sortOrder?: 'asc' | 'desc';
|
||||
generatedStartAt?: number;
|
||||
generatedEndAt?: number;
|
||||
};
|
||||
|
||||
export type SeoGeoAnalyticsPagesResult = {
|
||||
discoveryChannel: 'seo' | 'geo';
|
||||
data: Array<{
|
||||
urlPath: string;
|
||||
pageUrl?: string;
|
||||
hostname?: string;
|
||||
pageTitle: string;
|
||||
views: number;
|
||||
visitors: number;
|
||||
visits: number;
|
||||
clicks: number;
|
||||
engagedVisits: number;
|
||||
forms: number;
|
||||
generatedAt?: string | null;
|
||||
generatedAtInferred?: boolean;
|
||||
firstSeenAt?: string | null;
|
||||
}>;
|
||||
total: number;
|
||||
totalViews: number;
|
||||
page: number;
|
||||
pageSize: number;
|
||||
};
|
||||
|
||||
export async function getSeoGeoAnalyticsPages(
|
||||
query: SeoGeoAnalyticsQuery,
|
||||
): Promise<SeoGeoAnalyticsPagesResult> {
|
||||
const params = new URLSearchParams();
|
||||
Object.entries(query).forEach(([key, value]) => {
|
||||
if (value !== undefined && value !== null && value !== '') {
|
||||
params.set(key, String(value));
|
||||
}
|
||||
});
|
||||
return portalFetch(`/admin-api/analytics/seo-geo-pages?${params.toString()}`);
|
||||
}
|
||||
|
||||
export async function getRybbitSsoUrl(): Promise<string> {
|
||||
const result = await portalFetch<{ url: string }>('/admin-api/analytics/rybbit-sso');
|
||||
return result.url;
|
||||
throw new Error('Rybbit 已退役，请使用 SEO / GEO 流量看板或 Umami');
|
||||
}
|
||||
|
||||
export async function updateMindSpaceAdminConfig(
|
||||
@@ -1432,3 +1481,25 @@ export async function fetchImageQuotaLedger(params: {
|
||||
totalPages: number;
|
||||
}>(`/admin-api/image-quota/ledger${q.toString() ? `?${q}` : ''}`);
|
||||
}
|
||||
|
||||
export async function fetchAdminTemplateCatalog(): Promise<AdminTemplateCatalogItem[]> {
|
||||
const result = await portalFetch<{ items: AdminTemplateCatalogItem[] }>('/admin-api/template-catalog');
|
||||
return result.items ?? [];
|
||||
}
|
||||
|
||||
export async function updateAdminTemplateCatalogItem(
|
||||
skillName: string,
|
||||
patch: AdminTemplateCatalogPatch,
|
||||
): Promise<{ ok: boolean; item?: AdminTemplateCatalogItem }> {
|
||||
return portalFetch(`/admin-api/template-catalog/${encodeURIComponent(skillName)}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(patch),
|
||||
});
|
||||
}
|
||||
|
||||
export async function grantUserPageTemplate(userId: string, skillName: string) {
|
||||
return portalFetch<{ ok: boolean; skillName: string; grantedSkills?: string[] }>(
|
||||
`/admin-api/users/${encodeURIComponent(userId)}/template-grants/${encodeURIComponent(skillName)}`,
|
||||
{ method: 'POST' },
|
||||
);
|
||||
}
|
||||
|
||||
@@ -2740,3 +2740,60 @@ body,
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.template-catalog-table .admin-inline-input,
|
||||
.template-catalog-table .admin-inline-textarea,
|
||||
.template-catalog-table select {
|
||||
width: 100%;
|
||||
min-width: 108px;
|
||||
padding: 8px 10px;
|
||||
border-radius: var(--radius-md);
|
||||
border: 1px solid var(--color-border-input);
|
||||
background: var(--color-bg-base);
|
||||
color: var(--color-text-primary);
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
.template-catalog-table .admin-inline-input-narrow {
|
||||
min-width: 72px;
|
||||
max-width: 96px;
|
||||
}
|
||||
|
||||
.template-catalog-table .admin-inline-textarea {
|
||||
min-height: 72px;
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
.template-catalog-thumb {
|
||||
width: 96px;
|
||||
height: 54px;
|
||||
object-fit: cover;
|
||||
border-radius: var(--radius-md);
|
||||
border: 1px solid var(--color-border-input);
|
||||
display: block;
|
||||
}
|
||||
|
||||
.template-catalog-thumb-fallback {
|
||||
background: linear-gradient(135deg, #0a1628, #2f6f57);
|
||||
}
|
||||
|
||||
.admin-inline-link {
|
||||
display: inline-block;
|
||||
margin-top: 6px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.template-grant-list {
|
||||
display: grid;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.template-grant-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
padding: 10px 12px;
|
||||
border: 1px solid var(--color-border-input);
|
||||
border-radius: var(--radius-md);
|
||||
}
|
||||
|
||||
@@ -244,6 +244,7 @@ export type UsageRecord = {
|
||||
outputTokens: number;
|
||||
costCents: number;
|
||||
balanceAfterCents: number;
|
||||
billingSource: 'wallet' | 'subscription';
|
||||
createdAt: number;
|
||||
};
|
||||
|
||||
@@ -343,8 +344,25 @@ export type WechatIntentRouterRuntimeState = {
|
||||
config: WechatIntentRouterAdminConfig;
|
||||
};
|
||||
|
||||
export type MindSpaceSeoGeoConfig = {
|
||||
enabled: boolean;
|
||||
seo: {
|
||||
enabled: boolean;
|
||||
canonical: boolean;
|
||||
sitemap: boolean;
|
||||
robotsTxt: boolean;
|
||||
baiduPush: boolean;
|
||||
};
|
||||
geo: {
|
||||
enabled: boolean;
|
||||
jsonLd: boolean;
|
||||
llmsTxt: boolean;
|
||||
};
|
||||
};
|
||||
|
||||
export type MindSpaceAdminConfig = {
|
||||
publicPageLimit: number;
|
||||
seoGeo: MindSpaceSeoGeoConfig;
|
||||
analytics: {
|
||||
enabled: boolean;
|
||||
websiteId: string;
|
||||
@@ -774,3 +792,26 @@ export type MindSearchServiceTestResult = {
|
||||
resultCount?: number | null;
|
||||
message: string;
|
||||
};
|
||||
|
||||
export type AdminTemplateCatalogItem = {
|
||||
skillName: string;
|
||||
label: string;
|
||||
description: string;
|
||||
previewUrl: string | null;
|
||||
priceCents: number;
|
||||
currency: string;
|
||||
billingMode: 'free' | 'one_time' | 'subscription';
|
||||
status: 'draft' | 'active' | 'archived';
|
||||
sortOrder: number;
|
||||
chatSkillId: string;
|
||||
};
|
||||
|
||||
export type AdminTemplateCatalogPatch = {
|
||||
label?: string;
|
||||
description?: string;
|
||||
previewUrl?: string | null;
|
||||
priceCents?: number;
|
||||
billingMode?: AdminTemplateCatalogItem['billingMode'];
|
||||
status?: AdminTemplateCatalogItem['status'];
|
||||
sortOrder?: number;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user