diff --git a/.env.example b/.env.example index 1620837..42ba6fe 100644 --- a/.env.example +++ b/.env.example @@ -1,29 +1 @@ -# 管理员账号，首次启动会自动创建。 -ADMIN_USERNAME=admin -ADMIN_PASSWORD=infinite-canvas - -# JWT 登录密钥和过期时间，正式部署请修改 JWT_SECRET。 -JWT_SECRET=infinite-canvas -JWT_EXPIRE_HOURS=168 - -# 后端默认监听 8080，如需本地开发修改端口再取消注释。 -# Docker 镜像内前端固定监听 3000，避免覆盖前端 PORT。 -# PORT=8080 - -# 公开访问地址，用于把本地上传的 Seedance 参考图/视频暴露给火山方舟拉取。 -# 线上部署时填写站点根地址，例如：https://your-domain.example.com -# PUBLIC_BASE_URL=https://your-domain.example.com - -# 前端开发代理默认使用 http://127.0.0.1:8080，如后端开发端口不同，启动前端时可单独设置 API_BASE_URL。 -# API_BASE_URL=http://127.0.0.1:8080 NEXT_PUBLIC_DOC_URL=https://docs.canvas.best - -# 数据库配置，默认使用本地 SQLite。 -STORAGE_DRIVER=sqlite -# sqlite: DATABASE_DSN=data/infinite-canvas.db -# Docker 部署时建议使用绝对路径，避免工作目录变化后写入临时库：DATABASE_DSN=/app/data/infinite-canvas.db -# mysql 目标库不存在时会尝试自动创建，账号需有 CREATE 权限。 -# mysql: DATABASE_DSN=user:password@tcp(127.0.0.1:3306)/infinite_canvas?parseTime=true -# postgres 目标库不存在时会尝试自动创建，账号需有 CREATEDB 权限。 -# postgres: DATABASE_DSN=postgres://user:password@127.0.0.1:5432/infinite_canvas?sslmode=disable -DATABASE_DSN=data/infinite-canvas.db diff --git a/Dockerfile b/Dockerfile index ccf710c..dce7bbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,38 +9,19 @@ COPY CHANGELOG.md /app/CHANGELOG.md COPY web ./ RUN bun run build -# 构建 Go 后端入口。 -FROM golang:1.25-alpine AS api-build - -WORKDIR /app -COPY go.mod go.sum ./ -COPY config ./config -COPY handler ./handler -COPY middleware ./middleware -COPY model ./model -COPY repository ./repository -COPY router ./router -COPY service ./service -COPY main.go ./ -RUN go build -o /server . - -# 运行镜像：Next.js 对外监听 3000，Go 只在容器内部监听 8080。 +# 运行镜像：只启动 Next.js，AI 请求由浏览器前台直连用户自己的接口。 FROM node:22-bookworm-slim WORKDIR /app COPY VERSION /app/VERSION COPY CHANGELOG.md /app/CHANGELOG.md -COPY --from=api-build /server /app/server COPY --from=web-build /app/web/public /app/web/public COPY --from=web-build /app/web/.next/standalone /app/web COPY --from=web-build /app/web/.next/static /app/web/.next/static ENV NODE_ENV=production ENV HOSTNAME=0.0.0.0 ENV PORT=3000 -ENV PROMPT_DATA_DIR=/app/data/prompts RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && rm -rf /var/lib/apt/lists/* -RUN mkdir -p /app/data/prompts EXPOSE 3000 -# 先启动内部 Go API，再由 Next.js 提供页面并代理 /api/*。 -CMD ["sh", "-c", "PORT=8080 /app/server & cd /app/web && PORT=3000 node server.js"] +CMD ["sh", "-c", "cd /app/web && PORT=3000 node server.js"] diff --git a/README.md b/README.md index a27868b..01edadf 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,8 @@ GitHub stars Version License - Docker ready + Vercel ready Next.js - Go

无限画布是一款面向图片创作的开源工作台。它把画布编排、AI 图片生成、参考图编辑、对话助手、提示词库和素材沉淀放在同一个界面里，适合用来探索视觉方案并连续迭代图片结果。 @@ -25,10 +24,10 @@ ## 核心功能 - 无限画布：多画布项目、节点拖拽缩放、连线、小地图、撤销重做、导入导出。 -- AI 创作：支持 OpenAI 兼容接口的文生图、图生图、参考图编辑、文本问答和视频生成；Seedance 2.0 可通过火山方舟 Agent Plan 接入。 +- AI 创作：浏览器前台直连你配置的 OpenAI 兼容接口，支持文生图、图生图、参考图编辑、文本问答、音频和视频生成；Seedance 2.0 可通过火山方舟 Agent Plan 接入。 - 画布助手：围绕选中节点和上游节点对话、生图，并把结果插回画布。 - 本地 Agent：通过本机 Canvas Agent 连接 Codex / Claude Code，让 Agent 通过 MCP 操作当前画布。 -- 提示词库：抓取多个 GitHub 开源项目，按案例整理数百个图片提示词。 +- 提示词库：Next.js route 抓取多个 GitHub 开源项目，并缓存在运行实例内存中。 完整功能说明见 [docs/features.md](docs2/features.md)。 @@ -37,31 +36,31 @@ ## 技术栈 - 前端：Next.js、React、TypeScript、Tailwind CSS、Ant Design、Zustand、TanStack Query。 -- 后端：Go、Gin、GORM。 -- 部署：Docker。 +- 少量 Next.js Route：第三方提示词内存缓存、WebDAV 可选代理。 +- 部署：Vercel 或 Docker。 ## 快速开始 -[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/basketikun/infinite-canvas) +推荐直接导入仓库到 Vercel，根目录已提供 `vercel.json`，会构建 `web/`。AI API Key、Base URL、画布、素材和生成记录默认保存在浏览器本地。 ```bash git clone git@github.com:basketikun/infinite-canvas.git cd infinite-canvas -cp .env.example .env -# 修改默认账号密码等信息 -docker-compose up -d +cd web +bun install +bun run dev ``` -本地源码构建运行： +Docker 运行： ```bash -cp .env.example .env -docker compose -f docker-compose.local.yml up -d --build +docker build -t infinite-canvas . +docker run --rm -p 3000:3000 infinite-canvas ``` 运行后默认端口3000，可访问 `http://localhost:3000`。 -如需要拉取提示词，可前往:`http://localhost:3000/admin/prompts` +首次打开后进入右上角配置，填入自己的 OpenAI 兼容 `Base URL` 和 `API Key`。 ## New API 自动配置 @@ -98,9 +97,6 @@ https://canvas.best?apiKey={key}&baseUrl={address} - [画布节点操作手册](docs2/canvas-node-manual.md) - [画布快捷键](docs2/canvas-shortcuts.md) - [待办事项](docs2/todo.md) -- [后端数据库说明](docs2/backend-database.md) -- [系统配置数据结构](docs2/system-settings.md) -- [接口响应约定](docs2/api-response.md) - [本地 Canvas Agent](canvas-agent/README.md) ## 赞助支持 diff --git a/config/config.go b/config/config.go deleted file mode 100644 index a4ed42c..0000000 --- a/config/config.go +++ /dev/null @@ -1,79 +0,0 @@ -package config - -import ( - "crypto/rand" - "encoding/base64" - "os" - "path/filepath" - "strings" - - "github.com/caarlos0/env/v11" - "github.com/joho/godotenv" -) - -type Config struct { - Port string `env:"PORT" envDefault:"8080"` - AdminUsername string `env:"ADMIN_USERNAME" envDefault:"admin"` - AdminPassword string `env:"ADMIN_PASSWORD" envDefault:"infinite-canvas"` - JWTSecret string `env:"JWT_SECRET" envDefault:"infinite-canvas"` - JWTExpireHours int `env:"JWT_EXPIRE_HOURS" envDefault:"168"` - StorageDriver string `env:"STORAGE_DRIVER" envDefault:"sqlite"` - DatabaseDSN string `env:"DATABASE_DSN" envDefault:"data/infinite-canvas.db"` - PublicBaseURL string `env:"PUBLIC_BASE_URL"` - LinuxDoAuthorizeURL string `env:"LINUX_DO_AUTHORIZE_URL" envDefault:"https://connect.linux.do/oauth2/authorize"` - LinuxDoTokenURL string `env:"LINUX_DO_TOKEN_URL" envDefault:"https://connect.linux.do/oauth2/token"` - LinuxDoUserInfoURL string `env:"LINUX_DO_USERINFO_URL" envDefault:"https://connect.linux.do/api/user"` -} - -var Cfg Config - -func Load() error { - _ = godotenv.Load() - if err := env.Parse(&Cfg); err != nil { - return err - } - normalizeDockerSQLiteDSN("/app/data") - if strings.TrimSpace(Cfg.JWTSecret) == "" || Cfg.JWTSecret == "infinite-canvas" { - secret, err := randomSecret() - if err != nil { - return err - } - Cfg.JWTSecret = secret - } - return nil -} - -func normalizeDockerSQLiteDSN(appDataDir string) { - driver := strings.ToLower(strings.TrimSpace(Cfg.StorageDriver)) - if driver != "" && driver != "sqlite" { - return - } - dsn := strings.TrimSpace(Cfg.DatabaseDSN) - if dsn == "" || dsn == ":memory:" || strings.HasPrefix(dsn, "file:") { - return - } - pathPart, suffix := dsn, "" - if index := strings.Index(dsn, "?"); index >= 0 { - pathPart = dsn[:index] - suffix = dsn[index:] - } - if filepath.IsAbs(pathPart) { - return - } - slashPath := filepath.ToSlash(pathPart) - if slashPath != "data" && !strings.HasPrefix(slashPath, "data/") { - return - } - if _, err := os.Stat(appDataDir); err != nil { - return - } - Cfg.DatabaseDSN = filepath.Join(filepath.Dir(appDataDir), filepath.FromSlash(slashPath)) + suffix -} - -func randomSecret() (string, error) { - buf := make([]byte, 32) - if _, err := rand.Read(buf); err != nil { - return "", err - } - return base64.RawURLEncoding.EncodeToString(buf), nil -} diff --git a/config/config_test.go b/config/config_test.go deleted file mode 100644 index 2f18680..0000000 --- a/config/config_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package config - -import ( - "os" - "path/filepath" - "testing" -) - -func TestNormalizeDockerSQLiteDSNUsesMountedDataDir(t *testing.T) { - root := t.TempDir() - appDataDir := filepath.Join(root, "data") - if err := os.MkdirAll(appDataDir, 0755); err != nil { - t.Fatal(err) - } - Cfg = Config{StorageDriver: "sqlite", DatabaseDSN: "data/infinite-canvas.db?_pragma=busy_timeout(5000)"} - - normalizeDockerSQLiteDSN(appDataDir) - - want := filepath.Join(root, "data", "infinite-canvas.db") + "?_pragma=busy_timeout(5000)" - if Cfg.DatabaseDSN != want { - t.Fatalf("DatabaseDSN = %q, want %q", Cfg.DatabaseDSN, want) - } -} - -func TestNormalizeDockerSQLiteDSNLeavesLocalPathWithoutMountedDataDir(t *testing.T) { - Cfg = Config{StorageDriver: "sqlite", DatabaseDSN: "data/infinite-canvas.db"} - - normalizeDockerSQLiteDSN(filepath.Join(t.TempDir(), "missing-data")) - - if Cfg.DatabaseDSN != "data/infinite-canvas.db" { - t.Fatalf("DatabaseDSN = %q, want relative local path", Cfg.DatabaseDSN) - } -} diff --git a/docker-compose.local.yml b/docker-compose.local.yml index 54f6bf4..e4fed62 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -4,10 +4,6 @@ services: build: context: . dockerfile: Dockerfile - env_file: - - .env - volumes: - - ./data:/app/data ports: - "3000:3000" restart: unless-stopped diff --git a/docker-compose.yml b/docker-compose.yml index bf21af8..d60dc6a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,6 @@ services: app: image: ghcr.io/basketikun/infinite-canvas:latest container_name: infinite-canvas - env_file: - - .env - volumes: - - ./data:/app/data ports: - "3000:3000" restart: unless-stopped diff --git a/docs/content/docs/backend/api-response.mdx b/docs/content/docs/backend/api-response.mdx deleted file mode 100644 index 30aeb0f..0000000 --- a/docs/content/docs/backend/api-response.mdx +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: 接口响应约定 -description: 业务接口统一响应结构与前端处理约定 ---- - -# 接口响应约定 - -后端业务接口统一返回 JSON： - -```json -{ - "code": 0, - "data": {}, - "msg": "ok" -} -``` - -- `code`: 业务状态码，`0` 表示成功，非 `0` 表示失败。 -- `data`: 业务数据。失败时通常为 `null`。 -- `msg`: 响应消息。成功默认为 `ok`，失败时放错误原因。 - -前端请求逻辑以 `code` 判断业务是否成功。当前后端业务失败也会返回 HTTP 200，前端不要只依赖 HTTP 状态码判断结果。 - -接口连接失败、服务不可达、返回体不是约定 JSON 时，前端按网络或接口异常处理。 diff --git a/docs/content/docs/backend/backend-database.mdx b/docs/content/docs/backend/backend-database.mdx deleted file mode 100644 index 3d27767..0000000 --- a/docs/content/docs/backend/backend-database.mdx +++ /dev/null @@ -1,200 +0,0 @@ ---- -title: 数据库说明 -description: 当前后端主要数据表与字段说明 ---- - -# 数据库说明 - -本文档只记录后端当前已经使用的主要数据表。 - -## 数据库 - -后端使用 GORM 管理数据库连接和表结构迁移。 - -支持的存储驱动： - -- `sqlite` -- `mysql` -- `postgresql` - -当前启动时执行 `AutoMigrate`，自动维护以下表： - -- `users` -- `credit_logs` -- `prompts` -- `assets` -- `settings` - -后续新增表时再同步补充本文档，未实际使用的规划表不提前写入。 - -### users - -系统用户表。用户基础信息、角色、算力点余额和第三方登录标识放在该表中。 - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `id` | string | 主键 | -| `username` | string | 用户名，唯一索引 | -| `password` | string | 密码哈希 | -| `email` | string | 邮箱 | -| `display_name` | string | 昵称 | -| `avatar_url` | string | 头像地址 | -| `role` | string | 角色：`user`、`admin` | -| `credits` | number | 算力点余额 | -| `aff_code` | string | 用户自己的邀请码，唯一索引 | -| `aff_count` | number | 已邀请用户数量，冗余统计字段 | -| `inviter_id` | string | 邀请人用户 ID | -| `github_id` | string | GitHub 用户 ID | -| `linux_do_id` | string | Linux.do 用户 ID | -| `wechat_id` | string | 微信用户 ID | -| `status` | string | 用户状态：`active`、`ban` | -| `last_login_at` | string | 最近登录时间 | -| `extra` | json | 扩展信息，第三方资料按平台命名空间保存，如 `linuxDo` | -| `created_at` | string | 创建时间 | -| `updated_at` | string | 更新时间 | - -### prompts - -提示词表。用于保存公开提示词、内置 GitHub 系统提示词、分类和预览内容。 - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `id` | string | 主键 | -| `title` | string | 标题 | -| `cover_url` | string | 封面图 | -| `prompt` | string | 提示词内容 | -| `tags` | json | 标签列表 | -| `category` | string | 分类标识 | -| `preview` | text | Markdown 展示内容，可包含文本、图片、视频链接等 | -| `created_at` | string | 创建时间 | -| `updated_at` | string | 更新时间 | - -`github_url` 仅用于接口返回，不写入数据库。 - -### assets - -素材表。当前用于后台素材库。 - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `id` | string | 主键 | -| `title` | string | 标题 | -| `type` | string | 素材类型：`text`、`image`、`video` 等 | -| `cover_url` | string | 封面图 | -| `tags` | json | 标签列表 | -| `category` | string | 分类标识 | -| `description` | string | 描述 | -| `content` | text | 文本或 Markdown 内容 | -| `url` | string | 图片、视频等媒体地址 | -| `created_at` | string | 创建时间 | -| `updated_at` | string | 更新时间 | - -### settings - -系统配置表，只保存两行数据：`public` 放前端可读取的公开配置，`private` 放仅后端和管理员可读取的私有配置，配置值都用 JSON。 - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `key` | string | 主键：`public`、`private` | -| `value` | json | 配置内容 | -| `created_at` | string | 创建时间 | -| `updated_at` | string | 更新时间 | - -`public.value` 常放前端展示和可公开读取的配置，例如模型列表、登录开关等。 -`private.value` 常放渠道密钥、登录密钥、后台内部开关等。 - -当前系统设置接口会按后端结构体序列化和反序列化已知字段；数据库 JSON 中额外存在的旧字段会被忽略。 - -`public.value` 当前字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `modelChannel` | object | 模型渠道公开配置组 | -| `auth` | object | 公开登录配置 | - -`modelChannel` 当前字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `availableModels` | string[] | 系统可用模型列表 | -| `modelCosts` | object[] | 模型算力点配置 | -| `defaultModel` | string | 默认模型 | -| `defaultImageModel` | string | 默认图片模型 | -| `defaultVideoModel` | string | 默认视频模型 | -| `defaultTextModel` | string | 默认文本模型 | -| `systemPrompt` | string | 系统提示词 | -| `allowCustomChannel` | bool | 是否允许用户自定义渠道，默认允许，关闭后前端只提供走后端渠道的模式 | - -`modelCosts` 每项字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `model` | string | 模型名称 | -| `credits` | number | 每次后端模型接口调用前预扣的算力点，未配置默认不扣除 | - -`auth.linuxDo` 当前字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `enabled` | bool | 是否开启 Linux.do 登录 | - -`private.value` 当前字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `channels` | object[] | 模型渠道配置列表 | -| `promptSync` | object | GitHub 远程提示词定时同步配置 | -| `auth` | object | 私有登录配置 | - -`channels` 每项字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `protocol` | string | 协议，当前支持 `openai` | -| `name` | string | 渠道名称 | -| `baseUrl` | string | 渠道接口地址 | -| `apiKey` | string | 渠道密钥 | -| `models` | string[] | 渠道可用模型列表 | -| `weight` | number | 渠道权重，同一模型命中多个渠道时按权重随机 | -| `enabled` | bool | 是否启用 | -| `remark` | string | 备注 | - -`promptSync` 字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `enabled` | bool | 是否开启定时同步，默认开启 | -| `cron` | string | Cron 表达式，默认每 5 分钟 | - -`auth.linuxDo` 当前字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `clientId` | string | Linux.do OAuth App Client ID | -| `clientSecret` | string | Linux.do OAuth App Client Secret，后台返回时隐藏 | - -后端请求模型时，先按模型名筛选启用且包含该模型的渠道，再按 `weight` 加权随机选择一个渠道。 - -### credit_logs - -用户算力点变更流水表。当前记录后台手动调整、模型调用预扣和模型调用失败返还。 - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `id` | string | 主键 | -| `user_id` | string | 关联用户 ID | -| `type` | string | 类型：`admin_adjust`、`ai_consume`、`ai_refund` | -| `amount` | number | 本次变动数量，增加为正，扣减为负 | -| `balance` | number | 变动后的用户算力点余额 | -| `related_id` | string | 关联业务 ID，可为空 | -| `remark` | string | 备注 | -| `extra` | json | 扩展信息 | -| `created_at` | string | 创建时间 | - -`type` 当前取值： - -| 值 | 说明 | -| --- | --- | -| `admin_adjust` | 后台手动调整 | -| `ai_consume` | 调用后端模型接口消费 | -| `ai_refund` | 后端模型接口调用失败返还 | diff --git a/docs/content/docs/backend/local-development.mdx b/docs/content/docs/backend/local-development.mdx index 8080566..062b2de 100644 --- a/docs/content/docs/backend/local-development.mdx +++ b/docs/content/docs/backend/local-development.mdx @@ -1,43 +1,17 @@ --- title: 本地开发 -description: 前后端分开启动时的本地开发方式 +description: 前端优先的本地开发方式 --- # 本地开发 -如果你需要改代码，建议前后端分开启动。 +当前主应用以 `web/` 前端为主，AI 请求由浏览器前台直连用户自己的 OpenAI 兼容接口。 -## 1. 准备环境变量 - -```bash -cp .env.example .env -``` - -默认配置下： - -- 后端端口是 `8080` -- 前端端口是 `3000` -- SQLite 数据库是 `data/infinite-canvas.db` - -## 2. 启动后端 - -在仓库根目录执行： - -```bash -go run . -``` - -后端会读取根目录 `.env`，并监听： - -```text -http://127.0.0.1:8080 -``` - -## 3. 启动前端 - -在 `web` 目录执行： +## 1. 启动前端 ```bash +cd web +bun install bun run dev ``` @@ -47,9 +21,11 @@ bun run dev http://localhost:3000 ``` -开发代理默认转发到 `http://127.0.0.1:8080`。如果你的后端端口不同，启动前设置 `API_BASE_URL`。 +## 2. 配置模型 -## 4. 启动文档站 +打开右上角配置弹窗，填写自己的 `Base URL`、`API Key` 和模型名。第三方提示词由 Next.js route 拉取并缓存在运行实例内存中；WebDAV 可选择前端直连或 Next.js 转发。 + +## 3. 启动文档站 如果需要单独调整文档站，在 `docs` 目录执行： @@ -60,5 +36,5 @@ bun run dev ## 常见场景 - 改画布、页面和交互：主要看 `web/` -- 改接口、业务逻辑和数据库：主要看仓库根目录下的 Go 代码 +- 改提示词缓存或 WebDAV 代理：主要看 `web/src/app/api/` 和 `web/src/app/webdav-proxy/` - 改文档站内容：主要看 `docs/content/docs/` diff --git a/docs/content/docs/backend/meta.json b/docs/content/docs/backend/meta.json index 394acff..fbee76a 100644 --- a/docs/content/docs/backend/meta.json +++ b/docs/content/docs/backend/meta.json @@ -4,9 +4,6 @@ "defaultOpen": true, "pages": [ "local-development", - "api-response", - "system-settings", - "backend-database", "canvas-data-structure" ] } diff --git a/docs/content/docs/backend/system-settings.mdx b/docs/content/docs/backend/system-settings.mdx deleted file mode 100644 index c2a01ce..0000000 --- a/docs/content/docs/backend/system-settings.mdx +++ /dev/null @@ -1,127 +0,0 @@ ---- -title: 系统配置数据结构 -description: settings 表中 public 和 private 配置结构说明 ---- - -# 系统配置数据结构 - -系统配置保存在 `settings` 表中，目前只使用两行： - -| key | 说明 | -| --- | --- | -| `public` | 公开配置，前端可以读取 | -| `private` | 私有配置，只给后端和管理员使用 | - -## public.value - -```json -{ - "modelChannel": { - "availableModels": ["gpt-5.5", "gpt-image-2"], - "modelCosts": [ - { "model": "gpt-5.5", "credits": 1 }, - { "model": "gpt-image-2", "credits": 10 } - ], - "defaultModel": "gpt-image-2", - "defaultImageModel": "gpt-image-2", - "defaultTextModel": "gpt-5.5", - "systemPrompt": "", - "allowCustomChannel": true - }, - "auth": { - "allowRegister": true, - "linuxDo": { - "enabled": false - } - } -} -``` - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `modelChannel` | object | 模型渠道公开配置组 | -| `auth` | object | 认证相关公开配置 | - -`modelChannel` 字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `availableModels` | string[] | 系统可用模型；保存设置时会自动合并所有已启用私有渠道的模型 | -| `modelCosts` | object[] | 模型算力点配置，后端模型接口调用前按模型预扣，上游失败时返还；未配置默认不扣除 | -| `defaultModel` | string | 默认模型，从 `availableModels` 中选择；为空或失效时优先选择文本模型 | -| `defaultImageModel` | string | 默认图片模型，从 `availableModels` 中选择；为空或失效时优先选择 `seedream`、`image`、`gpt-image` 模型 | -| `defaultVideoModel` | string | 默认视频模型，从 `availableModels` 中选择；为空或失效时优先选择 `seedance`、`video` 模型 | -| `defaultTextModel` | string | 默认文本模型，从 `availableModels` 中选择；为空或失效时优先选择非图片/视频模型 | -| `systemPrompt` | string | 系统提示词 | -| `allowCustomChannel` | boolean | 是否允许用户在配置弹窗中切换为本地直连渠道，默认允许 | - -`modelCosts` 每项字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `model` | string | 模型名称 | -| `credits` | number | 每次后端模型接口调用前预扣的算力点 | - -用户侧请求模式： - -| 模式 | 说明 | -| --- | --- | -| 云端渠道 | 使用后端 `/api/v1/*` 代理接口，请求会按模型名匹配 `private.value.channels` 中的可用渠道 | -| 本地直连 | 默认可选；`allowCustomChannel` 关闭后不可选，用户在浏览器本地配置 `baseUrl`、`apiKey` 和模型列表后直接请求模型接口 | - -`auth` 字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `allowRegister` | boolean | 是否允许用户注册，默认允许；关闭后注册入口隐藏，注册接口拒绝新用户创建 | -| `linuxDo.enabled` | boolean | 是否开启 Linux.do 登录 | - -## private.value - -```json -{ - "channels": [ - { - "protocol": "openai", - "name": "默认渠道", - "baseUrl": "https://api.example.com", - "apiKey": "sk-xxx", - "models": ["gpt-5.5", "gpt-image-2"], - "weight": 1, - "enabled": true, - "remark": "" - } - ], - "promptSync": { - "enabled": true, - "cron": "*/5 * * * *" - } -} -``` - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `channels` | object[] | 模型渠道列表 | -| `promptSync` | object | GitHub 远程提示词定时同步配置 | - -`channels` 每项字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `protocol` | string | 协议，当前为 `openai` | -| `name` | string | 渠道名称 | -| `baseUrl` | string | OpenAI 兼容接口地址 | -| `apiKey` | string | 渠道密钥 | -| `models` | string[] | 该渠道可用模型 | -| `weight` | number | 渠道权重；同一模型有多个可用渠道时按权重随机 | -| `enabled` | boolean | 是否启用 | -| `remark` | string | 备注 | - -后端调用模型时，会从已启用、已配置 `baseUrl` 和 `apiKey`、且 `models` 包含目标模型的渠道中选择一个。 - -`promptSync` 字段： - -| 字段 | 类型 | 说明 | -| --- | --- | --- | -| `enabled` | boolean | 是否开启定时同步，默认开启 | -| `cron` | string | Cron 表达式，默认每 5 分钟 | diff --git a/docs/content/docs/canvas/canvas-node-manual.mdx b/docs/content/docs/canvas/canvas-node-manual.mdx index 4e73abf..fa09a60 100644 --- a/docs/content/docs/canvas/canvas-node-manual.mdx +++ b/docs/content/docs/canvas/canvas-node-manual.mdx @@ -53,8 +53,8 @@ description: 当前画布节点的主要用途与操作流程 - 生成配置节点的视频模式会读取上游文本作为 prompt，读取上游图片作为参考图，读取上游视频作为参考视频，并在输入预览里显示参考视频。 - 视频生成接口支持 OpenAI 风格的 `POST /v1/videos`、`GET /v1/videos/{id}` 和 `GET /v1/videos/{id}/content`。 - 使用火山方舟 Agent Plan / Seedance 2.0 时，Base URL 配置为 `https://ark.cn-beijing.volces.com/api/plan/v3`，模型名使用 Seedance 2.0 对应模型；系统会改用 `POST /contents/generations/tasks` 创建异步任务，并轮询 `GET /contents/generations/tasks/{id}`。 -- Agent Plan 专属 `/api/plan/v3` 当前未提供 OpenAI `/models` 模型列表接口，后台不会伪造模型列表；请手动填写 `doubao-seedance-2.0` 或文档列出的其他可用模型。 -- Seedance 参考视频必须是公网可访问 URL，或由本项目后端在配置 `PUBLIC_BASE_URL` 后上传并暴露的参考素材 URL。本地/内网地址无法被火山服务器拉取。 +- Agent Plan 专属 `/api/plan/v3` 当前未提供 OpenAI `/models` 模型列表接口，配置弹窗不会伪造模型列表；请手动填写 `doubao-seedance-2.0` 或文档列出的其他可用模型。 +- Seedance 参考视频更建议使用公网可访问 URL；本地素材由前端读取后传给兼容接口，是否可用取决于具体上游。 ### 推荐流程 diff --git a/docs/content/docs/overview/docker.mdx b/docs/content/docs/overview/docker.mdx index 2ed4076..6e53fc9 100644 --- a/docs/content/docs/overview/docker.mdx +++ b/docs/content/docs/overview/docker.mdx @@ -12,7 +12,6 @@ description: 使用 Docker Compose 部署无限画布 ```bash git clone git@github.com:basketikun/infinite-canvas.git cd infinite-canvas -cp .env.example .env docker compose up -d ``` @@ -22,19 +21,11 @@ docker compose up -d http://localhost:3000 ``` -默认管理员账号： - -```text -用户名：admin -密码：.env 中的 ADMIN_PASSWORD -``` - ## 本地构建镜像 如果需要基于当前源码构建镜像： ```bash -cp .env.example .env docker compose -f docker-compose.local.yml up -d --build ``` @@ -56,14 +47,6 @@ cd docs docker compose -f docker-compose.local.yml up -d --build ``` -## 数据目录 +## 数据说明 -`docker-compose.yml` 会把本地 `./data` 挂载到容器内 `/app/data`，用于保存 SQLite 数据库、提示词数据和上传素材。 - -Docker 部署时建议把 `.env` 中的 SQLite 路径设置为： - -```text -DATABASE_DSN=/app/data/infinite-canvas.db -``` - -如果需要让火山方舟拉取本地上传的 Seedance 参考素材，还需要把 `PUBLIC_BASE_URL` 设置为公网可访问的站点地址。 +当前主应用镜像只启动 Next.js。画布、我的素材、生成记录和 AI API Key 默认保存在浏览器本地；第三方提示词由 Next.js route 拉取后缓存在运行实例内存里，不需要额外挂载数据目录。 diff --git a/docs/content/docs/overview/features.mdx b/docs/content/docs/overview/features.mdx index cf876db..f7fda01 100644 --- a/docs/content/docs/overview/features.mdx +++ b/docs/content/docs/overview/features.mdx @@ -57,10 +57,7 @@ description: 当前项目已实现的主要功能 ## AI 生成 -项目支持两种 AI 调用方式： - -- 本地直连：前端使用本地配置的 Base URL、API Key 和 Model 直接请求 OpenAI 兼容接口。 -- 后台渠道：前端请求本项目后端 `/api/v1/*` 代理接口，后端按模型选择管理后台配置的渠道。 +项目默认使用前台直连：前端使用浏览器本地配置的 Base URL、API Key 和 Model 直接请求 OpenAI 兼容接口，不再通过项目服务端转发 AI 请求。 OpenAI 兼容图像和文本能力继续复用现有接口： @@ -76,7 +73,7 @@ OpenAI 兼容图像和文本能力继续复用现有接口： Base URL 如果已经以 `/v1`、`/api/v3` 或 `/api/plan/v3` 结尾，系统不会再追加 `/v1`。因此 cpa 反代或火山方舟 Agent Plan 可以继续通过现有 Base URL + API Key + Model 方式配置，不需要新增火山生图 Provider。 -后台“拉取模型列表”会尝试真实请求 OpenAI `/models`，不会为 Agent Plan 伪造模型结果。如果火山方舟 Agent Plan 返回 404，请手动增加 `doubao-seedance-2.0` 或文档列出的其他模型名。 +配置弹窗里的“拉取模型列表”会尝试真实请求 OpenAI `/models`，不会为 Agent Plan 伪造模型结果。如果火山方舟 Agent Plan 返回 404，请手动增加 `doubao-seedance-2.0` 或文档列出的其他模型名。 可配置项： @@ -91,7 +88,7 @@ Base URL 如果已经以 `/v1`、`/api/v3` 或 `/api/plan/v3` 结尾，系统不 普通图片/文本节点可以直接输入提示词生成结果。生成配置节点可以读取上游节点内容，并按节点自己的配置批量生成多个图片或文本结果。生成配置节点支持预览当前提示词和参考图输入，并调整输入顺序。 -视频生成可从文本节点读取 prompt，从图片节点读取参考图，从视频节点读取参考视频，从音频节点读取参考音频。Seedance 2.0 支持最多 9 张参考图、3 个参考视频、3 个参考音频；分辨率支持 `480p`、`720p`、`1080p`（fast 模型不支持 `1080p`），比例支持 `16:9`、`4:3`、`1:1`、`3:4`、`9:16`、`21:9`、`adaptive`，时长支持 4-15 秒或智能时长。生成成功后会把视频插入画布为视频节点并使用原生播放器预览。Seedance 参考视频和参考音频需要公网可访问 URL；本地上传素材会先通过 `/api/v1/media/references` 保存到服务端，再由 `PUBLIC_BASE_URL` 生成可供火山服务器拉取的公开链接。 +视频生成可从文本节点读取 prompt，从图片节点读取参考图，从视频节点读取参考视频，从音频节点读取参考音频。Seedance 2.0 支持最多 9 张参考图、3 个参考视频、3 个参考音频；分辨率支持 `480p`、`720p`、`1080p`（fast 模型不支持 `1080p`），比例支持 `16:9`、`4:3`、`1:1`、`3:4`、`9:16`、`21:9`、`adaptive`，时长支持 4-15 秒或智能时长。生成成功后会把视频插入画布为视频节点并使用原生播放器预览。参考视频和参考音频优先使用公网可访问 URL；本地素材会以前端可读取的数据传给兼容接口，是否支持取决于具体上游。 ## 画布助手 @@ -121,15 +118,14 @@ Base URL 如果已经以 `/v1`、`/api/v3` 或 `/api/plan/v3` 结尾，系统不 - 复制提示词。 - 把提示词加入“我的素材”。 -后台提示词管理支持： +提示词管理支持： - 查询提示词。 -- 新增、编辑、删除提示词。 - 按分组和标签筛选。 - 查看远程提示词源。 -- 同步内置远程提示词源。 +- 触发读取内置远程提示词源。 -当前内置远程源包括多个 GPT Image / GPT-4o / Nano Banana Pro 相关提示词仓库。 +当前内置远程源包括多个 GPT Image / GPT-4o / Nano Banana Pro 相关提示词仓库，由 Next.js route 拉取并缓存在当前运行实例内存中。 ## 素材 @@ -143,49 +139,22 @@ Base URL 如果已经以 `/v1`、`/api/v3` 或 `/api/plan/v3` 结尾，系统不 - 分页浏览。 - 复制文本素材。 - 下载图片素材。 -- 从提示词库、画布节点和服务器素材库加入素材。 +- 从提示词库和画布节点加入素材。 - 在画布中插入素材。 -“素材库”是服务器素材库，支持： - -- 按标题搜索。 -- 按类型筛选。 -- 按标签筛选。 -- 查看素材详情。 -- 复制文本或图片链接。 -- 加入“我的素材”。 -- 在画布中插入素材。 - -后台素材库管理支持： - -- 查询素材。 -- 新增、编辑、删除素材。 -- 按类型和标签筛选。 +“素材库”入口目前保留为空的公共素材列表，主要数据仍建议放在“我的素材”中。 ## 账号和后台 -- 注册功能暂时关闭。 -- 仅允许管理员账号登录。 -- 支持 JWT 会话。 -- `/api/auth/me` 可读取当前用户，未登录时返回访客用户。 -- 首次启动时可根据环境变量创建默认管理员。 -- 管理员后台目前包含提示词管理和素材库管理。 -- 后端已有用户管理接口，但前端暂未实现用户管理页面。 - -## 后端能力 - -- Gin 提供 API 服务。 -- Docker 运行时由 Next.js 提供页面入口，`/api/*` 请求代理到内部 Go 服务。 -- GORM 管理数据库连接和自动迁移。 -- 支持 SQLite、MySQL、PostgreSQL。 -- 数据库保存用户、提示词分组、提示词和服务器素材。 -- 业务接口统一返回 `{ code, data, msg }`。 +- 当前版本不需要账号登录，登录页仅提示本地模式和配置入口。 +- `/admin/settings` 只保留前台配置、提示词缓存和本地数据说明。 +- 第三方提示词和 WebDAV 可使用少量 Next.js route，AI 接口不经过项目后端代理。 ## 当前限制 - 画布项目和“我的素材”目前只保存在浏览器本地，不会随账号同步。 -- 本地直连模式下，AI API Key 保存在浏览器本地，并由浏览器直接请求配置的 OpenAI 兼容接口；只适合本地或个人使用，公网多人使用不安全。公网部署推荐使用后台渠道，把真实密钥保存在服务端配置中。 -- 服务器素材库目前主要保存 URL 或文本，暂未提供文件上传接口。 -- Seedance 本地参考图/视频上传依赖 `PUBLIC_BASE_URL`，如果服务部署在 localhost、内网或不可被火山访问的地址，火山无法拉取参考素材。 +- AI API Key 保存在浏览器本地，并由浏览器直接请求配置的 OpenAI 兼容接口；只适合个人或可信环境使用。 +- 公共素材库暂未接入持久化后端。 +- Seedance 本地参考视频/音频更建议使用公网可访问 URL；上游是否接受前端传入的本地数据取决于具体兼容接口。 - Seedance 返回远程视频 URL 时，前端会尽量下载为本地 Blob 持久化；如果因 CORS 或网络限制无法下载，会保留远程 URL，后续是否可播放取决于上游 URL 的有效期。 - 画布更适合桌面端使用，移动端触控体验还未系统完善。 diff --git a/docs/content/docs/overview/quick-start.mdx b/docs/content/docs/overview/quick-start.mdx index 07b0410..9359331 100644 --- a/docs/content/docs/overview/quick-start.mdx +++ b/docs/content/docs/overview/quick-start.mdx @@ -5,15 +5,20 @@ description: 用最少步骤把无限画布跑起来 # 快速开始 -如果你只是想先把项目跑起来，优先使用 Docker。 +如果你只是想先把项目跑起来，优先部署或启动 `web/` 前端。 -## Docker 启动 +## Vercel 部署 + +在 Vercel 中导入仓库即可，根目录 `vercel.json` 会构建 `web/`。当前版本的 AI 请求由浏览器前台直连用户自己的 OpenAI 兼容地址，不需要额外配置服务端。 + +## 本地启动 ```bash git clone git@github.com:basketikun/infinite-canvas.git cd infinite-canvas -cp .env.example .env -docker compose up -d +cd web +bun install +bun run dev ``` 启动后访问： @@ -22,29 +27,22 @@ docker compose up -d http://localhost:3000 ``` -默认管理员账号： +## Docker 启动 -```text -用户名：admin -密码：.env 中的 ADMIN_PASSWORD -``` - -## 本地构建镜像启动 - -如果你需要基于当前源码本地构建镜像： +如果你需要基于当前源码构建镜像： ```bash -cp .env.example .env -docker compose -f docker-compose.local.yml up -d --build +docker build -t infinite-canvas . +docker run --rm -p 3000:3000 infinite-canvas ``` ## 首次使用建议 - 先打开右上角配置弹窗，填入自己的 `Base URL`、`API Key` 和模型名。 -- 如果使用后台渠道模式，再去管理后台补充系统模型与渠道配置。 -- 如果需要提示词仓库内容，可进入 `/admin/prompts` 拉取或同步。 +- 如果需要提示词仓库内容，打开 `/prompts` 或 `/admin/prompts` 会通过 Next.js route 拉取并缓存在内存中。 +- 如果需要跨设备同步画布、素材和生成记录，可在配置弹窗中填写 WebDAV。 ## 说明 -- 当前画布项目和“我的素材”主要保存在浏览器本地，不支持云同步。 -- 本地直连模式下，AI API Key 保存在浏览器本地，并由前端直接请求 OpenAI 兼容接口。 +- 当前画布项目和“我的素材”主要保存在浏览器本地，WebDAV 同步需要用户自行配置。 +- AI API Key 保存在浏览器本地，并由前端直接请求 OpenAI 兼容接口。 diff --git a/docs/content/docs/overview/render.mdx b/docs/content/docs/overview/render.mdx index 603b66f..c7dabc9 100644 --- a/docs/content/docs/overview/render.mdx +++ b/docs/content/docs/overview/render.mdx @@ -13,7 +13,7 @@ description: 使用 Render 部署无限画布 1. 点击 `Deploy to Render`。 2. 登录 Render，并按页面提示连接 GitHub。 -3. 填写 `ADMIN_PASSWORD`，然后点击确认部署。 +3. 确认部署。 部署完成后，打开 Render 分配的 `.onrender.com` 域名即可访问。 @@ -22,17 +22,7 @@ description: 使用 Render 部署无限画布 默认使用 Render 免费 Web Service： - 空闲约 15 分钟后会休眠，下次访问会自动唤醒。 -- 免费版本地文件不是持久化存储，SQLite 数据可能在重启、重新部署后丢失。 +- 当前主应用数据默认保存在浏览器本地；第三方提示词缓存会随 Render 实例重启而清空，下次访问会重新拉取。 - 适合体验和演示，不适合长期保存正式数据。 -如果要长期使用，建议升级 Render 付费实例并挂载 Persistent Disk，或改用 PostgreSQL。 - -## 管理员账号 - -默认管理员用户名： - -```text -admin -``` - -管理员密码是在 Render 部署页面里填写的 `ADMIN_PASSWORD`。 +长期使用建议优先部署到 Vercel，或自行配置 WebDAV 同步浏览器本地数据。 diff --git a/docs/content/docs/progress/local-agent-integration-plan.mdx b/docs/content/docs/progress/local-agent-integration-plan.mdx index ac4c4e2..a5dc158 100644 --- a/docs/content/docs/progress/local-agent-integration-plan.mdx +++ b/docs/content/docs/progress/local-agent-integration-plan.mdx @@ -50,7 +50,7 @@ canvas-agent/ 原因： -- 这是用户本机运行的 Node 服务，不属于线上 Go 后端，也不属于纯前端页面。 +- 这是用户本机运行的 Node 服务，不属于线上服务端，也不属于纯前端页面。 - 后续可以发布成 npm 包，用户通过 `npx` 或全局安装启动。 - Codex SDK、Codex MCP、Claude SDK 都更适合在本地 Node 进程中接入。 - HTTP 路由使用 Express，MCP 协议层使用官方 `@modelcontextprotocol/sdk`，工具入参使用 `zod`，避免手写协议和松散 JSON。 diff --git a/docs/content/docs/progress/pending-test.mdx b/docs/content/docs/progress/pending-test.mdx index 931f18e..99ab037 100644 --- a/docs/content/docs/progress/pending-test.mdx +++ b/docs/content/docs/progress/pending-test.mdx @@ -5,6 +5,8 @@ description: 当前版本已实现但仍需人工验证的变更项 # 待测试 +- 前端已改为基本纯前端部署形态：删除 Next `/api/*` 到旧服务端的 catch-all 代理，并移除仓库内旧服务端源码和模块文件；Docker 运行镜像只启动 Next.js，不再构建或启动旧服务端；配置弹窗只保留前台直连 Base URL/API Key/模型列表和 WebDAV，登录页改为本地模式说明，顶部不再显示登录入口、算力点和后台账号菜单；AI 生图、编辑、文本问答、音频、视频接口都由浏览器直接请求用户配置的 OpenAI 兼容地址，第三方提示词改为 Next.js route 拉取 GitHub raw 并缓存在实例内存中，公共素材库暂为空列表；需要验证 Vercel 以 `web/` 为根部署后首页、配置导入参数、提示词库、画布 Agent、图片/音频/视频生成、WebDAV 直连和 Next.js 转发都不再依赖旧服务端。 +- Agent 对话里的用户消息正文改为左对齐显示，长段中文提示词、编号列表和多段文本仍保持消息整体靠右但内容按正常阅读方向换行；需要验证本机 Agent 和网站 Agent 对话中长提示词不再出现排版散乱。 - 画布右上角只保留一个 `Agent` 入口，公共顶部固定为 Agent 标题、“网站 / 本机”切换、工具确认和统一收起按钮，切换时只替换面板内部 tab 区且不改变面板宽度：网站 Agent 使用当前文本模型生成画布 ops，不依赖本地 Codex/Claude Code 或 Canvas Agent；本机 Agent 继续连接本地 Codex。两侧对话复用同一套消息、`working...`、工具卡、二级 tab 和底部输入框 UI；网站 Agent 去掉对话/生图/操作模式切换，内部 tab 改为“连接配置 / 对话 / 历史”，对话里去掉重试和插入画布按钮，历史列表改为与本机模式一致的卡片风格，请求时发送压缩后的当前画布节点、连线、选区和视口，模型返回 JSON 后复用现有画布操作协议新增、更新、删除、连接节点、调整视口、选择节点或触发生成，生图需求应通过创建提示词节点、生成配置节点并触发画布生成工具完成；需要验证单入口打开/关闭、网站/本机切换、模型配置缺失提示、网站 Agent 流式回复、工具卡展示、在线操作结果落到画布、图片生成能走画布节点工具、历史记录恢复和错误提示。 - Agent 执行画布操作时会忽略空 ops、无 type 操作和缺少必要字段的选择/连线/视口/生成操作，避免在线模型返回不完整 JSON 时触发 `filter` 读取错误；需要验证网站 Agent 重新整理画布布局时不会再因异常 ops 崩溃。 - 网站 Agent 的工具确认开关已接入画布操作执行：开启时模型返回 ops 后先显示确认工具调用卡片，批准后才执行，拒绝会取消；执行后会按画布前后状态判断是否真的生效，未生效时会区分没有连线可删、连线已存在、目标节点不存在、选区/视图已是目标状态等原因并写入日志；删除生成配置节点支持用 `nodeType:"config"` 删除全部配置节点，模型未写对删除目标但用户意图明确时会按当前画布 config 节点补齐删除 ids，需要验证开启确认时删除配置节点必须先确认且实际删除。 @@ -23,24 +25,24 @@ description: 当前版本已实现但仍需人工验证的变更项 - 图片节点悬浮工具栏新增“复制提示词”、“放大”和“超分”入口，并在末尾增加 `...` 更多按钮；点击“复制提示词”会复制生成该图片的提示词，图片没有提示词时会提示暂无可复制内容；点击 `...` 后打开 Ant Design 风格的“自定义工具栏”弹窗，可在图片节点占位上预览悬浮工具栏，信息、删除、存素材、下载、编辑和图片工具都在同一个快捷工具列表中勾选配置，并可切换是否显示按钮文字，保存后写入本地配置；`...` 配置入口固定显示，预览工具栏下方提供常驻横向滚动控制条。“放大”可在弹窗中选择 1K/2K/4K 目标像素和高清插值、双线性、最近邻算法，按原图比例生成新图片节点，已达到的目标像素会禁用并提示无需放大，最高不超过 4K；“超分”当前只打开暂未实现弹窗。 - Canvas 资源节点会按当前生成上下文显示 `图片1`、`视频1`、`音频1`、`文本1` 角标；文本节点内容框和节点底部 prompt 面板输入 `@` 时应弹出已连接资源选择器，点击缩略图或文字可插入纯文本编号，并以蓝色 token 视觉高亮。 - 文本节点连接到生成配置节点时，`@` 候选和实际生成输入应读取该生成配置节点的上游参考资源；生成配置输入统计区域应可拖动整个配置节点，预览按钮和设置控件仍保持可点击。 -- 配置弹窗改为“配置与用户偏好”并放大为可滚动弹窗；本地直连支持配置生图、视频、文本、音频四类可选模型列表和默认模型，新建画布生图和配置节点会读取“画布默认生图张数”，需要验证远程渠道和本地直连模型列表都能正确显示。 -- 画布音频节点底部生成面板改为音频提示词、音频模型下拉和 OpenAI Speech 参数设置，支持 `voice`、`response_format`、`speed`、`instructions` 并通过 `/audio/speech` 生成音频节点；需要验证本地直连和云端渠道的生成、重试、下载和刷新恢复。 +- 配置弹窗改为“配置与用户偏好”并放大为可滚动弹窗；前台直连支持配置生图、视频、文本、音频四类可选模型列表和默认模型，新建画布生图和配置节点会读取“画布默认生图张数”，需要验证模型列表拉取、手动模型配置和默认模型都能正确显示。 +- 画布音频节点底部生成面板改为音频提示词、音频模型下拉和 OpenAI Speech 参数设置，支持 `voice`、`response_format`、`speed`、`instructions` 并通过 `/audio/speech` 生成音频节点；需要验证前台直连生成、重试、下载和刷新恢复。 - 画布左上角菜单和右上角状态栏新增“文档”入口，会使用 `NEXT_PUBLIC_DOC_URL` 配置的地址并在新标签打开文档站；需要验证登录和未登录状态下顶部入口都可见。 - 文档站搜索改为中英文混合 tokenizer，中文正文、标题和短语会按中文词、单字、二元和三元片段建立索引；需要验证 `/api/search` 和搜索弹窗能命中文档中的中文关键词。 - 文档站改为 Next.js standalone server 输出，新增 `docs/Dockerfile`、`docs/docker-compose.yml` 和 `docs/docker-compose.local.yml` 独立运行入口；需要验证文档页、搜索接口和 LLM 文本接口在文档站容器中可访问。 - 画布连线支持右键打开删除菜单；拖拽连线到目标卡片内部、连接点附近或卡片边缘外扩范围内会自动吸附并连接，拖到已有但不可连接的节点附近不会再误弹创建节点菜单。 -- 外部软件可通过 URL 查询参数 `baseUrl`/`baseurl` 和 `apiKey`/`apikey` 跳转到前端；读取后会从地址栏移除这些参数，后台允许自定义渠道时会自动切到自定义渠道、填入配置并打开配置弹窗，未允许时会打开配置弹窗并提示无法导入。 +- 外部软件可通过 URL 查询参数 `baseUrl`/`baseurl` 和 `apiKey`/`apikey` 跳转到前端；读取后会从地址栏移除这些参数，直接写入浏览器本地直连配置并打开配置弹窗。 - 生图工作台和画布生图会把参考图按当前顺序显示为 `图片1`、`图片2` 等编号，并在图生图请求的实际提示词中注入编号说明；需要验证 `/image` 参考图排序、画布配置节点输入顺序和画布助手参考图编号一致。 - GPT Image 生图请求会在前端把 `9:16`、`16:9` 等比例转换成合法 `WIDTHxHEIGHT` 尺寸，并在非法尺寸时直接显示中文错误，避免上游返回 `invalid_value Invalid size`。 -- Docker 部署时，`DATABASE_DSN=data/infinite-canvas.db` 会在存在 `/app/data` 挂载目录时自动归一到 `/app/data/infinite-canvas.db`，需要验证后台模型配置不会再因为工作目录变为 `/app/web` 而读到空库。 -- Seedance 参考视频被火山判定包含真人或隐私信息时，前端错误摘要会提示改用不含真人的视频、官方允许的模型产物或已授权的 `asset://` 素材；参考素材上传目录改为跟随 SQLite 数据目录，并补充公开素材的 HEAD 访问。 -- Seedance 参考素材失败原因排查：后端会把火山上游错误摘要返回给前端；`/video` 和画布视频生成会按 `图片1/视频1/音频1` 自动编号参考素材，并在实际请求提示词中注入编号说明；参考视频会在请求前校验大小、时长、宽高、宽高比和像素总量。 +- Docker 部署改为只启动 Next.js，不再构建或运行旧 API；需要验证容器内首页、提示词 route 和 WebDAV 代理可用。 +- Seedance 参考视频被火山判定包含真人或隐私信息时，前端错误摘要会提示改用不含真人的视频、官方允许的模型产物或已授权的 `asset://` 素材。 +- Seedance 参考素材失败原因排查：`/video` 和画布视频生成会按 `图片1/视频1/音频1` 自动编号参考素材，并在实际请求提示词中注入编号说明；参考视频会在请求前校验大小、时长、宽高、宽高比和像素总量。 - 画布项目导出改为下载 `.zip` 压缩包，包内包含 `projects.json` 和当前画布引用到的本地图片、视频文件，避免只导出 JSON 时丢失媒体内容。 - 画布库支持多选后一键导出多个画布项目，导出的压缩包可一次恢复多个项目。 - 画布项目导入改为读取新版 `.zip` 压缩包，会先按 `projects.json` 中的文件映射恢复图片、视频到本地存储，再插入画布项目，导入成功后仍停留在画布库。 - 修复删除画布图片节点或清空画布后撤销时，节点信息恢复但本地图片数据已被清理导致图片丢失的问题。 - “我的素材”类型筛选区右侧新增文本样式的导出素材和导入素材入口，可将全部素材导出为包含 `assets.json` 与图片、视频文件的压缩包，并从压缩包恢复素材。 -- 未登录状态下，画布右上角不再显示用户头像菜单、用户名称、算力点余额和退出登录入口，改为显示登录入口；快捷键入口仍可直接打开。 +- 纯前端模式下，画布右上角不再显示用户头像菜单、用户名称、算力点余额、退出登录入口和登录入口；快捷键入口仍可直接打开。 - 生图工作台的图片参数区复用画布里的紧凑版图像设置面板，尺寸、质量、生成张数的交互保持一致；工作台仍保留独立的模型选择。 - 生图工作台新增生成记录配置持久化：每次生成会保存提示词、参考图、模型、质量、尺寸和张数，结果图写入本地图片存储后记录只保存 `storageKey`；点击历史记录会回填本次生成配置并预览结果。 - 生图工作台生成记录会过滤空缩略图地址，避免历史记录卡片渲染 `src=""` 图片。 @@ -48,20 +50,16 @@ description: 当前版本已实现但仍需人工验证的变更项 - 视频设置抽成画布和视频创作台共用的紧凑面板，清晰度、尺寸、秒数按固定网格选择并支持手动输入；尺寸选择 `auto` 时请求不传 `size`。 - 修复画布和生图工作台选择图片尺寸后，请求图片生成/编辑接口未携带 `size` 参数的问题；`auto` 不传，其余比例或像素尺寸会随请求发送。 - 修复生图工作台和画布生图请求中 `quality` 参数可能传入上游不支持值导致 400 的问题；请求前会归一化质量枚举，`auto` 或异常值不再发送给上游。 -- 管理后台新增/编辑渠道时，渠道可用模型支持通过弹窗按“新获取、已有”分组选择，并可在弹窗内手动增加模型或拉取模型列表后再写回表单。 -- 管理后台编辑渠道时，API Key 留空不再触发必填校验，表示沿用已保存的密钥；新增渠道仍要求填写 API Key。 -- 管理后台公开配置里的系统可用模型候选项改为由已启用渠道中选择的模型合并去重生成，最终开放哪些模型仍由公开配置里手动勾选。 - 视频生成请求参数对齐 `grok-imagine-video` 接口：使用 `resolution_name`、`preset=normal`、`input_reference[]`，支持清晰度、尺寸、秒数快捷选择和手动输入，并支持最多 7 张参考图。 - 画布视频设置浮层改为挂载到页面根层级并使用自建浮层交互，避免被节点悬浮工具栏遮挡或点击面板内容时关闭。 - 画布生成配置节点的生图参数改为复用图像设置浮层，支持在同一个入口里调整质量、尺寸和生成张数。 - 视频清晰度输入框改为只输入数字，提交请求时再拼接 `p` 单位。 -- 视频生成前端会识别后端 `{ code, msg }` 错误响应，创建失败不再继续轮询 `undefined`。 +- 视频生成前端会识别接口 `{ code, msg }` 错误响应，创建失败不再继续轮询 `undefined`。 - 新增 `/video` 视频创作台页面，参考生图工作台布局，支持提示词、参考图、视频参数、生成结果、保存素材、下载和本地生成记录；清晰度和秒数均支持常用值选择与手动输入，生成记录只保存媒体 `storageKey` 并可回填本次提示词、参考图和参数。 -- 视频创作台生成前会把模型、尺寸、秒数、清晰度归一化为视频接口支持的参数，并展示后端返回的错误信息，避免页面侧残留的生图参数影响视频请求。 +- 视频创作台生成前会把模型、尺寸、秒数、清晰度归一化为视频接口支持的参数，并展示接口返回的错误信息，避免页面侧残留的生图参数影响视频请求。 - 火山方舟 Agent Plan / Seedance 2.0 视频生成需要在真实账号下验证：`/contents/generations/tasks` 创建任务、轮询状态、`content.video_url` 回填画布，以及 401/403/429/超时错误提示。 -- 管理后台保存私有渠道后，需要验证所有已启用渠道里的模型会自动出现在公开 `availableModels`，并且 `defaultVideoModel`、`defaultImageModel`、`defaultTextModel` 在为空或失效时会自动修复，前台不再显示旧的 `grok` 默认值。 - `/video` 和画布视频设置已按 Seedance 2.0 增加分辨率、比例、4-15 秒/智能时长、生成声音和水印参数；需要在真实浏览器里验证参数回填、生成记录和画布节点配置都能保持一致。 - `/video` 支持最多 9 张参考图、3 个参考视频、3 个参考音频；需要验证格式、大小、音频时长提示和生成请求中的 `reference_image`、`reference_video`、`reference_audio` 组装。 - 画布新增音频节点，支持上传、拖入、播放、移动、缩放、删除，并可作为上游参考音频参与 Seedance 视频生成；需要验证刷新后本地音频 URL 能恢复。 -- `PUBLIC_BASE_URL` 已配置公网域名时，需要验证本地上传参考视频和参考音频能被火山拉取；未配置或配置为内网地址时，需要验证前端能给出明确提示。 +- Seedance 本地参考视频和参考音频改为由前端读取后传给兼容接口；需要在真实上游验证公网 URL、本地视频、本地音频三类参考素材的可用性和错误提示。 - Seedance 返回远程视频 URL 但浏览器无法下载为 Blob 时，需要验证视频节点刷新后仍保留远程 URL，并确认上游 URL 有效期限制。 diff --git a/docs/index.md b/docs/index.md index 0282850..b878567 100644 --- a/docs/index.md +++ b/docs/index.md @@ -13,12 +13,9 @@ - [画布节点操作手册](/docs/canvas/canvas-node-manual) - [画布快捷键](/docs/canvas/canvas-shortcuts) -## 开发文档 +## 开发与数据 - [本地开发](/docs/backend/local-development) -- [接口响应约定](/docs/backend/api-response) -- [系统配置数据结构](/docs/backend/system-settings) -- [后端数据库说明](/docs/backend/backend-database) - [画布数据结构](/docs/backend/canvas-data-structure) ## 商务合作 @@ -40,5 +37,5 @@ ## 说明 -- 当前画布项目和“我的素材”主要保存在浏览器本地，不支持云同步。 -- 本地直连模式下，AI API Key 保存在浏览器本地，并由前端直接请求 OpenAI 兼容接口。 +- 当前画布项目和“我的素材”主要保存在浏览器本地，跨设备可自行配置 WebDAV 同步。 +- AI API Key 保存在浏览器本地，并由前端直接请求 OpenAI 兼容接口。 diff --git a/go.mod b/go.mod deleted file mode 100644 index 24c404d..0000000 --- a/go.mod +++ /dev/null @@ -1,65 +0,0 @@ -module github.com/basketikun/infinite-canvas - -go 1.25.0 - -require ( - github.com/caarlos0/env/v11 v11.3.1 - github.com/gin-gonic/gin v1.11.0 - github.com/glebarez/sqlite v1.11.0 - github.com/golang-jwt/jwt/v5 v5.3.1 - github.com/go-sql-driver/mysql v1.8.1 - github.com/jackc/pgx/v5 v5.6.0 - github.com/joho/godotenv v1.5.1 - github.com/robfig/cron/v3 v3.0.1 - golang.org/x/crypto v0.48.0 - gorm.io/driver/mysql v1.6.0 - gorm.io/driver/postgres v1.6.0 - gorm.io/gorm v1.31.1 -) - -require ( - filippo.io/edwards25519 v1.2.0 // indirect - github.com/bytedance/sonic v1.14.0 // indirect - github.com/bytedance/sonic/loader v0.3.0 // indirect - github.com/cloudwego/base64x v0.1.6 // indirect - github.com/dustin/go-humanize v1.0.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.8 // indirect - github.com/gin-contrib/sse v1.1.0 // indirect - github.com/glebarez/go-sqlite v1.21.2 // indirect - github.com/go-playground/locales v0.14.1 // indirect - github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.27.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect - github.com/goccy/go-yaml v1.18.0 // indirect - github.com/google/uuid v1.3.0 - github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jinzhu/now v1.1.5 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.3.0 // indirect - github.com/leodido/go-urn v1.4.0 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.4 // indirect - github.com/quic-go/qpack v0.5.1 // indirect - github.com/quic-go/quic-go v0.54.0 // indirect - github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect - github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.3.0 // indirect - go.uber.org/mock v0.5.0 // indirect - golang.org/x/arch v0.20.0 // indirect - golang.org/x/mod v0.33.0 // indirect - golang.org/x/net v0.50.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/text v0.34.0 // indirect - golang.org/x/tools v0.42.0 // indirect - google.golang.org/protobuf v1.36.9 // indirect - modernc.org/libc v1.22.5 // indirect - modernc.org/mathutil v1.5.0 // indirect - modernc.org/memory v1.5.0 // indirect - modernc.org/sqlite v1.23.1 // indirect -) diff --git a/go.sum b/go.sum deleted file mode 100644 index d6a9516..0000000 --- a/go.sum +++ /dev/null @@ -1,140 +0,0 @@ -filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= -filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= -github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA= -github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA= -github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= -github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA= -github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U= -github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= -github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= -github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= -github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= -github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= -github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk= -github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls= -github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= -github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= -github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= -github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= -github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= -github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= -github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= -github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= -github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4= -github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= -github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= -github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= -github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= -github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= -github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= -github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= -github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= -github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= -github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY= -github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= -github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= -github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= -github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= -github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= -github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= -github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= -github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= -github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= -github.com/quic-go/quic-go v0.54.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg= -github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= -github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= -github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= -github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= -github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= -go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= -go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= -golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c= -golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= -golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= -golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= -golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60= -golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= -golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= -golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= -google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw= -google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= -gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= -modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= -modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= -modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= -modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= -modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= -modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= -modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= diff --git a/handler/admin.go b/handler/admin.go deleted file mode 100644 index 1db1aaa..0000000 --- a/handler/admin.go +++ /dev/null @@ -1,74 +0,0 @@ -package handler - -import ( - "encoding/json" - "log" - "net/http" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/service" -) - -type adminSyncRequest struct { - Category string `json:"category"` -} - -type adminBatchDeleteRequest struct { - IDs []string `json:"ids"` -} - -func AdminPromptCategories(w http.ResponseWriter, r *http.Request) { - OK(w, service.ListPromptCategories()) -} - -func AdminPrompts(w http.ResponseWriter, r *http.Request) { - result, err := service.ListPrompts(parseQuery(r)) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} - -func AdminSavePrompt(w http.ResponseWriter, r *http.Request) { - var item model.Prompt - _ = json.NewDecoder(r.Body).Decode(&item) - result, err := service.SavePrompt(item) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} - -func AdminDeletePrompt(w http.ResponseWriter, r *http.Request, id string) { - if err := service.DeletePrompt(id); err != nil { - FailError(w, err) - return - } - OK(w, true) -} - -func AdminDeletePrompts(w http.ResponseWriter, r *http.Request) { - var request adminBatchDeleteRequest - _ = json.NewDecoder(r.Body).Decode(&request) - if err := service.DeletePrompts(request.IDs); err != nil { - FailError(w, err) - return - } - OK(w, true) -} - -func AdminSyncPromptCategories(w http.ResponseWriter, r *http.Request) { - var request adminSyncRequest - _ = json.NewDecoder(r.Body).Decode(&request) - log.Printf("sync prompt category start category=%s", request.Category) - categories, err := service.SyncPromptCategory(request.Category) - if err != nil { - log.Printf("sync prompt category failed category=%s err=%v", request.Category, err) - FailError(w, err) - return - } - log.Printf("sync prompt category done category=%s", request.Category) - OK(w, categories) -} diff --git a/handler/ai.go b/handler/ai.go deleted file mode 100644 index f480520..0000000 --- a/handler/ai.go +++ /dev/null @@ -1,311 +0,0 @@ -package handler - -import ( - "bytes" - "encoding/json" - "fmt" - "io" - "log" - "mime" - "mime/multipart" - "net/http" - "strings" - - "github.com/basketikun/infinite-canvas/service" -) - -func AIImagesGenerations(w http.ResponseWriter, r *http.Request) { - proxyAIRequest(w, r, "/images/generations") -} - -func AIImagesEdits(w http.ResponseWriter, r *http.Request) { - proxyAIRequest(w, r, "/images/edits") -} - -func AIChatCompletions(w http.ResponseWriter, r *http.Request) { - proxyAIRequest(w, r, "/chat/completions") -} - -func AIAudioSpeech(w http.ResponseWriter, r *http.Request) { - proxyAIRequest(w, r, "/audio/speech") -} - -func AIVideos(w http.ResponseWriter, r *http.Request) { - proxyAIRequest(w, r, "/videos") -} - -func AIVideo(w http.ResponseWriter, r *http.Request, id string) { - proxyAIGetRequest(w, r, "/videos/"+id) -} - -func AIVideoContent(w http.ResponseWriter, r *http.Request, id string) { - proxyAIGetRequest(w, r, "/videos/"+id+"/content") -} - -func proxyAIGetRequest(w http.ResponseWriter, r *http.Request, path string) { - modelName := r.URL.Query().Get("model") - if strings.TrimSpace(modelName) == "" { - modelName = "grok-imagine-video" - } - channel, err := service.SelectModelChannel(modelName) - if err != nil { - log.Printf("AI proxy select channel failed: model=%s err=%v", modelName, err) - Fail(w, "AI 接口请求失败") - return - } - path = resolveAIProxyPath(channel.BaseURL, modelName, path) - request, err := http.NewRequest(http.MethodGet, service.BuildModelChannelURL(channel, path), nil) - if err != nil { - Fail(w, "AI 接口请求失败") - return - } - request.Header.Set("Authorization", "Bearer "+channel.APIKey) - copyAIResponse(w, request, nil) -} - -func proxyAIRequest(w http.ResponseWriter, r *http.Request, path string) { - body, contentType, modelName, err := readAIRequest(r) - if err != nil { - log.Printf("AI proxy request read failed: %v", err) - Fail(w, "AI 接口请求失败") - return - } - user, ok := service.UserFromContext(r.Context()) - if !ok { - Fail(w, "未登录或权限不足") - return - } - credits, err := service.ModelCost(modelName) - if err != nil { - log.Printf("AI proxy read model cost failed: model=%s err=%v", modelName, err) - Fail(w, "AI 接口请求失败") - return - } - credits *= readAIRequestCount(body, contentType) - channel, err := service.SelectModelChannel(modelName) - if err != nil { - log.Printf("AI proxy select channel failed: model=%s err=%v", modelName, err) - Fail(w, "AI 接口请求失败") - return - } - path = resolveAIProxyPath(channel.BaseURL, modelName, path) - request, err := http.NewRequest(http.MethodPost, service.BuildModelChannelURL(channel, path), bytes.NewReader(body)) - if err != nil { - log.Printf("AI proxy build request failed: url=%s err=%v", service.BuildModelChannelURL(channel, path), err) - Fail(w, "AI 接口请求失败") - return - } - request.Header.Set("Authorization", "Bearer "+channel.APIKey) - if contentType != "" { - request.Header.Set("Content-Type", contentType) - } - if err := service.ConsumeUserCredits(user.ID, modelName, credits, path); err != nil { - FailError(w, err) - return - } - copyAIResponse(w, request, func() { - if err := service.RefundUserCredits(user.ID, modelName, credits, path); err != nil { - log.Printf("AI proxy refund credits failed: user=%s model=%s credits=%d err=%v", user.ID, modelName, credits, err) - } - }) -} - -func copyAIResponse(w http.ResponseWriter, request *http.Request, onFailure func()) { - response, err := http.DefaultClient.Do(request) - if err != nil { - log.Printf("AI proxy request failed: url=%s err=%v", request.URL.String(), err) - if onFailure != nil { - onFailure() - } - Fail(w, "AI 接口请求失败") - return - } - defer response.Body.Close() - - if response.StatusCode >= http.StatusBadRequest { - body, _ := io.ReadAll(io.LimitReader(response.Body, 4096)) - log.Printf("AI upstream error: url=%s status=%d", request.URL.String(), response.StatusCode) - if onFailure != nil { - onFailure() - } - Fail(w, aiUpstreamStatusMessage(response.StatusCode, body)) - return - } - - for key, values := range response.Header { - if strings.EqualFold(key, "Content-Length") { - continue - } - for _, value := range values { - w.Header().Add(key, value) - } - } - w.WriteHeader(response.StatusCode) - _, _ = io.Copy(w, response.Body) -} - -func readAIRequest(r *http.Request) ([]byte, string, string, error) { - contentType := r.Header.Get("Content-Type") - body, err := io.ReadAll(r.Body) - if err != nil { - return nil, "", "", err - } - modelName := "" - if strings.HasPrefix(contentType, "multipart/form-data") { - modelName = readMultipartModel(body, contentType) - } else { - var payload struct { - Model string `json:"model"` - } - _ = json.Unmarshal(body, &payload) - modelName = payload.Model - } - if strings.TrimSpace(modelName) == "" { - return nil, "", "", errMissingModel - } - return body, contentType, modelName, nil -} - -func readMultipartModel(body []byte, contentType string) string { - _, params, err := mime.ParseMediaType(contentType) - if err != nil { - return "" - } - reader := multipart.NewReader(bytes.NewReader(body), params["boundary"]) - form, err := reader.ReadForm(32 << 20) - if err != nil { - return "" - } - defer form.RemoveAll() - if values := form.Value["model"]; len(values) > 0 { - return values[0] - } - return "" -} - -func readAIRequestCount(body []byte, contentType string) int { - count := 1 - if strings.HasPrefix(contentType, "multipart/form-data") { - _, params, err := mime.ParseMediaType(contentType) - if err != nil { - return count - } - form, err := multipart.NewReader(bytes.NewReader(body), params["boundary"]).ReadForm(32 << 20) - if err != nil { - return count - } - defer form.RemoveAll() - if values := form.Value["n"]; len(values) > 0 { - _, _ = fmt.Sscan(values[0], &count) - } - } else { - var payload struct { - N int `json:"n"` - } - _ = json.Unmarshal(body, &payload) - count = payload.N - } - if count < 1 { - return 1 - } - return count -} - -var errMissingModel = &aiError{"缺少模型名称"} - -func resolveAIProxyPath(baseURL string, modelName string, path string) string { - if !isArkSeedanceVideo(baseURL, modelName) { - return path - } - if path == "/videos" { - return "/contents/generations/tasks" - } - if strings.HasPrefix(path, "/videos/") && !strings.HasSuffix(path, "/content") { - return "/contents/generations/tasks/" + strings.TrimPrefix(path, "/videos/") - } - return path -} - -func isArkSeedanceVideo(baseURL string, modelName string) bool { - base := strings.ToLower(baseURL) - model := strings.ToLower(modelName) - return strings.Contains(model, "seedance") || strings.Contains(model, "doubao-seedance") || strings.Contains(base, "/api/plan/v3") -} - -func aiStatusMessage(statusCode int) string { - switch statusCode { - case http.StatusUnauthorized, http.StatusForbidden: - return "AI 接口鉴权失败，请检查 API Key、套餐权限或模型权限" - case http.StatusTooManyRequests: - return "AI 接口限流或额度不足，请稍后重试或检查额度" - default: - return "AI 接口请求失败" - } -} - -func aiUpstreamStatusMessage(statusCode int, body []byte) string { - base := aiStatusMessage(statusCode) - detail := aiUpstreamErrorDetail(body) - if detail == "" { - return base - } - return base + "：" + detail -} - -func aiUpstreamErrorDetail(body []byte) string { - text := strings.TrimSpace(string(body)) - if text == "" { - return "" - } - var payload struct { - Msg string `json:"msg"` - Message string `json:"message"` - Error struct { - Code string `json:"code"` - Message string `json:"message"` - } `json:"error"` - } - if err := json.Unmarshal(body, &payload); err == nil { - if payload.Error.Message != "" { - if detail := friendlyUpstreamError(payload.Error.Code, payload.Error.Message); detail != "" { - return safeUpstreamText(detail) - } - if payload.Error.Code != "" { - return safeUpstreamText(payload.Error.Code + " " + payload.Error.Message) - } - return safeUpstreamText(payload.Error.Message) - } - if payload.Msg != "" { - return safeUpstreamText(payload.Msg) - } - if payload.Message != "" { - return safeUpstreamText(payload.Message) - } - } - return safeUpstreamText(text) -} - -func friendlyUpstreamError(code string, message string) string { - lowerCode := strings.ToLower(strings.TrimSpace(code)) - if strings.Contains(lowerCode, "inputvideosensitivecontentdetected") || strings.Contains(lowerCode, "privacyinformation") { - return strings.TrimSpace(code + " 参考视频疑似包含真人或隐私信息，火山方舟拒绝使用普通 URL 作为真人视频参考；请改用不含真人的视频、官方允许的模型产物，或已授权的 asset:// 素材。原始错误：" + message) - } - return "" -} - -func safeUpstreamText(text string) string { - text = strings.Join(strings.Fields(strings.TrimSpace(text)), " ") - runes := []rune(text) - if len(runes) > 300 { - return string(runes[:300]) + "..." - } - return text -} - -type aiError struct { - message string -} - -func (err *aiError) Error() string { - return err.message -} diff --git a/handler/ai_test.go b/handler/ai_test.go deleted file mode 100644 index 2eaa897..0000000 --- a/handler/ai_test.go +++ /dev/null @@ -1,27 +0,0 @@ -package handler - -import ( - "strings" - "testing" -) - -func TestAIUpstreamErrorDetail(t *testing.T) { - got := aiUpstreamErrorDetail([]byte(`{"error":{"code":"InvalidParameter","message":"reference video fps is invalid"}}`)) - if got != "InvalidParameter reference video fps is invalid" { - t.Fatalf("detail = %q", got) - } -} - -func TestAIUpstreamErrorDetailExplainsSensitiveVideo(t *testing.T) { - got := aiUpstreamErrorDetail([]byte(`{"error":{"code":"InputVideoSensitiveContentDetected.PrivacyInformation","message":"The request failed because the input video may contain real person."}}`)) - if !strings.Contains(got, "参考视频疑似包含真人") || !strings.Contains(got, "asset://") { - t.Fatalf("detail = %q", got) - } -} - -func TestSafeUpstreamTextTruncates(t *testing.T) { - got := safeUpstreamText(strings.Repeat("错", 320)) - if len([]rune(got)) != 303 { - t.Fatalf("truncated rune length = %d", len([]rune(got))) - } -} diff --git a/handler/assets.go b/handler/assets.go deleted file mode 100644 index 9cd87b6..0000000 --- a/handler/assets.go +++ /dev/null @@ -1,46 +0,0 @@ -package handler - -import ( - "encoding/json" - "net/http" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/service" -) - -func Assets(w http.ResponseWriter, r *http.Request) { - result, err := service.ListAssets(parseQuery(r)) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} - -func AdminAssets(w http.ResponseWriter, r *http.Request) { - result, err := service.ListAssets(parseQuery(r)) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} - -func AdminSaveAsset(w http.ResponseWriter, r *http.Request) { - var item model.Asset - _ = json.NewDecoder(r.Body).Decode(&item) - result, err := service.SaveAsset(item) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} - -func AdminDeleteAsset(w http.ResponseWriter, r *http.Request, id string) { - if err := service.DeleteAsset(id); err != nil { - FailError(w, err) - return - } - OK(w, true) -} diff --git a/handler/auth.go b/handler/auth.go deleted file mode 100644 index 1b7d971..0000000 --- a/handler/auth.go +++ /dev/null @@ -1,186 +0,0 @@ -package handler - -import ( - "encoding/json" - "net/http" - "net/url" - "strings" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/service" -) - -type loginRequest struct { - Username string `json:"username"` - Password string `json:"password"` -} - -type registerRequest struct { - Username string `json:"username"` - Password string `json:"password"` -} - -type saveUserRequest struct { - ID string `json:"id"` - Username string `json:"username"` - Password string `json:"password"` - Email string `json:"email"` - DisplayName string `json:"displayName"` - Role model.UserRole `json:"role"` - Status model.UserStatus `json:"status"` -} - -type adjustUserCreditsRequest struct { - Credits int `json:"credits"` -} - -func Register(w http.ResponseWriter, r *http.Request) { - var request registerRequest - _ = json.NewDecoder(r.Body).Decode(&request) - session, err := service.Register(request.Username, request.Password) - if err != nil { - FailError(w, err) - return - } - OK(w, session) -} - -func Login(w http.ResponseWriter, r *http.Request) { - var request loginRequest - _ = json.NewDecoder(r.Body).Decode(&request) - session, err := service.Login(request.Username, request.Password) - if err != nil { - FailError(w, err) - return - } - OK(w, session) -} - -func LinuxDoAuthorize(w http.ResponseWriter, r *http.Request) { - authURL, err := service.LinuxDoAuthorizeURL(r, r.URL.Query().Get("redirect")) - if err != nil { - FailError(w, err) - return - } - http.Redirect(w, r, authURL, http.StatusFound) -} - -func LinuxDoCallback(w http.ResponseWriter, r *http.Request) { - session, redirect, err := service.LoginWithLinuxDo(r, r.URL.Query().Get("code"), r.URL.Query().Get("state")) - if err != nil { - http.Redirect(w, r, loginRedirect(r, redirect, "", err.Error()), http.StatusFound) - return - } - http.Redirect(w, r, loginRedirect(r, redirect, session.Token, ""), http.StatusFound) -} - -func AdminLogin(w http.ResponseWriter, r *http.Request) { - var request loginRequest - _ = json.NewDecoder(r.Body).Decode(&request) - session, err := service.Login(request.Username, request.Password) - if err != nil { - FailError(w, err) - return - } - if session.User.Role != model.UserRoleAdmin { - Fail(w, "需要管理员权限") - return - } - OK(w, session) -} - -func CurrentUser(w http.ResponseWriter, r *http.Request) { - if user, ok := service.UserFromContext(r.Context()); ok { - OK(w, user) - return - } - OK(w, service.GuestUser()) -} - -func AdminUsers(w http.ResponseWriter, r *http.Request) { - users, err := service.ListUsers(parseQuery(r)) - if err != nil { - FailError(w, err) - return - } - OK(w, users) -} - -func AdminSaveUser(w http.ResponseWriter, r *http.Request) { - var request saveUserRequest - _ = json.NewDecoder(r.Body).Decode(&request) - user, err := service.SaveUser(model.User{ - ID: request.ID, - Username: request.Username, - Email: request.Email, - DisplayName: request.DisplayName, - Role: request.Role, - Status: request.Status, - }, request.Password) - if err != nil { - FailError(w, err) - return - } - OK(w, user) -} - -func AdminAdjustUserCredits(w http.ResponseWriter, r *http.Request, id string) { - var request adjustUserCreditsRequest - _ = json.NewDecoder(r.Body).Decode(&request) - user, err := service.AdjustUserCredits(id, request.Credits) - if err != nil { - FailError(w, err) - return - } - OK(w, user) -} - -func AdminCreditLogs(w http.ResponseWriter, r *http.Request) { - logs, err := service.ListCreditLogs(parseQuery(r)) - if err != nil { - FailError(w, err) - return - } - OK(w, logs) -} - -func AdminSaveCreditLog(w http.ResponseWriter, r *http.Request) { - var log model.CreditLog - _ = json.NewDecoder(r.Body).Decode(&log) - result, err := service.SaveCreditLog(log) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} - -func AdminDeleteCreditLog(w http.ResponseWriter, r *http.Request, id string) { - if err := service.DeleteCreditLog(id); err != nil { - FailError(w, err) - return - } - OK(w, true) -} - -func loginRedirect(r *http.Request, redirect string, token string, message string) string { - values := url.Values{} - if strings.TrimSpace(token) != "" { - values.Set("token", token) - } - if strings.TrimSpace(message) != "" { - values.Set("error", message) - } - if strings.TrimSpace(redirect) != "" { - values.Set("redirect", redirect) - } - return service.RequestOrigin(r) + "/login?" + values.Encode() -} - -func AdminDeleteUser(w http.ResponseWriter, r *http.Request, id string) { - if err := service.DeleteUser(id); err != nil { - FailError(w, err) - return - } - OK(w, true) -} diff --git a/handler/media_reference.go b/handler/media_reference.go deleted file mode 100644 index 94d64b7..0000000 --- a/handler/media_reference.go +++ /dev/null @@ -1,238 +0,0 @@ -package handler - -import ( - "fmt" - "io" - "net/http" - "os" - "path/filepath" - "strings" - - "github.com/basketikun/infinite-canvas/config" - "github.com/google/uuid" -) - -const ( - referenceMediaMaxBytes = 80 << 20 - referenceImageMaxBytes = 30 << 20 - referenceVideoMaxBytes = 50 << 20 - referenceAudioMaxBytes = 15 << 20 - referenceImageAllowedText = "jpeg/png/webp/bmp/gif/heic/heif 图片" - referenceVideoAllowedText = "mp4/mov 视频" - referenceAudioAllowedText = "mp3/wav 音频" - referenceMediaAllowedText = referenceImageAllowedText + "、" + referenceVideoAllowedText + "或" + referenceAudioAllowedText -) - -type referenceMediaUploadResult struct { - ID string `json:"id"` - URL string `json:"url"` - MimeType string `json:"mimeType"` - Bytes int64 `json:"bytes"` -} - -func UploadReferenceMedia(w http.ResponseWriter, r *http.Request) { - publicBaseURL := strings.TrimRight(strings.TrimSpace(config.Cfg.PublicBaseURL), "/") - if publicBaseURL == "" { - Fail(w, "未配置 PUBLIC_BASE_URL，无法把本地参考素材提供给火山方舟访问") - return - } - r.Body = http.MaxBytesReader(w, r.Body, referenceMediaMaxBytes+1) - if err := r.ParseMultipartForm(referenceMediaMaxBytes); err != nil { - Fail(w, "参考素材过大或上传格式不正确") - return - } - if r.MultipartForm != nil { - defer r.MultipartForm.RemoveAll() - } - file, header, err := r.FormFile("file") - if err != nil { - Fail(w, "请上传参考图片或视频") - return - } - defer file.Close() - - mimeType, ext, ok := normalizeReferenceMediaType(header.Header.Get("Content-Type"), filepath.Ext(header.Filename)) - if !ok { - Fail(w, "参考素材格式不支持，请使用 "+referenceMediaAllowedText) - return - } - if err := os.MkdirAll(referenceMediaDir(), 0o755); err != nil { - Fail(w, "参考素材保存失败") - return - } - id := uuid.NewString() + ext - targetPath := filepath.Join(referenceMediaDir(), id) - target, err := os.OpenFile(targetPath, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0o644) - if err != nil { - Fail(w, "参考素材保存失败") - return - } - bytes, copyErr := io.Copy(target, file) - closeErr := target.Close() - if copyErr != nil || closeErr != nil { - _ = os.Remove(targetPath) - Fail(w, "参考素材保存失败") - return - } - if bytes <= 0 { - _ = os.Remove(targetPath) - Fail(w, "参考素材为空") - return - } - if limit := referenceMediaTypeMaxBytes(mimeType); limit > 0 && bytes > limit { - _ = os.Remove(targetPath) - Fail(w, referenceMediaSizeMessage(mimeType)) - return - } - OK(w, referenceMediaUploadResult{ - ID: id, - URL: fmt.Sprintf("%s/api/media/references/%s", publicBaseURL, id), - MimeType: mimeType, - Bytes: bytes, - }) -} - -func ReferenceMedia(w http.ResponseWriter, r *http.Request, id string) { - if id == "" || id != filepath.Base(id) || strings.Contains(id, "..") { - http.NotFound(w, r) - return - } - path := filepath.Join(referenceMediaDir(), id) - file, err := os.Open(path) - if err != nil { - http.NotFound(w, r) - return - } - defer file.Close() - info, err := file.Stat() - if err != nil || info.IsDir() { - http.NotFound(w, r) - return - } - if mimeType := mimeTypeByReferenceMediaExt(filepath.Ext(id)); mimeType != "" { - w.Header().Set("Content-Type", mimeType) - } - w.Header().Set("Cache-Control", "public, max-age=86400") - http.ServeContent(w, r, id, info.ModTime(), file) -} - -func referenceMediaDir() string { - return filepath.Join(referenceDataDir(), "reference-media") -} - -func referenceDataDir() string { - driver := strings.ToLower(strings.TrimSpace(config.Cfg.StorageDriver)) - dsn := strings.TrimSpace(config.Cfg.DatabaseDSN) - if (driver == "" || driver == "sqlite") && dsn != "" && dsn != ":memory:" && !strings.HasPrefix(dsn, "file:") { - pathPart := dsn - if index := strings.Index(dsn, "?"); index >= 0 { - pathPart = dsn[:index] - } - if filepath.IsAbs(pathPart) { - return filepath.Dir(pathPart) - } - } - if _, err := os.Stat("/app/data"); err == nil { - return "/app/data" - } - return "data" -} - -func normalizeReferenceMediaType(contentType string, ext string) (string, string, bool) { - contentType = strings.ToLower(strings.TrimSpace(strings.Split(contentType, ";")[0])) - ext = strings.ToLower(strings.TrimSpace(ext)) - if contentType == "" || contentType == "application/octet-stream" { - contentType = mimeTypeByReferenceMediaExt(ext) - } - if fixedExt := referenceMediaExtByMimeType(contentType); fixedExt != "" { - return contentType, fixedExt, true - } - if mimeType := mimeTypeByReferenceMediaExt(ext); mimeType != "" { - return mimeType, ext, true - } - return "", "", false -} - -func referenceMediaExtByMimeType(mimeType string) string { - switch strings.ToLower(mimeType) { - case "image/jpeg", "image/jpg": - return ".jpg" - case "image/png": - return ".png" - case "image/webp": - return ".webp" - case "image/bmp": - return ".bmp" - case "image/gif": - return ".gif" - case "image/heic": - return ".heic" - case "image/heif": - return ".heif" - case "video/mp4": - return ".mp4" - case "video/quicktime", "video/mov": - return ".mov" - case "audio/mpeg", "audio/mp3": - return ".mp3" - case "audio/wav", "audio/x-wav", "audio/wave": - return ".wav" - default: - return "" - } -} - -func mimeTypeByReferenceMediaExt(ext string) string { - switch strings.ToLower(ext) { - case ".jpg", ".jpeg": - return "image/jpeg" - case ".png": - return "image/png" - case ".webp": - return "image/webp" - case ".bmp": - return "image/bmp" - case ".gif": - return "image/gif" - case ".heic": - return "image/heic" - case ".heif": - return "image/heif" - case ".mp4": - return "video/mp4" - case ".mov": - return "video/quicktime" - case ".mp3": - return "audio/mpeg" - case ".wav": - return "audio/wav" - default: - return "" - } -} - -func referenceMediaTypeMaxBytes(mimeType string) int64 { - if strings.HasPrefix(mimeType, "image/") { - return referenceImageMaxBytes - } - if strings.HasPrefix(mimeType, "video/") { - return referenceVideoMaxBytes - } - if strings.HasPrefix(mimeType, "audio/") { - return referenceAudioMaxBytes - } - return referenceMediaMaxBytes -} - -func referenceMediaSizeMessage(mimeType string) string { - if strings.HasPrefix(mimeType, "image/") { - return "参考图片超过大小限制，请使用 30MB 以内的图片" - } - if strings.HasPrefix(mimeType, "video/") { - return "参考视频超过大小限制，请使用 50MB 以内的 mp4/mov 视频" - } - if strings.HasPrefix(mimeType, "audio/") { - return "参考音频超过大小限制，请使用 15MB 以内的 mp3/wav 音频" - } - return "参考素材超过大小限制" -} diff --git a/handler/media_reference_test.go b/handler/media_reference_test.go deleted file mode 100644 index 826e045..0000000 --- a/handler/media_reference_test.go +++ /dev/null @@ -1,56 +0,0 @@ -package handler - -import ( - "path/filepath" - "testing" - - "github.com/basketikun/infinite-canvas/config" -) - -func TestNormalizeReferenceMediaTypeSupportsAudio(t *testing.T) { - tests := []struct { - name string - contentType string - ext string - wantMime string - wantExt string - }{ - {name: "mp3 mime", contentType: "audio/mpeg", ext: ".bin", wantMime: "audio/mpeg", wantExt: ".mp3"}, - {name: "wav ext fallback", contentType: "application/octet-stream", ext: ".wav", wantMime: "audio/wav", wantExt: ".wav"}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - mimeType, ext, ok := normalizeReferenceMediaType(tt.contentType, tt.ext) - if !ok { - t.Fatal("expected media type to be accepted") - } - if mimeType != tt.wantMime || ext != tt.wantExt { - t.Fatalf("got (%q, %q), want (%q, %q)", mimeType, ext, tt.wantMime, tt.wantExt) - } - }) - } -} - -func TestReferenceMediaTypeMaxBytes(t *testing.T) { - if got := referenceMediaTypeMaxBytes("audio/mpeg"); got != referenceAudioMaxBytes { - t.Fatalf("audio max bytes = %d, want %d", got, referenceAudioMaxBytes) - } - if got := referenceMediaTypeMaxBytes("video/mp4"); got != referenceVideoMaxBytes { - t.Fatalf("video max bytes = %d, want %d", got, referenceVideoMaxBytes) - } - if got := referenceMediaTypeMaxBytes("image/png"); got != referenceImageMaxBytes { - t.Fatalf("image max bytes = %d, want %d", got, referenceImageMaxBytes) - } -} - -func TestReferenceMediaDirUsesAbsoluteSQLiteDataDir(t *testing.T) { - previous := config.Cfg - t.Cleanup(func() { config.Cfg = previous }) - root := t.TempDir() - config.Cfg = config.Config{StorageDriver: "sqlite", DatabaseDSN: filepath.Join(root, "infinite-canvas.db")} - - if got := referenceMediaDir(); got != filepath.Join(root, "reference-media") { - t.Fatalf("referenceMediaDir = %q", got) - } -} diff --git a/handler/prompts.go b/handler/prompts.go deleted file mode 100644 index 1595e75..0000000 --- a/handler/prompts.go +++ /dev/null @@ -1,16 +0,0 @@ -package handler - -import ( - "net/http" - - "github.com/basketikun/infinite-canvas/service" -) - -func Prompts(w http.ResponseWriter, r *http.Request) { - result, err := service.ListPrompts(parseQuery(r)) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} diff --git a/handler/response.go b/handler/response.go deleted file mode 100644 index 44909bd..0000000 --- a/handler/response.go +++ /dev/null @@ -1,52 +0,0 @@ -package handler - -import ( - "encoding/json" - "log" - "net/http" - "strconv" - - "github.com/basketikun/infinite-canvas/model" -) - -type response struct { - Code int `json:"code"` - Data any `json:"data"` - Msg string `json:"msg"` -} - -func OK(w http.ResponseWriter, data any) { - writeJSON(w, response{Code: 0, Data: data, Msg: "ok"}) -} - -func Fail(w http.ResponseWriter, msg string) { - writeJSON(w, response{Code: 1, Data: nil, Msg: msg}) -} - -func FailError(w http.ResponseWriter, err error) { - log.Printf("request failed: %v", err) - if safe, ok := err.(interface{ SafeMessage() string }); ok { - Fail(w, safe.SafeMessage()) - return - } - Fail(w, "操作失败") -} - -func writeJSON(w http.ResponseWriter, value any) { - w.Header().Set("Content-Type", "application/json") - _ = json.NewEncoder(w).Encode(value) -} - -func parseQuery(r *http.Request) model.Query { - q := r.URL.Query() - page, _ := strconv.Atoi(q.Get("page")) - pageSize, _ := strconv.Atoi(q.Get("pageSize")) - return model.Query{ - Keyword: q.Get("keyword"), - Tags: q["tag"], - Category: q.Get("category"), - Type: q.Get("type"), - Page: page, - PageSize: pageSize, - } -} diff --git a/handler/settings.go b/handler/settings.go deleted file mode 100644 index 01b7a1a..0000000 --- a/handler/settings.go +++ /dev/null @@ -1,66 +0,0 @@ -package handler - -import ( - "encoding/json" - "net/http" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/service" -) - -type adminChannelActionRequest struct { - Index *int `json:"index"` - Channel model.ModelChannel `json:"channel"` - Model string `json:"model"` -} - -func Settings(w http.ResponseWriter, r *http.Request) { - settings, err := service.PublicSettings() - if err != nil { - FailError(w, err) - return - } - OK(w, settings) -} - -func AdminSettings(w http.ResponseWriter, r *http.Request) { - settings, err := service.AdminSettings() - if err != nil { - FailError(w, err) - return - } - OK(w, settings) -} - -func AdminSaveSettings(w http.ResponseWriter, r *http.Request) { - var settings model.Settings - _ = json.NewDecoder(r.Body).Decode(&settings) - result, err := service.SaveSettings(settings) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} - -func AdminChannelModels(w http.ResponseWriter, r *http.Request) { - var request adminChannelActionRequest - _ = json.NewDecoder(r.Body).Decode(&request) - models, err := service.AdminChannelModels(request.Index, request.Channel) - if err != nil { - FailError(w, err) - return - } - OK(w, models) -} - -func AdminTestChannelModel(w http.ResponseWriter, r *http.Request) { - var request adminChannelActionRequest - _ = json.NewDecoder(r.Body).Decode(&request) - result, err := service.AdminTestChannelModel(request.Index, request.Channel, request.Model) - if err != nil { - FailError(w, err) - return - } - OK(w, result) -} diff --git a/main.go b/main.go deleted file mode 100644 index 4128870..0000000 --- a/main.go +++ /dev/null @@ -1,20 +0,0 @@ -package main - -import ( - "log" - - "github.com/basketikun/infinite-canvas/config" - "github.com/basketikun/infinite-canvas/router" - "github.com/basketikun/infinite-canvas/service" -) - -func main() { - if err := config.Load(); err != nil { - log.Fatal(err) - } - if err := service.EnsureDefaultAdmin(); err != nil { - log.Fatal(err) - } - service.StartPromptSyncScheduler() - log.Fatal(router.New().Run(":" + config.Cfg.Port)) -} diff --git a/middleware/admin.go b/middleware/admin.go deleted file mode 100644 index 67d4f7a..0000000 --- a/middleware/admin.go +++ /dev/null @@ -1,52 +0,0 @@ -package middleware - -import ( - "net/http" - "strings" - - "github.com/basketikun/infinite-canvas/handler" - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/service" - "github.com/gin-gonic/gin" -) - -func AdminAuth(c *gin.Context) { - user, ok := authUser(c) - if !ok || user.Role != model.UserRoleAdmin { - handler.Fail(c.Writer, "未登录或权限不足") - c.Abort() - return - } - c.Request = c.Request.WithContext(service.WithUser(c.Request.Context(), user)) - c.Next() -} - -func UserAuth(c *gin.Context) { - user, ok := authUser(c) - if !ok || user.Role == model.UserRoleGuest { - handler.Fail(c.Writer, "未登录或权限不足") - c.Abort() - return - } - c.Request = c.Request.WithContext(service.WithUser(c.Request.Context(), user)) - c.Next() -} - -func OptionalAuth(c *gin.Context) { - if user, ok := authUser(c); ok { - c.Request = c.Request.WithContext(service.WithUser(c.Request.Context(), user)) - } - c.Next() -} - -func NotFoundJSON(c *gin.Context) { - c.JSON(http.StatusNotFound, gin.H{"code": 1, "data": nil, "msg": "接口不存在"}) -} - -func authUser(c *gin.Context) (model.AuthUser, bool) { - token := strings.TrimPrefix(c.GetHeader("Authorization"), "Bearer ") - if strings.TrimSpace(token) == "" { - return model.AuthUser{}, false - } - return service.CurrentAuthUser(token) -} diff --git a/model/asset.go b/model/asset.go deleted file mode 100644 index db3a414..0000000 --- a/model/asset.go +++ /dev/null @@ -1,30 +0,0 @@ -package model - -type AssetType string - -const ( - AssetTypeText AssetType = "text" - AssetTypeImage AssetType = "image" -) - -// Asset 素材记录。 -type Asset struct { - ID string `json:"id" gorm:"primaryKey"` - Title string `json:"title"` - Type AssetType `json:"type"` - CoverURL string `json:"coverUrl"` - Tags []string `json:"tags" gorm:"serializer:json"` - Category string `json:"category"` - Description string `json:"description"` - Content string `json:"content,omitempty"` - URL string `json:"url,omitempty"` - CreatedAt string `json:"createdAt"` - UpdatedAt string `json:"updatedAt"` -} - -// AssetList 素材分页结果。 -type AssetList struct { - Items []Asset `json:"items"` - Tags []string `json:"tags"` - Total int `json:"total"` -} diff --git a/model/prompt.go b/model/prompt.go deleted file mode 100644 index 2f84ee8..0000000 --- a/model/prompt.go +++ /dev/null @@ -1,33 +0,0 @@ -package model - -// Prompt 提示词记录。 -type Prompt struct { - ID string `json:"id" gorm:"primaryKey"` - Title string `json:"title"` - CoverURL string `json:"coverUrl"` - Prompt string `json:"prompt"` - Tags []string `json:"tags" gorm:"serializer:json"` - Category string `json:"category" gorm:"index"` - GithubURL string `json:"githubUrl" gorm:"-"` - Preview string `json:"preview"` - CreatedAt string `json:"createdAt"` - UpdatedAt string `json:"updatedAt"` -} - -// PromptList 提示词分页结果。 -type PromptList struct { - Items []Prompt `json:"items"` - Tags []string `json:"tags"` - Categories []string `json:"categories"` - Total int `json:"total"` -} - -// PromptCategory 提示词分类。 -type PromptCategory struct { - Category string `json:"category" gorm:"primaryKey"` - Name string `json:"name"` - Description string `json:"description"` - GithubURL string `json:"githubUrl"` - Remote bool `json:"remote"` - UpdatedAt string `json:"updatedAt"` -} diff --git a/model/query.go b/model/query.go deleted file mode 100644 index 8d9e88f..0000000 --- a/model/query.go +++ /dev/null @@ -1,29 +0,0 @@ -package model - -const MaxPageSize = 500 - -// Query 列表筛选和分页参数。 -type Query struct { - Keyword string - Tags []string - Category string - Type string - Page int - PageSize int -} - -func (q *Query) Normalize() { - if q.Page < 1 { - q.Page = 1 - } - if q.PageSize < 1 { - q.PageSize = 20 - } - if q.PageSize > MaxPageSize { - q.PageSize = MaxPageSize - } -} - -func (q *Query) Offset() int { - return (q.Page - 1) * q.PageSize -} diff --git a/model/setting.go b/model/setting.go deleted file mode 100644 index d6d4a1f..0000000 --- a/model/setting.go +++ /dev/null @@ -1,91 +0,0 @@ -package model - -import "encoding/json" - -type SettingKey string - -const ( - SettingKeyPublic SettingKey = "public" - SettingKeyPrivate SettingKey = "private" -) - -// ModelChannel 模型渠道配置。 -type ModelChannel struct { - Protocol string `json:"protocol"` - Name string `json:"name"` - BaseURL string `json:"baseUrl"` - APIKey string `json:"apiKey"` - Models []string `json:"models"` - Weight int `json:"weight"` - Enabled bool `json:"enabled"` - Remark string `json:"remark"` -} - -// ModelCost 模型算力点配置。 -type ModelCost struct { - Model string `json:"model"` - Credits int `json:"credits"` -} - -// PublicModelChannelSetting 公开模型渠道配置。 -type PublicModelChannelSetting struct { - AvailableModels []string `json:"availableModels"` - ModelCosts []ModelCost `json:"modelCosts"` - DefaultModel string `json:"defaultModel"` - DefaultImageModel string `json:"defaultImageModel"` - DefaultVideoModel string `json:"defaultVideoModel"` - DefaultTextModel string `json:"defaultTextModel"` - SystemPrompt string `json:"systemPrompt"` - AllowCustomChannel *bool `json:"allowCustomChannel"` -} - -// PublicSetting 公开配置。 -type PublicSetting struct { - ModelChannel PublicModelChannelSetting `json:"modelChannel"` - Auth PublicAuthSetting `json:"auth"` -} - -type PublicAuthSetting struct { - AllowRegister *bool `json:"allowRegister"` - LinuxDo PublicLinuxDoAuthSetting `json:"linuxDo"` -} - -type PublicLinuxDoAuthSetting struct { - Enabled bool `json:"enabled"` -} - -// PrivateSetting 私有配置。 -type PrivateSetting struct { - Channels []ModelChannel `json:"channels"` - PromptSync PromptSyncSetting `json:"promptSync"` - Auth PrivateAuthSetting `json:"auth"` -} - -// PromptSyncSetting 提示词定时同步配置。 -type PromptSyncSetting struct { - Enabled *bool `json:"enabled"` - Cron string `json:"cron"` -} - -type PrivateAuthSetting struct { - LinuxDo PrivateLinuxDoAuthSetting `json:"linuxDo"` -} - -type PrivateLinuxDoAuthSetting struct { - ClientID string `json:"clientId"` - ClientSecret string `json:"clientSecret"` -} - -// Setting 系统配置。 -type Setting struct { - Key SettingKey `json:"key" gorm:"primaryKey"` - Value json.RawMessage `json:"value" gorm:"serializer:json"` - CreatedAt string `json:"createdAt"` - UpdatedAt string `json:"updatedAt"` -} - -// Settings 系统公开和私有配置。 -type Settings struct { - Public PublicSetting `json:"public"` - Private PrivateSetting `json:"private"` -} diff --git a/model/user.go b/model/user.go deleted file mode 100644 index 49809d3..0000000 --- a/model/user.go +++ /dev/null @@ -1,102 +0,0 @@ -package model - -type UserRole string - -const ( - UserRoleGuest UserRole = "guest" - UserRoleUser UserRole = "user" - UserRoleAdmin UserRole = "admin" -) - -type UserStatus string - -const ( - UserStatusActive UserStatus = "active" - UserStatusBan UserStatus = "ban" -) - -// User 系统用户。 -type User struct { - ID string `json:"id" gorm:"primaryKey"` - Username string `json:"username" gorm:"uniqueIndex"` - Password string `json:"password,omitempty"` - Email string `json:"email"` - DisplayName string `json:"displayName"` - AvatarURL string `json:"avatarUrl"` - Role UserRole `json:"role"` - Credits int `json:"credits"` - AffCode string `json:"affCode" gorm:"uniqueIndex"` - AffCount int `json:"affCount"` - InviterID string `json:"inviterId"` - GithubID string `json:"githubId"` - LinuxDoID string `json:"linuxDoId" gorm:"index"` - WechatID string `json:"wechatId"` - Status UserStatus `json:"status"` - LastLoginAt string `json:"lastLoginAt"` - Extra string `json:"extra" gorm:"type:text"` - CreatedAt string `json:"createdAt"` - UpdatedAt string `json:"updatedAt"` -} - -// UserList 用户分页结果。 -type UserList struct { - Items []User `json:"items"` - Total int `json:"total"` -} - -// AuthUser 用户公开信息。 -type AuthUser struct { - ID string `json:"id"` - Username string `json:"username"` - DisplayName string `json:"displayName"` - AvatarURL string `json:"avatarUrl"` - Role UserRole `json:"role"` - Credits int `json:"credits"` - CreatedAt string `json:"createdAt"` - UpdatedAt string `json:"updatedAt"` -} - -// AuthSession 登录会话信息。 -type AuthSession struct { - Token string `json:"token"` - User AuthUser `json:"user"` -} - -func PublicUser(user User) AuthUser { - return AuthUser{ - ID: user.ID, - Username: user.Username, - DisplayName: user.DisplayName, - AvatarURL: user.AvatarURL, - Role: user.Role, - Credits: user.Credits, - CreatedAt: user.CreatedAt, - UpdatedAt: user.UpdatedAt, - } -} - -type CreditLogType string - -const ( - CreditLogTypeAdminAdjust CreditLogType = "admin_adjust" - CreditLogTypeAIConsume CreditLogType = "ai_consume" - CreditLogTypeAIRefund CreditLogType = "ai_refund" -) - -// CreditLog 用户算力点变更流水。 -type CreditLog struct { - ID string `json:"id" gorm:"primaryKey"` - UserID string `json:"userId" gorm:"index"` - Type CreditLogType `json:"type"` - Amount int `json:"amount"` - Balance int `json:"balance"` - RelatedID string `json:"relatedId"` - Remark string `json:"remark"` - Extra string `json:"extra" gorm:"type:text"` - CreatedAt string `json:"createdAt"` -} - -type CreditLogList struct { - Items []CreditLog `json:"items"` - Total int `json:"total"` -} diff --git a/render.yaml b/render.yaml index 0406540..61cc27f 100644 --- a/render.yaml +++ b/render.yaml @@ -4,19 +4,7 @@ services: runtime: docker plan: free autoDeployTrigger: off - healthCheckPath: /api/health + healthCheckPath: / envVars: - - key: ADMIN_USERNAME - value: admin - - key: ADMIN_PASSWORD - sync: false - - key: JWT_SECRET - generateValue: true - - key: JWT_EXPIRE_HOURS - value: 168 - key: PORT value: 3000 - - key: STORAGE_DRIVER - value: sqlite - - key: DATABASE_DSN - value: data/infinite-canvas.db diff --git a/repository/asset.go b/repository/asset.go deleted file mode 100644 index d0493f9..0000000 --- a/repository/asset.go +++ /dev/null @@ -1,132 +0,0 @@ -package repository - -import ( - "errors" - - "github.com/basketikun/infinite-canvas/model" - "gorm.io/gorm" -) - -// ListAssets 按查询条件返回素材分页列表。 -func ListAssets(q model.Query) ([]model.Asset, int64, error) { - db, err := DB() - if err != nil { - return nil, 0, err - } - q.Normalize() - tx := applyAssetFilters(db.Model(&model.Asset{}), q) - - var total int64 - if err := tx.Count(&total).Error; err != nil { - return nil, 0, err - } - - var items []model.Asset - err = tx.Order("updated_at desc").Offset(q.Offset()).Limit(q.PageSize).Find(&items).Error - return items, total, err -} - -// ListAssetTags 返回当前素材查询条件下的全部标签。 -func ListAssetTags(q model.Query) ([]string, error) { - db, err := DB() - if err != nil { - return nil, err - } - q.Normalize() - q.Tags = nil - tx := applyAssetFilters(db.Model(&model.Asset{}), q) - - var items []model.Asset - if err := tx.Select("tags").Find(&items).Error; err != nil { - return nil, err - } - return assetTagsFromItems(items), nil -} - -// SaveAsset 保存素材，并在更新时保留原创建时间。 -func SaveAsset(item model.Asset) (model.Asset, error) { - db, err := DB() - if err != nil { - return item, err - } - if saved, ok, err := findAsset(db, item.ID); err != nil { - return item, err - } else if ok && item.CreatedAt == "" { - item.CreatedAt = saved.CreatedAt - } - return item, db.Save(&item).Error -} - -// DeleteAsset 删除指定素材。 -func DeleteAsset(id string) error { - db, err := DB() - if err != nil { - return err - } - return db.Delete(&model.Asset{}, "id = ?", id).Error -} - -// applyAssetFilters 应用素材列表的搜索条件。 -func applyAssetFilters(tx *gorm.DB, q model.Query) *gorm.DB { - if q.Keyword != "" { - like := "%" + q.Keyword + "%" - tx = tx.Where("title LIKE ? OR description LIKE ? OR content LIKE ?", like, like, like) - } - if isActiveAssetOption(q.Type) { - tx = tx.Where("type = ?", q.Type) - } - return applyAssetTagsFilter(tx, q.Tags) -} - -// findAsset 根据 ID 查询素材。 -func findAsset(db *gorm.DB, id string) (model.Asset, bool, error) { - item := model.Asset{} - err := db.Where("id = ?", id).First(&item).Error - if errors.Is(err, gorm.ErrRecordNotFound) { - return model.Asset{}, false, nil - } - return item, err == nil, err -} - -// applyAssetTagsFilter 应用 JSON 标签条件。 -func applyAssetTagsFilter(tx *gorm.DB, tags []string) *gorm.DB { - if len(tags) == 0 { - return tx - } - condition := tx.Session(&gorm.Session{NewDB: true}) - for _, tag := range tags { - condition = condition.Or(assetJSONTagsContains(tx), tag) - } - return tx.Where(condition) -} - -func assetTagsFromItems(items []model.Asset) []string { - seen := map[string]bool{} - tags := []string{} - for _, item := range items { - for _, tag := range item.Tags { - if tag != "" && !seen[tag] { - seen[tag] = true - tags = append(tags, tag) - } - } - } - return tags -} - -// assetJSONTagsContains 返回素材 tags 的 JSON 包含条件。 -func assetJSONTagsContains(tx *gorm.DB) string { - switch tx.Dialector.Name() { - case "mysql": - return "JSON_CONTAINS(tags, JSON_QUOTE(?))" - case "postgres": - return "jsonb_exists(tags::jsonb, ?)" - default: - return "EXISTS (SELECT 1 FROM json_each(tags) WHERE value = ?)" - } -} - -// isActiveAssetOption 判断素材筛选项有效状态。 -func isActiveAssetOption(value string) bool { - return value != "" && value != "全部" && value != "all" -} diff --git a/repository/db.go b/repository/db.go deleted file mode 100644 index 4948d76..0000000 --- a/repository/db.go +++ /dev/null @@ -1,179 +0,0 @@ -package repository - -import ( - "context" - "database/sql" - "errors" - "os" - "path/filepath" - "strings" - "sync" - - "github.com/basketikun/infinite-canvas/config" - "github.com/basketikun/infinite-canvas/model" - "github.com/glebarez/sqlite" - mysqldriver "github.com/go-sql-driver/mysql" - "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgconn" - gormmysql "gorm.io/driver/mysql" - "gorm.io/driver/postgres" - "gorm.io/gorm" -) - -var promptCategories = []model.PromptCategory{ - {Category: "system", Name: "系统", Description: "系统提示词分类"}, - {Category: "gpt-image-2-prompts", Name: "GPT Image 2 Prompts", Description: "EvoLinkAI 的 GPT Image 2 案例提示词分类", GithubURL: "https://github.com/EvoLinkAI/awesome-gpt-image-2-API-and-Prompts", Remote: true}, - {Category: "awesome-gpt-image", Name: "Awesome GPT Image", Description: "ZeroLu 的中文 GPT Image 提示词分类", GithubURL: "https://github.com/ZeroLu/awesome-gpt-image", Remote: true}, - {Category: "awesome-gpt4o-image-prompts", Name: "Awesome GPT4o Image Prompts", Description: "ImgEdify 的 GPT-4o 图像提示词分类", GithubURL: "https://github.com/ImgEdify/Awesome-GPT4o-Image-Prompts", Remote: true}, - {Category: "youmind-gpt-image-2", Name: "YouMind GPT Image 2", Description: "YouMind OpenLab 的 GPT Image 2 中文提示词分类", GithubURL: "https://github.com/YouMind-OpenLab/awesome-gpt-image-2", Remote: true}, - {Category: "youmind-nano-banana-pro", Name: "YouMind Nano Banana Pro", Description: "YouMind OpenLab 的 Nano Banana Pro 中文提示词分类", GithubURL: "https://github.com/YouMind-OpenLab/awesome-nano-banana-pro-prompts", Remote: true}, - {Category: "davidwu-gpt-image2-prompts", Name: "awesome-gpt-image2-prompts", Description: "davidwuw0811-boop 整理的 GPT Image 2 提示词分类", GithubURL: "https://github.com/davidwuw0811-boop/awesome-gpt-image2-prompts", Remote: true}, -} - -var ( - db *gorm.DB - dbOnce sync.Once - dbErr error -) - -// DB 初始化并返回全局数据库连接。 -func DB() (*gorm.DB, error) { - dbOnce.Do(func() { - driver := strings.ToLower(strings.TrimSpace(config.Cfg.StorageDriver)) - if driver == "" { - driver = "sqlite" - } - dsn := config.Cfg.DatabaseDSN - if driver == "sqlite" && dsn != ":memory:" { - _ = os.MkdirAll(filepath.Dir(dsn), 0755) - } - if isPostgresDriver(driver) { - dbErr = ensurePostgresDatabase(dsn) - if dbErr != nil { - return - } - } - if driver == "mysql" { - dbErr = ensureMySQLDatabase(dsn) - if dbErr != nil { - return - } - } - db, dbErr = gorm.Open(dialector(driver, dsn), &gorm.Config{}) - if dbErr != nil { - return - } - dbErr = db.AutoMigrate( - &model.User{}, - &model.CreditLog{}, - &model.Prompt{}, - &model.Asset{}, - &model.Setting{}, - ) - }) - return db, dbErr -} - -func dialector(driver string, dsn string) gorm.Dialector { - switch driver { - case "mysql": - return gormmysql.Open(dsn) - case "postgres", "postgresql": - return postgres.Open(dsn) - default: - return sqlite.Open(dsn) - } -} - -func isPostgresDriver(driver string) bool { - return driver == "postgres" || driver == "postgresql" -} - -func ensureMySQLDatabase(dsn string) error { - cfg, err := mysqldriver.ParseDSN(dsn) - if err != nil { - return err - } - target := strings.TrimSpace(cfg.DBName) - if target == "" { - return nil - } - ctx := context.Background() - targetDB, err := sql.Open("mysql", dsn) - if err != nil { - return err - } - err = targetDB.PingContext(ctx) - _ = targetDB.Close() - if err == nil { - return nil - } - if !isMySQLError(err, 1049) { - return err - } - - maintenance := cfg.Clone() - maintenance.DBName = "" - serverDB, err := sql.Open("mysql", maintenance.FormatDSN()) - if err != nil { - return err - } - defer serverDB.Close() - - _, err = serverDB.ExecContext(ctx, "CREATE DATABASE "+quoteMySQLIdentifier(target)+" CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci") - if isMySQLError(err, 1007) { - return nil - } - return err -} - -func ensurePostgresDatabase(dsn string) error { - cfg, err := pgx.ParseConfig(dsn) - if err != nil { - return err - } - target := strings.TrimSpace(cfg.Database) - if target == "" { - return nil - } - ctx := context.Background() - conn, err := pgx.ConnectConfig(ctx, cfg) - if err == nil { - _ = conn.Close(ctx) - return nil - } - if !isPostgresError(err, "3D000") { - return err - } - - maintenance := cfg.Copy() - maintenance.Database = "postgres" - if strings.EqualFold(target, "postgres") { - maintenance.Database = "template1" - } - conn, err = pgx.ConnectConfig(ctx, maintenance) - if err != nil { - return err - } - defer conn.Close(ctx) - - _, err = conn.Exec(ctx, "CREATE DATABASE "+pgx.Identifier{target}.Sanitize(), pgx.QueryExecModeExec) - if isPostgresError(err, "42P04") { - return nil - } - return err -} - -func isMySQLError(err error, number uint16) bool { - var mysqlErr *mysqldriver.MySQLError - return errors.As(err, &mysqlErr) && mysqlErr.Number == number -} - -func isPostgresError(err error, code string) bool { - var pgErr *pgconn.PgError - return errors.As(err, &pgErr) && pgErr.Code == code -} - -func quoteMySQLIdentifier(name string) string { - return "`" + strings.ReplaceAll(name, "`", "``") + "`" -} diff --git a/repository/prompt.go b/repository/prompt.go deleted file mode 100644 index 40abcc4..0000000 --- a/repository/prompt.go +++ /dev/null @@ -1,195 +0,0 @@ -package repository - -import ( - "errors" - - "github.com/basketikun/infinite-canvas/model" - "gorm.io/gorm" -) - -// PromptCategories 返回内置提示词分类的副本。 -func PromptCategories() []model.PromptCategory { - result := make([]model.PromptCategory, len(promptCategories)) - copy(result, promptCategories) - return result -} - -// PromptCategoryByCode 根据分类编码查找内置提示词分类。 -func PromptCategoryByCode(category string) (model.PromptCategory, bool) { - for _, item := range promptCategories { - if item.Category == category { - return item, true - } - } - return model.PromptCategory{}, false -} - -// ListPromptCategories 返回内置提示词分类。 -func ListPromptCategories() ([]model.PromptCategory, error) { - return PromptCategories(), nil -} - -// ListPrompts 按查询条件返回提示词分页列表。 -func ListPrompts(q model.Query) ([]model.Prompt, int64, error) { - db, err := DB() - if err != nil { - return nil, 0, err - } - q.Normalize() - tx := applyPromptFilters(db.Model(&model.Prompt{}), q) - - var total int64 - if err := tx.Count(&total).Error; err != nil { - return nil, 0, err - } - - var items []model.Prompt - if err := tx.Order("updated_at desc").Offset(q.Offset()).Limit(q.PageSize).Find(&items).Error; err != nil { - return nil, 0, err - } - categories, _ := ListPromptCategories() - githubURLs := map[string]string{} - for _, item := range categories { - githubURLs[item.Category] = item.GithubURL - } - for i := range items { - items[i].GithubURL = githubURLs[items[i].Category] - } - return items, total, nil -} - -// ListPromptTags 返回当前提示词查询条件下的全部标签。 -func ListPromptTags(q model.Query) ([]string, error) { - db, err := DB() - if err != nil { - return nil, err - } - q.Normalize() - q.Tags = nil - tx := applyPromptFilters(db.Model(&model.Prompt{}), q) - - var items []model.Prompt - if err := tx.Select("tags").Find(&items).Error; err != nil { - return nil, err - } - return promptTagsFromItems(items), nil -} - -// SavePrompt 保存提示词，并在更新时保留原创建时间。 -func SavePrompt(item model.Prompt) (model.Prompt, error) { - db, err := DB() - if err != nil { - return item, err - } - if saved, ok, err := findPrompt(db, item.ID); err != nil { - return item, err - } else if ok && item.CreatedAt == "" { - item.CreatedAt = saved.CreatedAt - } - item.GithubURL = "" - return item, db.Save(&item).Error -} - -// DeletePrompt 删除指定提示词。 -func DeletePrompt(id string) error { - db, err := DB() - if err != nil { - return err - } - return db.Delete(&model.Prompt{}, "id = ?", id).Error -} - -// DeletePrompts 批量删除提示词。 -func DeletePrompts(ids []string) error { - db, err := DB() - if err != nil { - return err - } - return db.Delete(&model.Prompt{}, "id IN ?", ids).Error -} - -// ReplacePromptCategory 用远程同步结果替换整个提示词分类。 -func ReplacePromptCategory(category model.PromptCategory, items []model.Prompt) error { - db, err := DB() - if err != nil { - return err - } - return db.Transaction(func(tx *gorm.DB) error { - if err := tx.Where("category = ?", category.Category).Delete(&model.Prompt{}).Error; err != nil { - return err - } - if len(items) == 0 { - return nil - } - for i := range items { - items[i].Category = category.Category - items[i].GithubURL = "" - } - return tx.Create(&items).Error - }) -} - -// applyPromptFilters 应用提示词列表的搜索条件。 -func applyPromptFilters(tx *gorm.DB, q model.Query) *gorm.DB { - if q.Keyword != "" { - like := "%" + q.Keyword + "%" - tx = tx.Where("title LIKE ? OR prompt LIKE ?", like, like) - } - if isActivePromptOption(q.Category) { - tx = tx.Where("category = ?", q.Category) - } - return applyPromptTagsFilter(tx, q.Tags) -} - -// findPrompt 根据 ID 查询提示词。 -func findPrompt(db *gorm.DB, id string) (model.Prompt, bool, error) { - item := model.Prompt{} - err := db.Where("id = ?", id).First(&item).Error - if errors.Is(err, gorm.ErrRecordNotFound) { - return model.Prompt{}, false, nil - } - return item, err == nil, err -} - -// applyPromptTagsFilter 应用 JSON 标签条件。 -func applyPromptTagsFilter(tx *gorm.DB, tags []string) *gorm.DB { - if len(tags) == 0 { - return tx - } - condition := tx.Session(&gorm.Session{NewDB: true}) - for _, tag := range tags { - condition = condition.Or(promptJSONTagsContains(tx), tag) - } - return tx.Where(condition) -} - -func promptTagsFromItems(items []model.Prompt) []string { - seen := map[string]bool{} - tags := []string{} - for _, item := range items { - for _, tag := range item.Tags { - if tag != "" && !seen[tag] { - seen[tag] = true - tags = append(tags, tag) - } - } - } - return tags -} - -// promptJSONTagsContains 返回提示词 tags 的 JSON 包含条件。 -func promptJSONTagsContains(tx *gorm.DB) string { - switch tx.Dialector.Name() { - case "mysql": - return "JSON_CONTAINS(tags, JSON_QUOTE(?))" - case "postgres": - return "jsonb_exists(tags::jsonb, ?)" - default: - return "EXISTS (SELECT 1 FROM json_each(tags) WHERE value = ?)" - } -} - -// isActivePromptOption 判断提示词筛选项有效状态。 -func isActivePromptOption(value string) bool { - return value != "" && value != "全部" && value != "all" -} diff --git a/repository/setting.go b/repository/setting.go deleted file mode 100644 index 9e07395..0000000 --- a/repository/setting.go +++ /dev/null @@ -1,48 +0,0 @@ -package repository - -import ( - "encoding/json" - - "github.com/basketikun/infinite-canvas/model" - "gorm.io/gorm/clause" -) - -// GetSettings 返回 public 和 private 两行配置。 -func GetSettings() (model.Settings, error) { - db, err := DB() - if err != nil { - return model.Settings{}, err - } - var items []model.Setting - if err := db.Find(&items).Error; err != nil { - return model.Settings{}, err - } - result := model.Settings{} - for _, item := range items { - if item.Key == model.SettingKeyPrivate { - _ = json.Unmarshal(item.Value, &result.Private) - } else if item.Key == model.SettingKeyPublic { - _ = json.Unmarshal(item.Value, &result.Public) - } - } - return result, nil -} - -// SaveSettings 保存 public 和 private 两行配置。 -func SaveSettings(settings model.Settings, now string) (model.Settings, error) { - db, err := DB() - if err != nil { - return settings, err - } - publicValue, _ := json.Marshal(settings.Public) - privateValue, _ := json.Marshal(settings.Private) - items := []model.Setting{ - {Key: model.SettingKeyPublic, Value: publicValue, CreatedAt: now, UpdatedAt: now}, - {Key: model.SettingKeyPrivate, Value: privateValue, CreatedAt: now, UpdatedAt: now}, - } - err = db.Clauses(clause.OnConflict{ - Columns: []clause.Column{{Name: "key"}}, - DoUpdates: clause.AssignmentColumns([]string{"value", "updated_at"}), - }).Create(&items).Error - return settings, err -} diff --git a/repository/user.go b/repository/user.go deleted file mode 100644 index 105a9b7..0000000 --- a/repository/user.go +++ /dev/null @@ -1,185 +0,0 @@ -package repository - -import ( - "errors" - "strings" - - "github.com/basketikun/infinite-canvas/model" - "gorm.io/gorm" -) - -// ListUsers 分页查询用户。 -func ListUsers(q model.Query) ([]model.User, int64, error) { - db, err := DB() - if err != nil { - return nil, 0, err - } - q.Normalize() - tx := db.Model(&model.User{}) - if keyword := strings.TrimSpace(q.Keyword); keyword != "" { - like := "%" + keyword + "%" - tx = tx.Where("username LIKE ? OR display_name LIKE ? OR email LIKE ? OR linux_do_id LIKE ?", like, like, like, like) - } - - var total int64 - if err := tx.Count(&total).Error; err != nil { - return nil, 0, err - } - - var users []model.User - err = tx.Order("created_at desc").Offset(q.Offset()).Limit(q.PageSize).Find(&users).Error - return users, total, err -} - -// CountUsers 返回用户总数。 -func CountUsers() (int64, error) { - db, err := DB() - if err != nil { - return 0, err - } - var total int64 - return total, db.Model(&model.User{}).Count(&total).Error -} - -// HasAdmin 判断系统中是否存在管理员。 -func HasAdmin() (bool, error) { - db, err := DB() - if err != nil { - return false, err - } - var total int64 - err = db.Model(&model.User{}).Where("role = ?", model.UserRoleAdmin).Count(&total).Error - return total > 0, err -} - -// GetUserByID 根据 ID 查询用户。 -func GetUserByID(id string) (model.User, bool, error) { - db, err := DB() - if err != nil { - return model.User{}, false, err - } - return findUser(db, "id = ?", id) -} - -// GetUserByUsername 根据用户名查询用户。 -func GetUserByUsername(username string) (model.User, bool, error) { - db, err := DB() - if err != nil { - return model.User{}, false, err - } - return findUser(db, "username = ?", username) -} - -// SaveUser 保存用户信息。 -func SaveUser(user model.User) (model.User, error) { - db, err := DB() - if err != nil { - return user, err - } - return user, db.Save(&user).Error -} - -func ConsumeUserCredits(id string, credits int, now string) (model.User, bool, error) { - db, err := DB() - if err != nil { - return model.User{}, false, err - } - if credits <= 0 { - user, ok, err := GetUserByID(id) - return user, ok, err - } - tx := db.Model(&model.User{}).Where("id = ? AND credits >= ?", id, credits).Updates(map[string]any{ - "credits": gorm.Expr("credits - ?", credits), - "updated_at": now, - }) - if tx.Error != nil { - return model.User{}, false, tx.Error - } - user, ok, err := GetUserByID(id) - return user, ok && tx.RowsAffected > 0, err -} - -func RefundUserCredits(id string, credits int, now string) (model.User, bool, error) { - db, err := DB() - if err != nil { - return model.User{}, false, err - } - if credits <= 0 { - user, ok, err := GetUserByID(id) - return user, ok, err - } - tx := db.Model(&model.User{}).Where("id = ?", id).Updates(map[string]any{ - "credits": gorm.Expr("credits + ?", credits), - "updated_at": now, - }) - if tx.Error != nil { - return model.User{}, false, tx.Error - } - user, ok, err := GetUserByID(id) - return user, ok && tx.RowsAffected > 0, err -} - -// SaveCreditLog 保存算力点变更流水。 -func SaveCreditLog(log model.CreditLog) (model.CreditLog, error) { - db, err := DB() - if err != nil { - return log, err - } - return log, db.Save(&log).Error -} - -func ListCreditLogs(q model.Query) ([]model.CreditLog, int64, error) { - db, err := DB() - if err != nil { - return nil, 0, err - } - q.Normalize() - tx := db.Model(&model.CreditLog{}) - if keyword := strings.TrimSpace(q.Keyword); keyword != "" { - like := "%" + keyword + "%" - tx = tx.Where("user_id LIKE ? OR type LIKE ? OR remark LIKE ? OR related_id LIKE ?", like, like, like, like) - } - var total int64 - if err := tx.Count(&total).Error; err != nil { - return nil, 0, err - } - var logs []model.CreditLog - err = tx.Order("created_at desc").Offset(q.Offset()).Limit(q.PageSize).Find(&logs).Error - return logs, total, err -} - -func DeleteCreditLog(id string) error { - db, err := DB() - if err != nil { - return err - } - return db.Delete(&model.CreditLog{}, "id = ?", id).Error -} - -// DeleteUser 删除指定用户。 -func DeleteUser(id string) error { - db, err := DB() - if err != nil { - return err - } - return db.Delete(&model.User{}, "id = ?", id).Error -} - -// GetUserByLinuxDoID 根据 Linux.do ID 查询用户。 -func GetUserByLinuxDoID(id string) (model.User, bool, error) { - db, err := DB() - if err != nil { - return model.User{}, false, err - } - return findUser(db, "linux_do_id = ?", id) -} - -// findUser 查询单个用户，并将未命中转换为 ok=false。 -func findUser(db *gorm.DB, query string, args ...any) (model.User, bool, error) { - user := model.User{} - err := db.Where(query, args...).First(&user).Error - if errors.Is(err, gorm.ErrRecordNotFound) { - return model.User{}, false, nil - } - return user, err == nil, err -} diff --git a/router/router.go b/router/router.go deleted file mode 100644 index ae9fb7b..0000000 --- a/router/router.go +++ /dev/null @@ -1,83 +0,0 @@ -package router - -import ( - "net/http" - - "github.com/basketikun/infinite-canvas/handler" - "github.com/basketikun/infinite-canvas/middleware" - "github.com/gin-gonic/gin" -) - -func New() *gin.Engine { - router := gin.Default() - router.RedirectTrailingSlash = false - _ = router.SetTrustedProxies(nil) - api := router.Group("/api") - api.GET("/health", func(c *gin.Context) { - c.String(http.StatusOK, "ok") - }) - api.POST("/auth/register", gin.WrapF(handler.Register)) - api.POST("/auth/login", gin.WrapF(handler.Login)) - api.GET("/auth/linux-do/authorize", gin.WrapF(handler.LinuxDoAuthorize)) - api.GET("/auth/linux-do/callback", gin.WrapF(handler.LinuxDoCallback)) - api.GET("/auth/me", middleware.OptionalAuth, gin.WrapF(handler.CurrentUser)) - api.GET("/settings", gin.WrapF(handler.Settings)) - api.GET("/media/references/:id", func(c *gin.Context) { - handler.ReferenceMedia(c.Writer, c.Request, c.Param("id")) - }) - api.HEAD("/media/references/:id", func(c *gin.Context) { - handler.ReferenceMedia(c.Writer, c.Request, c.Param("id")) - }) - v1 := api.Group("/v1", middleware.UserAuth) - v1.POST("/images/generations", gin.WrapF(handler.AIImagesGenerations)) - v1.POST("/images/edits", gin.WrapF(handler.AIImagesEdits)) - v1.POST("/chat/completions", gin.WrapF(handler.AIChatCompletions)) - v1.POST("/audio/speech", gin.WrapF(handler.AIAudioSpeech)) - v1.POST("/videos", gin.WrapF(handler.AIVideos)) - v1.POST("/media/references", gin.WrapF(handler.UploadReferenceMedia)) - v1.GET("/videos/:id", func(c *gin.Context) { - handler.AIVideo(c.Writer, c.Request, c.Param("id")) - }) - v1.GET("/videos/:id/content", func(c *gin.Context) { - handler.AIVideoContent(c.Writer, c.Request, c.Param("id")) - }) - api.GET("/prompts", middleware.OptionalAuth, gin.WrapF(handler.Prompts)) - api.GET("/assets", middleware.OptionalAuth, gin.WrapF(handler.Assets)) - api.POST("/admin/login", gin.WrapF(handler.AdminLogin)) - - admin := api.Group("/admin", middleware.AdminAuth) - admin.GET("/users", gin.WrapF(handler.AdminUsers)) - admin.POST("/users", gin.WrapF(handler.AdminSaveUser)) - admin.POST("/users/:id/credits", func(c *gin.Context) { - handler.AdminAdjustUserCredits(c.Writer, c.Request, c.Param("id")) - }) - admin.DELETE("/users/:id", func(c *gin.Context) { - handler.AdminDeleteUser(c.Writer, c.Request, c.Param("id")) - }) - admin.GET("/credit-logs", gin.WrapF(handler.AdminCreditLogs)) - admin.POST("/credit-logs", gin.WrapF(handler.AdminSaveCreditLog)) - admin.DELETE("/credit-logs/:id", func(c *gin.Context) { - handler.AdminDeleteCreditLog(c.Writer, c.Request, c.Param("id")) - }) - admin.GET("/settings", gin.WrapF(handler.AdminSettings)) - admin.POST("/settings", gin.WrapF(handler.AdminSaveSettings)) - admin.POST("/settings/channel-models", gin.WrapF(handler.AdminChannelModels)) - admin.POST("/settings/channel-test", gin.WrapF(handler.AdminTestChannelModel)) - admin.GET("/prompt-categories", gin.WrapF(handler.AdminPromptCategories)) - admin.POST("/prompt-categories/sync", gin.WrapF(handler.AdminSyncPromptCategories)) - admin.GET("/prompts", gin.WrapF(handler.AdminPrompts)) - admin.POST("/prompts", gin.WrapF(handler.AdminSavePrompt)) - admin.POST("/prompts/batch-delete", gin.WrapF(handler.AdminDeletePrompts)) - admin.DELETE("/prompts/:id", func(c *gin.Context) { - handler.AdminDeletePrompt(c.Writer, c.Request, c.Param("id")) - }) - admin.GET("/assets", gin.WrapF(handler.AdminAssets)) - admin.POST("/assets", gin.WrapF(handler.AdminSaveAsset)) - admin.DELETE("/assets/:id", func(c *gin.Context) { - handler.AdminDeleteAsset(c.Writer, c.Request, c.Param("id")) - }) - - router.NoRoute(middleware.NotFoundJSON) - - return router -} diff --git a/service/assets.go b/service/assets.go deleted file mode 100644 index 34aac06..0000000 --- a/service/assets.go +++ /dev/null @@ -1,50 +0,0 @@ -package service - -import ( - "time" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/repository" -) - -func ListAssets(q model.Query) (model.AssetList, error) { - items, total, err := repository.ListAssets(q) - if err != nil { - return model.AssetList{}, err - } - tags, err := repository.ListAssetTags(q) - if err != nil { - return model.AssetList{}, err - } - return model.AssetList{Items: items, Tags: tags, Total: int(total)}, nil -} - -func SaveAsset(item model.Asset) (model.Asset, error) { - now := time.Now().Format(time.RFC3339) - if item.Type == "" { - item.Type = model.AssetTypeText - } - if item.ID == "" { - item.ID = newID("asset") - item.CreatedAt = now - } - item.UpdatedAt = now - if item.CoverURL == "" { - item.CoverURL = assetCoverURL(item) - } - return repository.SaveAsset(item) -} - -func DeleteAsset(id string) error { - return repository.DeleteAsset(id) -} - -func assetCoverURL(item model.Asset) string { - if item.CoverURL != "" { - return item.CoverURL - } - if item.Type == model.AssetTypeImage { - return item.URL - } - return "" -} diff --git a/service/auth.go b/service/auth.go deleted file mode 100644 index e518268..0000000 --- a/service/auth.go +++ /dev/null @@ -1,590 +0,0 @@ -package service - -import ( - "bytes" - "encoding/base64" - "encoding/json" - "errors" - "fmt" - "io" - "log" - "net/http" - "net/url" - "strings" - "time" - - "github.com/basketikun/infinite-canvas/config" - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/repository" - "github.com/golang-jwt/jwt/v5" - "github.com/google/uuid" - "golang.org/x/crypto/bcrypt" -) - -type TokenClaims struct { - UserID string `json:"userId"` - Username string `json:"username"` - Role model.UserRole `json:"role"` - jwt.RegisteredClaims -} - -type userExtra struct { - LinuxDo any `json:"linuxDo,omitempty"` -} - -func EnsureDefaultAdmin() error { - if strings.TrimSpace(config.Cfg.AdminUsername) == "" || strings.TrimSpace(config.Cfg.AdminPassword) == "" { - return nil - } - WarnDefaultSecurityConfig() - hasAdmin, err := repository.HasAdmin() - if err != nil || hasAdmin { - return err - } - hash, err := hashPassword(config.Cfg.AdminPassword) - if err != nil { - return err - } - _, err = repository.SaveUser(model.User{ - ID: newID("user"), - Username: strings.TrimSpace(config.Cfg.AdminUsername), - Password: hash, - Role: model.UserRoleAdmin, - AffCode: newAffCode(), - Status: model.UserStatusActive, - CreatedAt: now(), - UpdatedAt: now(), - }) - return err -} - -func Register(username string, password string) (model.AuthSession, error) { - settings, err := repository.GetSettings() - if err != nil { - return model.AuthSession{}, err - } - normalizedSettings := normalizeSettings(settings) - if normalizedSettings.Public.Auth.AllowRegister != nil && !*normalizedSettings.Public.Auth.AllowRegister { - return model.AuthSession{}, safeMessageError{message: "当前未开放注册"} - } - username = strings.TrimSpace(username) - if strings.ContainsAny(username, " \t\r\n") { - return model.AuthSession{}, safeMessageError{message: "用户名不能包含空格"} - } - if username == "" || password == "" { - return model.AuthSession{}, safeMessageError{message: "用户名和密码不能为空"} - } - if _, ok, err := repository.GetUserByUsername(username); err != nil || ok { - if err != nil { - return model.AuthSession{}, err - } - return model.AuthSession{}, safeMessageError{message: "用户名已存在"} - } - hash, err := hashPassword(password) - if err != nil { - return model.AuthSession{}, err - } - user, err := repository.SaveUser(model.User{ - ID: newID("user"), - Username: username, - Password: hash, - Role: model.UserRoleUser, - AffCode: newAffCode(), - Status: model.UserStatusActive, - CreatedAt: now(), - UpdatedAt: now(), - }) - if err != nil { - return model.AuthSession{}, err - } - return newSession(user) -} - -func Login(username string, password string) (model.AuthSession, error) { - user, ok, err := repository.GetUserByUsername(strings.TrimSpace(username)) - if err != nil { - return model.AuthSession{}, err - } - if !ok || bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)) != nil { - return model.AuthSession{}, safeMessageError{message: "用户名或密码错误"} - } - if user.Status == model.UserStatusBan { - return model.AuthSession{}, safeMessageError{message: "账号已被禁用"} - } - normalizeUserDefaults(&user) - user.LastLoginAt = now() - user.UpdatedAt = now() - user, err = repository.SaveUser(user) - if err != nil { - return model.AuthSession{}, err - } - return newSession(user) -} - -func LinuxDoAuthorizeURL(r *http.Request, redirect string) (string, error) { - settings, err := repository.GetSettings() - if err != nil { - return "", err - } - settings = normalizeSettings(settings) - linuxDo := settings.Private.Auth.LinuxDo - if !settings.Public.Auth.LinuxDo.Enabled { - return "", safeMessageError{message: "Linux.do 登录未开启"} - } - if strings.TrimSpace(linuxDo.ClientID) == "" || strings.TrimSpace(linuxDo.ClientSecret) == "" { - return "", safeMessageError{message: "Linux.do 登录未配置"} - } - values := url.Values{} - values.Set("client_id", linuxDo.ClientID) - values.Set("redirect_uri", linuxDoRedirectURI(r)) - values.Set("response_type", "code") - values.Set("scope", "read") - values.Set("state", base64.RawURLEncoding.EncodeToString([]byte(redirect))) - return config.Cfg.LinuxDoAuthorizeURL + "?" + values.Encode(), nil -} - -func LoginWithLinuxDo(r *http.Request, code string, state string) (model.AuthSession, string, error) { - redirect := decodeState(state) - settings, err := repository.GetSettings() - if err != nil { - return model.AuthSession{}, redirect, err - } - settings = normalizeSettings(settings) - linuxDo := settings.Private.Auth.LinuxDo - if !settings.Public.Auth.LinuxDo.Enabled { - return model.AuthSession{}, redirect, safeMessageError{message: "Linux.do 登录未开启"} - } - token, err := linuxDoAccessToken(r, code, linuxDo) - if err != nil { - return model.AuthSession{}, redirect, err - } - profile, err := linuxDoProfile(token) - if err != nil { - return model.AuthSession{}, redirect, err - } - linuxDoID := fmt.Sprint(profile.ID) - if strings.TrimSpace(linuxDoID) == "" || linuxDoID == "0" { - return model.AuthSession{}, redirect, safeMessageError{message: "Linux.do 用户信息无效"} - } - user, ok, err := repository.GetUserByLinuxDoID(linuxDoID) - if err != nil { - return model.AuthSession{}, redirect, err - } - if !ok { - if settings.Public.Auth.AllowRegister != nil && !*settings.Public.Auth.AllowRegister { - return model.AuthSession{}, redirect, safeMessageError{message: "当前未开放注册"} - } - user = model.User{ - ID: newID("user"), - Username: linuxDoUsername(profile.Username, linuxDoID), - DisplayName: strings.TrimSpace(profile.Name), - AvatarURL: linuxDoAvatar(profile.AvatarTemplate), - Role: model.UserRoleUser, - AffCode: newAffCode(), - LinuxDoID: linuxDoID, - Status: model.UserStatusActive, - CreatedAt: now(), - } - } else if user.Status == model.UserStatusBan { - return model.AuthSession{}, redirect, safeMessageError{message: "账号已被禁用"} - } - user.DisplayName = firstNonEmpty(profile.Name, user.DisplayName) - user.AvatarURL = firstNonEmpty(linuxDoAvatar(profile.AvatarTemplate), user.AvatarURL) - user.LastLoginAt = now() - user.UpdatedAt = now() - extra, _ := json.Marshal(userExtra{LinuxDo: profile}) - user.Extra = string(extra) - user, err = repository.SaveUser(user) - if err != nil { - return model.AuthSession{}, redirect, err - } - session, err := newSession(user) - return session, redirect, err -} - -func ParseToken(tokenText string) (TokenClaims, error) { - claims := TokenClaims{} - token, err := jwt.ParseWithClaims(tokenText, &claims, func(token *jwt.Token) (any, error) { - if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { - return nil, errors.New("登录状态无效") - } - return []byte(config.Cfg.JWTSecret), nil - }) - if err != nil || !token.Valid { - return TokenClaims{}, errors.New("登录状态无效") - } - return claims, nil -} - -func CurrentAuthUser(tokenText string) (model.AuthUser, bool) { - claims, err := ParseToken(tokenText) - if err != nil { - return model.AuthUser{}, false - } - user, ok, err := repository.GetUserByID(claims.UserID) - if err != nil || !ok { - return model.AuthUser{}, false - } - if user.Status == model.UserStatusBan { - return model.AuthUser{}, false - } - return model.PublicUser(user), true -} - -func ListUsers(q model.Query) (model.UserList, error) { - users, total, err := repository.ListUsers(q) - if err != nil { - return model.UserList{}, err - } - for i := range users { - users[i].Password = "" - normalizeUserDefaults(&users[i]) - } - return model.UserList{Items: users, Total: int(total)}, nil -} - -func SaveUser(user model.User, password string) (model.User, error) { - user.Username = strings.TrimSpace(user.Username) - if strings.ContainsAny(user.Username, " \t\r\n") { - return user, safeMessageError{message: "用户名不能包含空格"} - } - if user.Username == "" { - return user, safeMessageError{message: "用户名不能为空"} - } - if user.Role == "" || user.Role == model.UserRoleGuest { - user.Role = model.UserRoleUser - } - if user.Status == "" { - user.Status = model.UserStatusActive - } - if saved, ok, err := repository.GetUserByUsername(user.Username); err != nil { - return user, err - } else if ok && saved.ID != user.ID { - return user, safeMessageError{message: "用户名已存在"} - } - isCreate := user.ID == "" - if isCreate { - user.ID = newID("user") - user.AffCode = newAffCode() - user.CreatedAt = now() - } else if saved, ok, err := repository.GetUserByID(user.ID); err != nil { - return user, err - } else if ok { - user.CreatedAt = saved.CreatedAt - user.Password = saved.Password - user.AvatarURL = saved.AvatarURL - user.Credits = saved.Credits - user.Extra = saved.Extra - if user.AffCode == "" { - user.AffCode = saved.AffCode - } - if user.AffCode == "" { - user.AffCode = newAffCode() - } - if user.LinuxDoID == "" { - user.LinuxDoID = saved.LinuxDoID - } - user.LastLoginAt = saved.LastLoginAt - } - if password != "" { - hash, err := hashPassword(password) - if err != nil { - return user, err - } - user.Password = hash - } - if isCreate && user.Password == "" { - return user, safeMessageError{message: "密码不能为空"} - } - user.UpdatedAt = now() - user, err := repository.SaveUser(user) - user.Password = "" - return user, err -} - -func AdjustUserCredits(id string, credits int) (model.User, error) { - user, ok, err := repository.GetUserByID(id) - if err != nil || !ok { - if err != nil { - return user, err - } - return user, safeMessageError{message: "用户不存在"} - } - oldCredits := user.Credits - user.Credits = credits - user.UpdatedAt = now() - user, err = repository.SaveUser(user) - if err == nil && oldCredits != credits { - _, err = repository.SaveCreditLog(model.CreditLog{ - ID: newID("credit"), - UserID: user.ID, - Type: model.CreditLogTypeAdminAdjust, - Amount: credits - oldCredits, - Balance: credits, - Remark: "后台手动调整", - CreatedAt: now(), - }) - } - user.Password = "" - return user, err -} - -func ConsumeUserCredits(userID string, modelName string, credits int, path string) error { - if credits <= 0 { - return nil - } - user, ok, err := repository.ConsumeUserCredits(userID, credits, now()) - if err != nil { - return err - } - if !ok { - return safeMessageError{message: "算力点不足"} - } - extra, _ := json.Marshal(map[string]string{"model": modelName, "path": path}) - _, err = repository.SaveCreditLog(model.CreditLog{ - ID: newID("credit"), - UserID: userID, - Type: model.CreditLogTypeAIConsume, - Amount: -credits, - Balance: user.Credits, - Remark: "调用模型 " + modelName, - Extra: string(extra), - CreatedAt: now(), - }) - return err -} - -func RefundUserCredits(userID string, modelName string, credits int, path string) error { - if credits <= 0 { - return nil - } - user, ok, err := repository.RefundUserCredits(userID, credits, now()) - if err != nil { - return err - } - if !ok { - return safeMessageError{message: "用户不存在"} - } - extra, _ := json.Marshal(map[string]string{"model": modelName, "path": path}) - _, err = repository.SaveCreditLog(model.CreditLog{ - ID: newID("credit"), - UserID: userID, - Type: model.CreditLogTypeAIRefund, - Amount: credits, - Balance: user.Credits, - Remark: "模型调用失败返还 " + modelName, - Extra: string(extra), - CreatedAt: now(), - }) - return err -} - -func ListCreditLogs(q model.Query) (model.CreditLogList, error) { - logs, total, err := repository.ListCreditLogs(q) - if err != nil { - return model.CreditLogList{}, err - } - return model.CreditLogList{Items: logs, Total: int(total)}, nil -} - -func SaveCreditLog(log model.CreditLog) (model.CreditLog, error) { - if log.ID == "" { - log.ID = newID("credit") - log.CreatedAt = now() - } - return repository.SaveCreditLog(log) -} - -func DeleteCreditLog(id string) error { - return repository.DeleteCreditLog(id) -} - -func DeleteUser(id string) error { - return repository.DeleteUser(id) -} - -func GuestUser() model.AuthUser { - return model.AuthUser{ID: "", Username: "guest", Role: model.UserRoleGuest} -} - -func newSession(user model.User) (model.AuthSession, error) { - token, err := newToken(user) - if err != nil { - return model.AuthSession{}, err - } - return model.AuthSession{Token: token, User: model.PublicUser(user)}, nil -} - -func newToken(user model.User) (string, error) { - expireHours := config.Cfg.JWTExpireHours - if expireHours <= 0 { - expireHours = 168 - } - claims := TokenClaims{ - UserID: user.ID, - Username: user.Username, - Role: user.Role, - RegisteredClaims: jwt.RegisteredClaims{ - ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Duration(expireHours) * time.Hour)), - IssuedAt: jwt.NewNumericDate(time.Now()), - Subject: user.ID, - }, - } - return jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString([]byte(config.Cfg.JWTSecret)) -} - -func hashPassword(password string) (string, error) { - hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) - return string(hash), err -} - -func now() string { - return time.Now().Format(time.RFC3339) -} - -func newID(prefix string) string { - return prefix + "-" + uuid.NewString() -} - -func newAffCode() string { - return strings.ToUpper(strings.ReplaceAll(uuid.NewString()[:8], "-", "")) -} - -func normalizeUserDefaults(user *model.User) { - if user.Status == "" { - user.Status = model.UserStatusActive - } - if user.AffCode == "" { - user.AffCode = newAffCode() - } -} - -type linuxDoTokenResponse struct { - AccessToken string `json:"access_token"` -} - -type linuxDoUserResponse struct { - ID int64 `json:"id"` - Username string `json:"username"` - Name string `json:"name"` - AvatarTemplate string `json:"avatar_template"` -} - -func linuxDoAccessToken(r *http.Request, code string, setting model.PrivateLinuxDoAuthSetting) (string, error) { - values := url.Values{} - values.Set("client_id", setting.ClientID) - values.Set("client_secret", setting.ClientSecret) - values.Set("grant_type", "authorization_code") - values.Set("code", code) - values.Set("redirect_uri", linuxDoRedirectURI(r)) - req, _ := http.NewRequest(http.MethodPost, config.Cfg.LinuxDoTokenURL, strings.NewReader(values.Encode())) - req.Header.Set("Content-Type", "application/x-www-form-urlencoded") - var payload linuxDoTokenResponse - if err := doLinuxDoJSON(req, &payload); err != nil { - return "", err - } - if strings.TrimSpace(payload.AccessToken) == "" { - return "", safeMessageError{message: "Linux.do 登录失败"} - } - return payload.AccessToken, nil -} - -func linuxDoRedirectURI(r *http.Request) string { - return RequestOrigin(r) + "/api/auth/linux-do/callback" -} - -func linuxDoProfile(token string) (linuxDoUserResponse, error) { - req, _ := http.NewRequest(http.MethodGet, config.Cfg.LinuxDoUserInfoURL, nil) - req.Header.Set("Authorization", "Bearer "+token) - var payload linuxDoUserResponse - err := doLinuxDoJSON(req, &payload) - return payload, err -} - -func doLinuxDoJSON(req *http.Request, payload any) error { - resp, err := http.DefaultClient.Do(req) - if err != nil { - return err - } - defer resp.Body.Close() - body, _ := io.ReadAll(resp.Body) - if resp.StatusCode < 200 || resp.StatusCode >= 300 { - return safeMessageError{message: "Linux.do 登录失败"} - } - return json.NewDecoder(bytes.NewReader(body)).Decode(payload) -} - -func linuxDoUsername(username string, id string) string { - base := strings.TrimSpace(username) - if base == "" { - base = "linuxdo-" + id - } - if _, ok, err := repository.GetUserByUsername(base); err != nil || !ok { - return base - } - return base + "-" + id -} - -func linuxDoAvatar(template string) string { - if strings.TrimSpace(template) == "" { - return "" - } - if strings.HasPrefix(template, "//") { - template = "https:" + template - } - if strings.HasPrefix(template, "/") { - template = "https://linux.do" + template - } - return strings.ReplaceAll(template, "{size}", "120") -} - -func decodeState(state string) string { - data, err := base64.RawURLEncoding.DecodeString(state) - if err != nil { - return "/" - } - return safeRedirectPath(string(data)) -} - -// safeRedirectPath 仅放行站内相对路径，拦截开放重定向。浏览器会忽略 URL 中的 -// Tab/换行/回车，并把 //host 或 /\host 解析为协议相对的跨站地址，因此先剥离这些 -// 控制字符，再拒绝 // 与 /\ 前缀。 -func safeRedirectPath(redirect string) string { - cleaned := strings.Map(func(r rune) rune { - if r == '\t' || r == '\n' || r == '\r' { - return -1 - } - return r - }, redirect) - if !strings.HasPrefix(cleaned, "/") || strings.HasPrefix(cleaned, "//") || strings.HasPrefix(cleaned, "/\\") { - return "/" - } - return cleaned -} - -func RequestOrigin(r *http.Request) string { - host := strings.TrimSpace(r.Header.Get("X-Forwarded-Host")) - if host == "" { - host = r.Host - } - proto := strings.TrimSpace(r.Header.Get("X-Forwarded-Proto")) - if proto == "" { - proto = "http" - } - return proto + "://" + host -} - -func firstNonEmpty(values ...string) string { - for _, value := range values { - if strings.TrimSpace(value) != "" { - return value - } - } - return "" -} - -func WarnDefaultSecurityConfig() { - if config.Cfg.AdminUsername == "admin" && config.Cfg.AdminPassword == "infinite-canvas" { - log.Println("WARNING: using default admin credentials, please set ADMIN_USERNAME and ADMIN_PASSWORD to safer values before deployment") - } -} diff --git a/service/auth_redirect_test.go b/service/auth_redirect_test.go deleted file mode 100644 index de17b35..0000000 --- a/service/auth_redirect_test.go +++ /dev/null @@ -1,41 +0,0 @@ -package service - -import ( - "encoding/base64" - "testing" -) - -func TestSafeRedirectPath(t *testing.T) { - cases := map[string]string{ - "/": "/", - "/canvas/abc": "/canvas/abc", - "/login?redirect=/x": "/login?redirect=/x", - "": "/", - "//evil.com": "/", - "/\\evil.com": "/", - "https://evil.com": "/", - "http://evil.com": "/", - "javascript:alert(1)": "/", - "evil.com": "/", - "/\t/evil.com": "/", // browsers strip the tab → //evil.com - "/normal\tpath": "/normalpath", - } - for in, want := range cases { - if got := safeRedirectPath(in); got != want { - t.Errorf("safeRedirectPath(%q) = %q, want %q", in, got, want) - } - } -} - -func TestDecodeStateRejectsOpenRedirect(t *testing.T) { - for _, in := range []string{"//evil.com", "/\\evil.com", "https://evil.com"} { - state := base64.RawURLEncoding.EncodeToString([]byte(in)) - if got := decodeState(state); got != "/" { - t.Errorf("decodeState(state(%q)) = %q, want \"/\"", in, got) - } - } - state := base64.RawURLEncoding.EncodeToString([]byte("/canvas/1")) - if got := decodeState(state); got != "/canvas/1" { - t.Errorf("decodeState(state(/canvas/1)) = %q, want /canvas/1", got) - } -} diff --git a/service/context.go b/service/context.go deleted file mode 100644 index 8e1da5c..0000000 --- a/service/context.go +++ /dev/null @@ -1,18 +0,0 @@ -package service - -import ( - "context" - - "github.com/basketikun/infinite-canvas/model" -) - -type userContextKey struct{} - -func WithUser(ctx context.Context, user model.AuthUser) context.Context { - return context.WithValue(ctx, userContextKey{}, user) -} - -func UserFromContext(ctx context.Context) (model.AuthUser, bool) { - user, ok := ctx.Value(userContextKey{}).(model.AuthUser) - return user, ok -} diff --git a/service/prompt_fetch.go b/service/prompt_fetch.go deleted file mode 100644 index 66af4f9..0000000 --- a/service/prompt_fetch.go +++ /dev/null @@ -1,349 +0,0 @@ -package service - -import ( - "encoding/json" - "errors" - "io" - "net/http" - "regexp" - "strconv" - "strings" - "time" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/repository" -) - -const ( - gptImage2RawBase = "https://raw.githubusercontent.com/EvoLinkAI/awesome-gpt-image-2-API-and-Prompts/main" - awesomeGptImageRawBase = "https://raw.githubusercontent.com/ZeroLu/awesome-gpt-image/main" - awesomeGpt4oImagePromptsBase = "https://raw.githubusercontent.com/ImgEdify/Awesome-GPT4o-Image-Prompts/main" - youMindGptImage2RawBase = "https://raw.githubusercontent.com/YouMind-OpenLab/awesome-gpt-image-2/main" - youMindNanoBananaProRawBase = "https://raw.githubusercontent.com/YouMind-OpenLab/awesome-nano-banana-pro-prompts/main" - davidWuGptImage2RawBase = "https://raw.githubusercontent.com/davidwuw0811-boop/awesome-gpt-image2-prompts/main" -) - -var gptImage2CaseFiles = []string{"README.md", "cases/ad-creative.md", "cases/character.md", "cases/comparison.md", "cases/ecommerce.md", "cases/portrait.md", "cases/poster.md", "cases/ui.md"} - -type gptImage2Data struct { - Records []struct { - Title string `json:"title"` - TweetURL string `json:"tweet_url"` - ImageDir string `json:"image_dir"` - Category string `json:"category"` - AddedAt string `json:"added_at"` - } `json:"records"` -} - -type davidWuGptImage2Prompt struct { - ID int `json:"id"` - TitleEN string `json:"title_en"` - TitleCN string `json:"title_cn"` - Category string `json:"category"` - CategoryCN string `json:"category_cn"` - Prompt string `json:"prompt"` - Note string `json:"note"` - Author string `json:"author"` - Source string `json:"source"` - NeedsRef bool `json:"needs_ref"` - Image string `json:"image"` -} - -func SyncPromptCategory(category string) ([]model.PromptCategory, error) { - for _, item := range repository.PromptCategories() { - if item.Category != category { - continue - } - items, err := buildPromptCategory(item.Category) - if err != nil { - return nil, err - } - if err := repository.ReplacePromptCategory(item, items); err != nil { - return nil, err - } - return repository.ListPromptCategories() - } - return nil, errors.New("未知提示词分类") -} - -func buildPromptCategory(category string) ([]model.Prompt, error) { - switch category { - case "gpt-image-2-prompts": - return buildGptImage2Prompts() - case "awesome-gpt-image": - return buildAwesomeGptImagePrompts() - case "awesome-gpt4o-image-prompts": - return buildAwesomeGpt4oImagePrompts() - case "youmind-gpt-image-2": - return buildYouMindGptImage2Prompts() - case "youmind-nano-banana-pro": - return buildYouMindNanoBananaProPrompts() - case "davidwu-gpt-image2-prompts": - return buildDavidWuGptImage2Prompts() - } - return nil, errors.New("未知提示词分类") -} - -func fetchText(baseURL, file string) (string, error) { - request, _ := http.NewRequest(http.MethodGet, baseURL+"/"+file, nil) - client := http.Client{Timeout: 30 * time.Second} - response, err := client.Do(request) - if err != nil { - return "", err - } - defer response.Body.Close() - if response.StatusCode < 200 || response.StatusCode >= 300 { - return "", errors.New(file + " 拉取失败") - } - data, err := io.ReadAll(response.Body) - return string(data), err -} - -func buildGptImage2Prompts() ([]model.Prompt, error) { - cases := map[string]string{} - raw, err := fetchText(gptImage2RawBase, "data/ingested_tweets.json") - if err != nil { - return nil, err - } - data := gptImage2Data{} - if err := json.Unmarshal([]byte(raw), &data); err != nil { - return nil, err - } - for _, file := range gptImage2CaseFiles { - markdown, err := fetchText(gptImage2RawBase, file) - if err != nil { - return nil, err - } - collectGptImage2Cases(cases, markdown) - } - items := []model.Prompt{} - for _, item := range data.Records { - prompt := cases[item.TweetURL] - if prompt == "" { - continue - } - image := gptImage2RawBase + "/" + item.ImageDir + "/output.jpg" - items = append(items, model.Prompt{ID: "gpt-image-2-prompts-" + leftPad(len(items)+1), Title: item.Title, CoverURL: image, Prompt: prompt, Tags: tagsFromCategory(item.Category), CreatedAt: item.AddedAt, UpdatedAt: item.AddedAt, Preview: markdownPreview([]string{image})}) - } - return items, nil -} - -func collectGptImage2Cases(cases map[string]string, markdown string) { - re := regexp.MustCompile("(?s)### Case \\d+: \\[[^\\]]+\\]\\(([^)]+)\\).*?\\*\\*Prompt:\\*\\*\\s*\\r?\\n\\s*```[\\w-]*\\r?\\n(.*?)\\r?\\n```") - for _, match := range re.FindAllStringSubmatch(markdown, -1) { - cases[match[1]] = strings.TrimSpace(match[2]) - } -} - -func buildAwesomeGptImagePrompts() ([]model.Prompt, error) { - markdown, err := fetchText(awesomeGptImageRawBase, "README.zh-CN.md") - if err != nil { - return nil, err - } - items := []model.Prompt{} - for _, section := range splitBeforeHeading(markdown, "## ") { - tags := tagsFromHeading(firstMatch(section, `(?m)^##\s+(.+)$`)) - for _, block := range splitBeforeHeading(section, "### ") { - title := strings.TrimSpace(regexp.MustCompile(`\[([^\]]+)]\([^)]+\)`).ReplaceAllString(firstMatch(block, `(?m)^###\s+(.+)$`), "$1")) - prompt := strings.TrimSpace(firstMatch(block, "(?s)\\*\\*提示词:\\*\\*\\s*\\r?\\n\\s*```[\\w-]*\\r?\\n(.*?)\\r?\\n```")) - if title == "" || prompt == "" { - continue - } - images := extractMarkdownImages(awesomeGptImageRawBase, block) - cover := "" - if len(images) > 0 { - cover = images[0] - } - items = append(items, model.Prompt{ID: "awesome-gpt-image-" + leftPad(len(items)+1), Title: title, CoverURL: cover, Prompt: prompt, Tags: tags, Preview: markdownPreview(images)}) - } - } - return items, nil -} - -func buildAwesomeGpt4oImagePrompts() ([]model.Prompt, error) { - markdown, err := fetchText(awesomeGpt4oImagePromptsBase, "README.zh-CN.md") - if err != nil { - return nil, err - } - items := []model.Prompt{} - for _, block := range splitBeforeHeading(markdown, "### ") { - title := strings.TrimSpace(firstMatch(block, `(?m)^###\s+(.+)$`)) - prompt := strings.TrimSpace(firstMatch(block, "(?s)- \\*\\*提示词文本：\\*\\*\\s*`(.*?)`")) - if title == "" || prompt == "" { - continue - } - images := extractMarkdownImages(awesomeGpt4oImagePromptsBase, block) - cover := "" - if len(images) > 0 { - cover = images[0] - } - items = append(items, model.Prompt{ID: "awesome-gpt4o-image-prompts-" + leftPad(len(items)+1), Title: title, CoverURL: cover, Prompt: prompt, Tags: []string{"gpt4o"}, Preview: markdownPreview(images)}) - } - return items, nil -} - -func buildYouMindGptImage2Prompts() ([]model.Prompt, error) { - return buildYouMindPrompts(youMindGptImage2RawBase, "youmind-gpt-image-2", "gpt-image-2") -} - -func buildYouMindNanoBananaProPrompts() ([]model.Prompt, error) { - return buildYouMindPrompts(youMindNanoBananaProRawBase, "youmind-nano-banana-pro", "nano-banana-pro") -} - -func buildDavidWuGptImage2Prompts() ([]model.Prompt, error) { - raw, err := fetchText(davidWuGptImage2RawBase, "prompts.json") - if err != nil { - return nil, err - } - data := []davidWuGptImage2Prompt{} - if err := json.Unmarshal([]byte(raw), &data); err != nil { - return nil, err - } - items := []model.Prompt{} - for _, item := range data { - title := strings.TrimSpace(item.TitleCN) - if title == "" { - title = strings.TrimSpace(item.TitleEN) - } - prompt := strings.TrimSpace(item.Prompt) - if title == "" || prompt == "" { - continue - } - image := absoluteImage(davidWuGptImage2RawBase, item.Image) - items = append(items, model.Prompt{ID: "davidwu-gpt-image2-prompts-" + leftPad(item.ID), Title: title, CoverURL: image, Prompt: prompt, Tags: davidWuGptImage2Tags(item), Preview: davidWuGptImage2Preview(item, image)}) - } - return items, nil -} - -func buildYouMindPrompts(baseURL, idPrefix, modelTag string) ([]model.Prompt, error) { - markdown, err := fetchText(baseURL, "README_zh.md") - if err != nil { - return nil, err - } - items := []model.Prompt{} - for _, block := range splitBeforeHeading(markdown, "### ") { - title := strings.TrimSpace(firstMatch(block, `(?m)^###\s+No\.\s*\d+:\s*(.+)$`)) - prompt := strings.TrimSpace(firstMatch(block, "(?s)#### .*?提示词\\s*\\r?\\n\\s*```[\\w-]*\\r?\\n(.*?)\\r?\\n```")) - if title == "" || prompt == "" { - continue - } - images := extractMarkdownImages(baseURL, block) - cover := "" - if len(images) > 0 { - cover = images[0] - } - items = append(items, model.Prompt{ID: idPrefix + "-" + leftPad(len(items)+1), Title: title, CoverURL: cover, Prompt: prompt, Tags: youMindTags(title, modelTag), Preview: markdownPreview(images)}) - } - return items, nil -} - -func splitBeforeHeading(markdown string, prefix string) []string { - blocks := []string{} - lines := strings.Split(markdown, "\n") - current := []string{} - for _, line := range lines { - if strings.HasPrefix(line, prefix) && len(current) > 0 { - blocks = append(blocks, strings.Join(current, "\n")) - current = []string{} - } - current = append(current, line) - } - return append(blocks, strings.Join(current, "\n")) -} - -func firstMatch(value string, pattern string) string { - match := regexp.MustCompile(pattern).FindStringSubmatch(value) - if len(match) > 1 { - return match[1] - } - return "" -} - -func tagsFromCategory(category string) []string { - return splitTags(regexp.MustCompile(`(?i)\s+Cases$`).ReplaceAllString(category, ""), `\s*(&|and)\s*`) -} - -func tagsFromHeading(heading string) []string { - return splitTags(regexp.MustCompile(`[^\p{L}\p{N}/&、与 ]`).ReplaceAllString(heading, ""), `\s*(/|&|、|与)\s*`) -} - -func youMindTags(title, modelTag string) []string { - tags := []string{modelTag} - parts := strings.SplitN(title, " - ", 2) - if len(parts) > 1 { - tags = append(tags, tagsFromHeading(parts[0])...) - } - return tags -} - -func davidWuGptImage2Tags(item davidWuGptImage2Prompt) []string { - tags := splitTags(strings.Join([]string{item.CategoryCN, item.Category, item.Author, item.Source}, "/"), `/`) - if item.NeedsRef { - tags = append(tags, "需要参考图") - } - return tags -} - -func davidWuGptImage2Preview(item davidWuGptImage2Prompt, image string) string { - lines := []string{} - if item.TitleEN != "" { - lines = append(lines, item.TitleEN) - } - if item.Note != "" { - lines = append(lines, item.Note) - } - if image != "" { - lines = append(lines, "![]("+image+")") - } - return strings.Join(lines, "\n\n") -} - -func splitTags(value string, pattern string) []string { - tags := []string{} - for _, tag := range regexp.MustCompile(pattern).Split(value, -1) { - if tag = strings.ToLower(strings.TrimSpace(tag)); tag != "" { - tags = append(tags, tag) - } - } - return tags -} - -func markdownPreview(images []string) string { - lines := []string{} - for _, image := range images { - if image != "" { - lines = append(lines, "![]("+image+")") - } - } - return strings.Join(lines, "\n\n") -} - -func extractMarkdownImages(baseURL string, block string) []string { - seen := map[string]bool{} - images := []string{} - for _, pattern := range []string{`]+src="([^"]+)"`, `!\[[^\]]*]\(([^)]+)\)`} { - for _, match := range regexp.MustCompile(pattern).FindAllStringSubmatch(block, -1) { - image := absoluteImage(baseURL, match[1]) - if image != "" && !seen[image] { - seen[image] = true - images = append(images, image) - } - } - } - return images -} - -func absoluteImage(baseURL, image string) string { - if image == "" || strings.HasPrefix(image, "http://") || strings.HasPrefix(image, "https://") { - return image - } - return baseURL + "/" + strings.TrimLeft(strings.TrimPrefix(image, "."), "/") -} - -func leftPad(value int) string { - if value >= 1000 { - return strconv.Itoa(value) - } - text := "000" + strconv.Itoa(value) - return text[len(text)-3:] -} diff --git a/service/prompt_sync_scheduler.go b/service/prompt_sync_scheduler.go deleted file mode 100644 index 387864c..0000000 --- a/service/prompt_sync_scheduler.go +++ /dev/null @@ -1,74 +0,0 @@ -package service - -import ( - "log" - "sync" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/repository" - "github.com/robfig/cron/v3" -) - -const defaultPromptSyncCron = "*/5 * * * *" - -var ( - promptSyncCron *cron.Cron - promptSyncOnce sync.Once - promptSyncMu sync.Mutex -) - -func StartPromptSyncScheduler() { - promptSyncOnce.Do(func() { - promptSyncCron = cron.New() - promptSyncCron.Start() - }) - RefreshPromptSyncScheduler() -} - -func RefreshPromptSyncScheduler() { - promptSyncMu.Lock() - defer promptSyncMu.Unlock() - if promptSyncCron == nil { - return - } - for _, entry := range promptSyncCron.Entries() { - promptSyncCron.Remove(entry.ID) - } - settings, err := repository.GetSettings() - if err != nil { - log.Printf("load prompt sync setting failed err=%v", err) - return - } - setting := normalizePromptSyncSetting(settings.Private.PromptSync) - if setting.Enabled == nil || !*setting.Enabled { - return - } - if _, err := promptSyncCron.AddFunc(setting.Cron, SyncRemotePromptCategories); err != nil { - log.Printf("add prompt sync cron failed cron=%s err=%v", setting.Cron, err) - } -} - -func SyncRemotePromptCategories() { - for _, category := range repository.PromptCategories() { - if !category.Remote { - continue - } - log.Printf("scheduled prompt sync start category=%s", category.Category) - if _, err := SyncPromptCategory(category.Category); err != nil { - log.Printf("scheduled prompt sync failed category=%s err=%v", category.Category, err) - continue - } - log.Printf("scheduled prompt sync done category=%s", category.Category) - } -} - -func normalizePromptSyncSetting(setting model.PromptSyncSetting) model.PromptSyncSetting { - if setting.Cron == "" { - setting.Cron = defaultPromptSyncCron - } - if setting.Enabled == nil { - enabled := true - setting.Enabled = &enabled - } - return setting -} diff --git a/service/prompts.go b/service/prompts.go deleted file mode 100644 index 5f8d528..0000000 --- a/service/prompts.go +++ /dev/null @@ -1,66 +0,0 @@ -package service - -import ( - "time" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/repository" -) - -func ListPrompts(q model.Query) (model.PromptList, error) { - items, total, err := repository.ListPrompts(q) - if err != nil { - return model.PromptList{}, err - } - tags, err := repository.ListPromptTags(q) - if err != nil { - return model.PromptList{}, err - } - categories := promptCategoryCodes(ListPromptCategories()) - return model.PromptList{Items: items, Tags: tags, Categories: categories, Total: int(total)}, nil -} - -func ListPromptCategories() []model.PromptCategory { - categories, _ := repository.ListPromptCategories() - return categories -} - -func SavePrompt(item model.Prompt) (model.Prompt, error) { - now := time.Now().Format(time.RFC3339) - if item.Category == "" { - item.Category = repository.PromptCategories()[0].Category - } - if item.ID == "" { - item.ID = newID(item.Category) - item.CreatedAt = now - } - item.UpdatedAt = now - category, ok := repository.PromptCategoryByCode(item.Category) - if !ok { - category = repository.PromptCategories()[0] - item.Category = category.Category - } - item.GithubURL = "" - return repository.SavePrompt(item) -} - -func DeletePrompt(id string) error { - return repository.DeletePrompt(id) -} - -func DeletePrompts(ids []string) error { - if len(ids) == 0 { - return nil - } - return repository.DeletePrompts(ids) -} - -func promptCategoryCodes(items []model.PromptCategory) []string { - codes := []string{} - for _, item := range items { - if item.Category != "" { - codes = append(codes, item.Category) - } - } - return codes -} diff --git a/service/settings.go b/service/settings.go deleted file mode 100644 index 121c802..0000000 --- a/service/settings.go +++ /dev/null @@ -1,488 +0,0 @@ -package service - -import ( - "encoding/json" - "errors" - "fmt" - "io" - "math/rand" - "net/http" - "net/url" - "sort" - "strings" - "time" - - "github.com/basketikun/infinite-canvas/model" - "github.com/basketikun/infinite-canvas/repository" -) - -var adminModelHTTPClient = &http.Client{Timeout: 30 * time.Second} - -func PublicSettings() (model.PublicSetting, error) { - settings, err := repository.GetSettings() - return normalizeSettings(settings).Public, err -} - -func AdminSettings() (model.Settings, error) { - settings, err := repository.GetSettings() - return hidePrivateAPIKeys(normalizeSettings(settings)), err -} - -func SaveSettings(settings model.Settings) (model.Settings, error) { - saved, err := repository.GetSettings() - if err != nil { - return model.Settings{}, err - } - settings = normalizeSettings(settings) - keepPrivateAPIKeys(&settings, normalizeSettings(saved)) - keepPrivateAuthSecrets(&settings, normalizeSettings(saved)) - result, err := repository.SaveSettings(settings, now()) - if err == nil { - RefreshPromptSyncScheduler() - } - return hidePrivateAPIKeys(result), err -} - -func AdminChannelModels(index *int, channel model.ModelChannel) ([]string, error) { - resolved, err := resolveAdminChannel(index, channel) - if err != nil { - return nil, err - } - return fetchAdminChannelModels(resolved) -} - -func AdminTestChannelModel(index *int, channel model.ModelChannel, modelName string) (string, error) { - resolved, err := resolveAdminChannel(index, channel) - if err != nil { - return "", err - } - if isArkAgentPlanChannel(resolved) || isSeedanceModelName(modelName) { - return testArkSeedanceChannelModel(resolved, modelName) - } - return testAdminChannelModel(resolved, modelName) -} - -func normalizeSettings(settings model.Settings) model.Settings { - settings.Private = normalizePrivateSetting(settings.Private) - settings.Public = normalizePublicSettingWithChannels(settings.Public, settings.Private.Channels) - return settings -} - -func normalizePublicSetting(setting model.PublicSetting) model.PublicSetting { - return normalizePublicSettingWithChannels(setting, nil) -} - -func normalizePublicSettingWithChannels(setting model.PublicSetting, channels []model.ModelChannel) model.PublicSetting { - if setting.ModelChannel.AvailableModels == nil { - setting.ModelChannel.AvailableModels = []string{} - } - if setting.ModelChannel.ModelCosts == nil { - setting.ModelChannel.ModelCosts = []model.ModelCost{} - } - for i := range setting.ModelChannel.ModelCosts { - setting.ModelChannel.ModelCosts[i].Model = strings.TrimSpace(setting.ModelChannel.ModelCosts[i].Model) - if setting.ModelChannel.ModelCosts[i].Credits < 0 { - setting.ModelChannel.ModelCosts[i].Credits = 0 - } - } - if setting.ModelChannel.AllowCustomChannel == nil { - enabled := true - setting.ModelChannel.AllowCustomChannel = &enabled - } - if setting.Auth.AllowRegister == nil { - enabled := true - setting.Auth.AllowRegister = &enabled - } - enabledModels := enabledChannelModels(channels) - if len(enabledModels) > 0 { - setting.ModelChannel.AvailableModels = enabledModels - } else { - setting.ModelChannel.AvailableModels = uniqueModelNames(setting.ModelChannel.AvailableModels) - } - setting.ModelChannel.DefaultTextModel = repairDefaultModel(setting.ModelChannel.DefaultTextModel, setting.ModelChannel.AvailableModels, isTextModelName) - setting.ModelChannel.DefaultImageModel = repairDefaultModel(setting.ModelChannel.DefaultImageModel, setting.ModelChannel.AvailableModels, isImageModelName) - setting.ModelChannel.DefaultVideoModel = repairDefaultModel(setting.ModelChannel.DefaultVideoModel, setting.ModelChannel.AvailableModels, isVideoModelName) - setting.ModelChannel.DefaultModel = repairDefaultModel(setting.ModelChannel.DefaultModel, setting.ModelChannel.AvailableModels, isTextModelName) - return setting -} - -func ModelCost(modelName string) (int, error) { - settings, err := repository.GetSettings() - if err != nil { - return 0, err - } - modelName = strings.TrimSpace(modelName) - for _, item := range normalizePublicSetting(settings.Public).ModelChannel.ModelCosts { - if item.Model == modelName { - return item.Credits, nil - } - } - return 0, nil -} - -func normalizePrivateSetting(setting model.PrivateSetting) model.PrivateSetting { - if setting.Channels == nil { - setting.Channels = []model.ModelChannel{} - } - setting.PromptSync = normalizePromptSyncSetting(setting.PromptSync) - for i := range setting.Channels { - if setting.Channels[i].Protocol == "" { - setting.Channels[i].Protocol = "openai" - } - if setting.Channels[i].Models == nil { - setting.Channels[i].Models = []string{} - } - if setting.Channels[i].Weight <= 0 { - setting.Channels[i].Weight = 1 - } - } - return setting -} - -func hidePrivateAPIKeys(settings model.Settings) model.Settings { - for i := range settings.Private.Channels { - settings.Private.Channels[i].APIKey = "" - } - settings.Private.Auth.LinuxDo.ClientSecret = "" - return settings -} - -func keepPrivateAPIKeys(settings *model.Settings, saved model.Settings) { - for i := range settings.Private.Channels { - if strings.TrimSpace(settings.Private.Channels[i].APIKey) != "" { - continue - } - if channel, ok := findSavedChannel(settings.Private.Channels[i], saved.Private.Channels, i); ok { - settings.Private.Channels[i].APIKey = channel.APIKey - } - } -} - -func keepPrivateAuthSecrets(settings *model.Settings, saved model.Settings) { - if strings.TrimSpace(settings.Private.Auth.LinuxDo.ClientSecret) == "" { - settings.Private.Auth.LinuxDo.ClientSecret = saved.Private.Auth.LinuxDo.ClientSecret - } -} - -func findSavedChannel(channel model.ModelChannel, saved []model.ModelChannel, index int) (model.ModelChannel, bool) { - for _, item := range saved { - if item.Name == channel.Name && item.BaseURL == channel.BaseURL { - return item, true - } - } - if index < len(saved) { - return saved[index], true - } - return model.ModelChannel{}, false -} - -func SelectModelChannel(modelName string) (model.ModelChannel, error) { - settings, err := repository.GetSettings() - if err != nil { - return model.ModelChannel{}, err - } - channels := modelChannelsForModel(normalizePrivateSetting(settings.Private).Channels, modelName) - if len(channels) == 0 { - return model.ModelChannel{}, errors.New("没有可用模型渠道") - } - total := 0 - for _, channel := range channels { - total += channel.Weight - } - hit := rand.Intn(total) - for _, channel := range channels { - hit -= channel.Weight - if hit < 0 { - return channel, nil - } - } - return channels[0], nil -} - -func BuildModelChannelURL(channel model.ModelChannel, path string) string { - baseURL := normalizeModelChannelBaseURL(channel.BaseURL) - lowerBaseURL := strings.ToLower(baseURL) - if !strings.HasSuffix(lowerBaseURL, "/v1") && !strings.HasSuffix(lowerBaseURL, "/api/v3") && !strings.HasSuffix(lowerBaseURL, "/api/plan/v3") { - baseURL += "/v1" - } - return baseURL + path -} - -func normalizeModelChannelBaseURL(baseURL string) string { - baseURL = strings.TrimRight(strings.TrimSpace(baseURL), "/") - parsed, err := url.Parse(baseURL) - if err == nil && parsed.Scheme != "" && parsed.Host != "" { - path := strings.TrimRight(parsed.Path, "/") - lowerPath := strings.ToLower(path) - if index := strings.Index(lowerPath, "/api/plan/v3"); index >= 0 { - end := index + len("/api/plan/v3") - if len(lowerPath) == end || lowerPath[end] == '/' { - parsed.Path = path[:end] - parsed.RawPath = "" - parsed.RawQuery = "" - parsed.Fragment = "" - return strings.TrimRight(parsed.String(), "/") - } - } - } - return baseURL -} - -func isArkAgentPlanChannel(channel model.ModelChannel) bool { - baseURL := strings.ToLower(normalizeModelChannelBaseURL(channel.BaseURL)) - return strings.HasSuffix(baseURL, "/api/plan/v3") -} - -func isSeedanceModelName(modelName string) bool { - modelName = strings.ToLower(strings.TrimSpace(modelName)) - return strings.Contains(modelName, "seedance") || strings.Contains(modelName, "doubao-seedance") -} - -func enabledChannelModels(channels []model.ModelChannel) []string { - models := []string{} - for _, channel := range channels { - if !channel.Enabled { - continue - } - models = append(models, channel.Models...) - } - return uniqueModelNames(models) -} - -func uniqueModelNames(models []string) []string { - result := []string{} - seen := map[string]bool{} - for _, item := range models { - name := strings.TrimSpace(item) - if name == "" || seen[name] { - continue - } - seen[name] = true - result = append(result, name) - } - return result -} - -func repairDefaultModel(current string, models []string, preferred func(string) bool) string { - current = strings.TrimSpace(current) - for _, item := range models { - if item == current { - return current - } - } - for _, item := range models { - if preferred(item) { - return item - } - } - if len(models) > 0 { - return models[0] - } - return "" -} - -func isVideoModelName(modelName string) bool { - name := strings.ToLower(strings.TrimSpace(modelName)) - return strings.Contains(name, "seedance") || strings.Contains(name, "video") -} - -func isImageModelName(modelName string) bool { - name := strings.ToLower(strings.TrimSpace(modelName)) - return strings.Contains(name, "seedream") || strings.Contains(name, "gpt-image") || strings.Contains(name, "image") -} - -func isTextModelName(modelName string) bool { - return !isImageModelName(modelName) && !isVideoModelName(modelName) -} - -func normalizeModelChannel(channel model.ModelChannel) model.ModelChannel { - if channel.Protocol == "" { - channel.Protocol = "openai" - } - if channel.Models == nil { - channel.Models = []string{} - } - if channel.Weight <= 0 { - channel.Weight = 1 - } - return channel -} - -func resolveAdminChannel(index *int, channel model.ModelChannel) (model.ModelChannel, error) { - resolved := normalizeModelChannel(channel) - if strings.TrimSpace(resolved.APIKey) == "" { - settings, err := repository.GetSettings() - if err != nil { - return model.ModelChannel{}, err - } - saved := normalizePrivateSetting(settings.Private).Channels - if index != nil && *index >= 0 && *index < len(saved) { - if resolved.APIKey == "" { - resolved.APIKey = saved[*index].APIKey - } - if resolved.BaseURL == "" { - resolved.BaseURL = saved[*index].BaseURL - } - if resolved.Name == "" { - resolved.Name = saved[*index].Name - } - } - if resolved.APIKey == "" { - if savedChannel, ok := findSavedChannel(resolved, saved, -1); ok { - resolved.APIKey = savedChannel.APIKey - } - } - } - if strings.TrimSpace(resolved.BaseURL) == "" { - return model.ModelChannel{}, safeMessageError{message: "缺少接口地址"} - } - if strings.TrimSpace(resolved.APIKey) == "" { - return model.ModelChannel{}, safeMessageError{message: "缺少 API Key"} - } - return resolved, nil -} - -func fetchAdminChannelModels(channel model.ModelChannel) ([]string, error) { - request, err := http.NewRequest(http.MethodGet, BuildModelChannelURL(channel, "/models"), nil) - if err != nil { - return nil, err - } - request.Header.Set("Authorization", "Bearer "+channel.APIKey) - response, err := adminModelHTTPClient.Do(request) - if err != nil { - return nil, safeMessageError{message: "读取模型失败：上游接口无响应或网络不可达"} - } - defer response.Body.Close() - body, _ := io.ReadAll(response.Body) - if response.StatusCode >= http.StatusBadRequest { - if response.StatusCode == http.StatusNotFound && isArkAgentPlanChannel(channel) { - return nil, safeMessageError{message: "火山方舟 Agent Plan 未提供 OpenAI /models 模型列表接口，请手动填写模型名称，例如 doubao-seedance-2.0。"} - } - return nil, readAdminChannelError(body, response.StatusCode, "读取模型失败") - } - var payload struct { - Data []struct { - ID string `json:"id"` - } `json:"data"` - } - _ = json.Unmarshal(body, &payload) - result := make([]string, 0, len(payload.Data)) - for _, item := range payload.Data { - if strings.TrimSpace(item.ID) != "" { - result = append(result, item.ID) - } - } - sort.Strings(result) - return result, nil -} - -func testAdminChannelModel(channel model.ModelChannel, modelName string) (string, error) { - if strings.TrimSpace(modelName) == "" { - return "", errors.New("缺少模型名称") - } - body, _ := json.Marshal(map[string]any{ - "model": modelName, - "messages": []map[string]string{{ - "role": "user", - "content": "hi", - }}, - }) - request, err := http.NewRequest(http.MethodPost, BuildModelChannelURL(channel, "/chat/completions"), strings.NewReader(string(body))) - if err != nil { - return "", err - } - request.Header.Set("Authorization", "Bearer "+channel.APIKey) - request.Header.Set("Content-Type", "application/json") - response, err := adminModelHTTPClient.Do(request) - if err != nil { - return "", safeMessageError{message: "测试失败：上游接口无响应或网络不可达"} - } - defer response.Body.Close() - responseBody, _ := io.ReadAll(response.Body) - if response.StatusCode >= http.StatusBadRequest { - return "", readAdminChannelError(responseBody, response.StatusCode, "测试失败") - } - var payload struct { - Choices []struct { - Message struct { - Content string `json:"content"` - } `json:"message"` - } `json:"choices"` - } - _ = json.Unmarshal(responseBody, &payload) - if len(payload.Choices) > 0 && strings.TrimSpace(payload.Choices[0].Message.Content) != "" { - return payload.Choices[0].Message.Content, nil - } - return "ok", nil -} - -func testArkSeedanceChannelModel(channel model.ModelChannel, modelName string) (string, error) { - if strings.TrimSpace(modelName) == "" { - return "", errors.New("缺少模型名称") - } - if strings.TrimSpace(channel.BaseURL) == "" { - return "", safeMessageError{message: "缺少接口地址"} - } - if strings.TrimSpace(channel.APIKey) == "" { - return "", safeMessageError{message: "缺少 API Key"} - } - if !isArkAgentPlanChannel(channel) { - return "Seedance 视频模型不会发送 /chat/completions 文本测试。已检查 Base URL、API Key 和模型名非空；未调用视频生成接口，因此未验证套餐额度或模型权限。", nil - } - return "Agent Plan / Seedance 视频模型配置格式已通过。后台测试不会调用视频生成接口，因此未验证 API Key、套餐额度或模型权限；请在画布中使用视频生成验证。", nil -} - -func readAdminChannelError(body []byte, statusCode int, fallback string) error { - var payload struct { - Error *struct { - Message string `json:"message"` - } `json:"error"` - Msg string `json:"msg"` - } - if len(body) > 0 && json.Unmarshal(body, &payload) == nil { - if payload.Error != nil && strings.TrimSpace(payload.Error.Message) != "" { - return safeMessageError{message: payload.Error.Message} - } - if strings.TrimSpace(payload.Msg) != "" { - return safeMessageError{message: payload.Msg} - } - } - if statusCode == http.StatusUnauthorized || statusCode == http.StatusForbidden { - return safeMessageError{message: fmt.Sprintf("上游接口鉴权失败（%d），请检查 API Key、套餐权限或模型权限", statusCode)} - } - if statusCode == http.StatusTooManyRequests { - return safeMessageError{message: "上游接口限流或额度不足（429），请稍后重试或检查额度"} - } - if statusCode > 0 { - return safeMessageError{message: fmt.Sprintf("%s：%d", fallback, statusCode)} - } - return safeMessageError{message: fallback} -} - -type safeMessageError struct { - message string -} - -func (err safeMessageError) Error() string { - return err.message -} - -func (err safeMessageError) SafeMessage() string { - return err.message -} - -func modelChannelsForModel(channels []model.ModelChannel, modelName string) []model.ModelChannel { - result := []model.ModelChannel{} - for _, channel := range channels { - if !channel.Enabled || channel.BaseURL == "" || channel.APIKey == "" { - continue - } - for _, item := range channel.Models { - if strings.TrimSpace(item) == modelName { - result = append(result, channel) - break - } - } - } - return result -} diff --git a/service/settings_test.go b/service/settings_test.go deleted file mode 100644 index 27c6b2e..0000000 --- a/service/settings_test.go +++ /dev/null @@ -1,100 +0,0 @@ -package service - -import ( - "net/http" - "net/http/httptest" - "reflect" - "strings" - "testing" - - "github.com/basketikun/infinite-canvas/model" -) - -func TestFetchAdminChannelModelsParsesOpenAIModels(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.Path != "/v1/models" { - t.Fatalf("unexpected path: %s", r.URL.Path) - } - w.Header().Set("Content-Type", "application/json") - _, _ = w.Write([]byte(`{"data":[{"id":"z-model"},{"id":"a-model"},{"id":""}]}`)) - })) - defer server.Close() - - models, err := fetchAdminChannelModels(model.ModelChannel{ - BaseURL: server.URL, - APIKey: "test-key", - }) - if err != nil { - t.Fatalf("fetchAdminChannelModels returned error: %v", err) - } - if want := []string{"a-model", "z-model"}; !reflect.DeepEqual(models, want) { - t.Fatalf("models = %#v, want %#v", models, want) - } -} - -func TestFetchAdminChannelModelsReportsArkPlanModelsUnsupported(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.Path != "/api/plan/v3/models" { - t.Fatalf("unexpected path: %s", r.URL.Path) - } - http.NotFound(w, r) - })) - defer server.Close() - - _, err := fetchAdminChannelModels(model.ModelChannel{ - BaseURL: server.URL + "/api/plan/v3/contents/generations/tasks", - APIKey: "test-key", - }) - if err == nil { - t.Fatal("expected unsupported /models error") - } - if !strings.Contains(err.Error(), "Agent Plan 未提供 OpenAI /models") { - t.Fatalf("error = %q", err.Error()) - } -} - -func TestBuildModelChannelURLNormalizesArkPlanTaskPath(t *testing.T) { - got := BuildModelChannelURL(model.ModelChannel{BaseURL: "https://ark.cn-beijing.volces.com/api/plan/v3/contents/generations/tasks?debug=1"}, "/models") - want := "https://ark.cn-beijing.volces.com/api/plan/v3/models" - if got != want { - t.Fatalf("BuildModelChannelURL = %q, want %q", got, want) - } -} - -func TestNormalizeSettingsPublishesEnabledChannelModelsAndRepairsDefaults(t *testing.T) { - settings := normalizeSettings(model.Settings{ - Public: model.PublicSetting{ - ModelChannel: model.PublicModelChannelSetting{ - AvailableModels: []string{"grok-imagine-video", "disabled-model"}, - DefaultModel: "grok-imagine-video", - DefaultTextModel: "missing-text", - DefaultImageModel: "missing-image", - DefaultVideoModel: "missing-video", - }, - }, - Private: model.PrivateSetting{ - Channels: []model.ModelChannel{ - {Enabled: true, Models: []string{"gpt-5.5", "doubao-seedream-5.0-lite", "doubao-seedance-2.0-fast", "gpt-5.5"}}, - {Enabled: false, Models: []string{"disabled-model"}}, - }, - }, - }) - - channel := settings.Public.ModelChannel - wantModels := []string{"gpt-5.5", "doubao-seedream-5.0-lite", "doubao-seedance-2.0-fast"} - if !reflect.DeepEqual(channel.AvailableModels, wantModels) { - t.Fatalf("available models = %#v, want %#v", channel.AvailableModels, wantModels) - } - if channel.DefaultModel != "gpt-5.5" { - t.Fatalf("default model = %q, want text model", channel.DefaultModel) - } - if channel.DefaultTextModel != "gpt-5.5" { - t.Fatalf("default text model = %q, want text model", channel.DefaultTextModel) - } - if channel.DefaultImageModel != "doubao-seedream-5.0-lite" { - t.Fatalf("default image model = %q, want seedream", channel.DefaultImageModel) - } - if channel.DefaultVideoModel != "doubao-seedance-2.0-fast" { - t.Fatalf("default video model = %q, want seedance", channel.DefaultVideoModel) - } -} diff --git a/vercel.json b/vercel.json new file mode 100644 index 0000000..c26bbf6 --- /dev/null +++ b/vercel.json @@ -0,0 +1,6 @@ +{ + "buildCommand": "cd web && bun run build", + "installCommand": "cd web && bun install --frozen-lockfile", + "outputDirectory": "web/.next", + "framework": "nextjs" +} diff --git a/web/src/app/(admin)/admin/assets/use-admin-assets.ts b/web/src/app/(admin)/admin/assets/use-admin-assets.ts index d88f413..c72061b 100644 --- a/web/src/app/(admin)/admin/assets/use-admin-assets.ts +++ b/web/src/app/(admin)/admin/assets/use-admin-assets.ts @@ -5,15 +5,13 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; import { App } from "antd"; import { deleteAdminAsset, fetchAdminAssets, saveAdminAsset, type AdminAsset } from "@/services/api/admin"; -import { useUserStore } from "@/stores/use-user-store"; const defaultPageSize = 10; +const localToken = ""; export function useAdminAssets() { const { message } = App.useApp(); const queryClient = useQueryClient(); - const token = useUserStore((state) => state.token); - const clearSession = useUserStore((state) => state.clearSession); const [keyword, setKeyword] = useState(""); const [type, setType] = useState(""); const [tag, setTag] = useState([]); @@ -21,14 +19,13 @@ export function useAdminAssets() { const [pageSize, setPageSize] = useState(defaultPageSize); const query = useQuery({ - queryKey: ["admin", "assets", token, keyword, type, tag, page, pageSize], - queryFn: () => fetchAdminAssets(token, { keyword, type, tag, page, pageSize }), - enabled: Boolean(token), + queryKey: ["admin", "assets", keyword, type, tag, page, pageSize], + queryFn: () => fetchAdminAssets(localToken, { keyword, type, tag, page, pageSize }), retry: false, }); const saveMutation = useMutation({ - mutationFn: (asset: Partial) => saveAdminAsset(token, asset), + mutationFn: (asset: Partial) => saveAdminAsset(localToken, asset), onSuccess: async (_, asset) => { await queryClient.invalidateQueries({ queryKey: ["admin", "assets"] }); message.success(asset.id ? "素材已保存" : "素材已新增"); @@ -39,7 +36,7 @@ export function useAdminAssets() { }); const deleteMutation = useMutation({ - mutationFn: (id: string) => deleteAdminAsset(token, id), + mutationFn: (id: string) => deleteAdminAsset(localToken, id), onSuccess: async () => { await queryClient.invalidateQueries({ queryKey: ["admin", "assets"] }); message.success("素材已删除"); @@ -53,9 +50,8 @@ export function useAdminAssets() { if (query.isError) { const errorMessage = query.error instanceof Error ? query.error.message : "读取素材失败"; message.error(errorMessage); - if (errorMessage.includes("未登录") || errorMessage.includes("权限不足") || errorMessage.includes("登录状态无效")) clearSession(); } - }, [clearSession, message, query.error, query.isError]); + }, [message, query.error, query.isError]); const updateFilters = (next: Partial<{ keyword: string; type: string; tag: string[]; page: number; pageSize: number }>) => { const queryState = { keyword, type, tag, page, pageSize, ...next }; diff --git a/web/src/app/(admin)/admin/credit-logs/page.tsx b/web/src/app/(admin)/admin/credit-logs/page.tsx index 7792f5a..a2d73d3 100644 --- a/web/src/app/(admin)/admin/credit-logs/page.tsx +++ b/web/src/app/(admin)/admin/credit-logs/page.tsx @@ -1,221 +1,5 @@ -"use client"; - -import { DeleteOutlined, EditOutlined, PlusOutlined, ReloadOutlined, SearchOutlined } from "@ant-design/icons"; -import { ProTable, type ProColumns } from "@ant-design/pro-components"; -import { Button, Card, Col, Form, Input, InputNumber, Modal, Row, Space, Tag, Tooltip, Typography } from "antd"; -import dayjs from "dayjs"; -import { useEffect, useState } from "react"; - -import type { AdminCreditLog } from "@/services/api/admin"; -import { useAdminCreditLogs } from "./use-admin-credit-logs"; - -type CreditLogFormValues = Partial; - -const creditLogTypeLabels: Record = { - admin_adjust: "后台调整", - ai_consume: "模型消费", - ai_refund: "失败返还", -}; +import { redirect } from "next/navigation"; export default function AdminCreditLogsPage() { - const { logs, keyword, page, pageSize, total, isLoading, searchLogs, changePage, changePageSize, resetFilters, refreshLogs, saveLog: saveAdminLog, deleteLog } = useAdminCreditLogs(); - const [form] = Form.useForm(); - const [keywordText, setKeywordText] = useState(keyword); - const [editingLog, setEditingLog] = useState | null>(null); - const [deletingLog, setDeletingLog] = useState(null); - - useEffect(() => setKeywordText(keyword), [keyword]); - - useEffect(() => { - if (editingLog) form.setFieldsValue({ type: "admin_adjust", amount: 0, balance: 0, ...editingLog }); - }, [editingLog, form]); - - const saveLog = async () => { - const value = await form.validateFields(); - await saveAdminLog({ ...editingLog, ...value }); - setEditingLog(null); - }; - - const columns: ProColumns[] = [ - { - title: "用户 ID", - dataIndex: "userId", - width: 220, - render: (_, item) => {item.userId}, - }, - { - title: "类型", - dataIndex: "type", - width: 140, - render: (_, item) => {creditLogTypeLabels[item.type] || item.type || "-"}, - }, - { - title: "变动", - dataIndex: "amount", - width: 100, - render: (_, item) => = 0 ? "success" : "danger"}>{item.amount}, - }, - { - title: "余额", - dataIndex: "balance", - width: 100, - }, - { - title: "备注", - dataIndex: "remark", - ellipsis: true, - render: (_, item) => {item.remark || "-"}, - }, - { - title: "创建时间", - dataIndex: "createdAt", - width: 180, - render: (_, item) => {item.createdAt ? dayjs(item.createdAt).format("YYYY-MM-DD HH:mm:ss") : "-"}, - }, - { - title: "操作", - key: "actions", - width: 96, - align: "right", - render: (_, item) => ( - - - - - - - - - - - - rowKey="id" - columns={columns} - dataSource={logs} - loading={isLoading} - search={false} - defaultSize="middle" - tableLayout="fixed" - cardProps={{ variant: "borderless" }} - headerTitle={ - - 算力点日志 - {total} 条 - - } - options={{ density: true, setting: true, reload: () => void refreshLogs() }} - toolBarRender={() => [ - , - ]} - pagination={{ - current: page, - pageSize, - total, - showSizeChanger: true, - pageSizeOptions: [10, 20, 50, 100], - showTotal: (value) => `共 ${value} 条`, - onChange: (nextPage, nextPageSize) => (nextPageSize !== pageSize ? changePageSize(nextPageSize) : changePage(nextPage)), - }} - /> - - - setEditingLog(null)} onOk={() => void saveLog()} okText="保存" cancelText="取消" destroyOnHidden> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - setDeletingLog(null)} - onOk={async () => { - if (!deletingLog) return; - await deleteLog(deletingLog.id); - setDeletingLog(null); - }} - okText="删除" - okButtonProps={{ danger: true }} - cancelText="取消" - > - 确定删除这条算力点日志吗？ - - - ); + redirect("/admin/settings"); } diff --git a/web/src/app/(admin)/admin/credit-logs/use-admin-credit-logs.ts b/web/src/app/(admin)/admin/credit-logs/use-admin-credit-logs.ts deleted file mode 100644 index bd75603..0000000 --- a/web/src/app/(admin)/admin/credit-logs/use-admin-credit-logs.ts +++ /dev/null @@ -1,79 +0,0 @@ -"use client"; - -import { useEffect, useState } from "react"; -import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; -import { App } from "antd"; - -import { deleteAdminCreditLog, fetchAdminCreditLogs, saveAdminCreditLog, type AdminCreditLog } from "@/services/api/admin"; -import { useUserStore } from "@/stores/use-user-store"; - -const defaultPageSize = 10; - -export function useAdminCreditLogs() { - const { message } = App.useApp(); - const queryClient = useQueryClient(); - const token = useUserStore((state) => state.token); - const clearSession = useUserStore((state) => state.clearSession); - const [keyword, setKeyword] = useState(""); - const [page, setPage] = useState(1); - const [pageSize, setPageSize] = useState(defaultPageSize); - - const query = useQuery({ - queryKey: ["admin", "credit-logs", token, keyword, page, pageSize], - queryFn: () => fetchAdminCreditLogs(token, { keyword, page, pageSize }), - enabled: Boolean(token), - retry: false, - }); - - const saveMutation = useMutation({ - mutationFn: (log: Partial) => saveAdminCreditLog(token, log), - onSuccess: async (_, log) => { - await queryClient.invalidateQueries({ queryKey: ["admin", "credit-logs"] }); - message.success(log.id ? "日志已保存" : "日志已新增"); - }, - onError: (error) => message.error(error instanceof Error ? error.message : "保存失败"), - }); - - const deleteMutation = useMutation({ - mutationFn: (id: string) => deleteAdminCreditLog(token, id), - onSuccess: async () => { - await queryClient.invalidateQueries({ queryKey: ["admin", "credit-logs"] }); - message.success("日志已删除"); - }, - onError: (error) => message.error(error instanceof Error ? error.message : "删除失败"), - }); - - useEffect(() => { - if (query.isError) { - const errorMessage = query.error instanceof Error ? query.error.message : "读取日志失败"; - message.error(errorMessage); - if (errorMessage.includes("未登录") || errorMessage.includes("权限不足") || errorMessage.includes("登录状态无效")) clearSession(); - } - }, [clearSession, message, query.error, query.isError]); - - const updateFilters = (next: Partial<{ keyword: string; page: number; pageSize: number }>) => { - const queryState = { keyword, page, pageSize, ...next }; - if (next.keyword !== undefined || next.pageSize !== undefined) queryState.page = 1; - setKeyword(queryState.keyword); - setPage(queryState.page); - setPageSize(queryState.pageSize); - }; - - const data = query.data; - - return { - logs: data?.items || [], - keyword, - page, - pageSize, - total: data?.total || 0, - isLoading: query.isFetching || saveMutation.isPending || deleteMutation.isPending, - searchLogs: (value = keyword) => updateFilters({ keyword: value }), - changePage: (value: number) => updateFilters({ page: value }), - changePageSize: (value: number) => updateFilters({ pageSize: value }), - resetFilters: () => updateFilters({ keyword: "", page: 1, pageSize: defaultPageSize }), - refreshLogs: () => query.refetch(), - saveLog: (log: Partial) => saveMutation.mutateAsync(log), - deleteLog: (id: string) => deleteMutation.mutateAsync(id), - }; -} diff --git a/web/src/app/(admin)/admin/layout.tsx b/web/src/app/(admin)/admin/layout.tsx index 415098d..cdbfddf 100644 --- a/web/src/app/(admin)/admin/layout.tsx +++ b/web/src/app/(admin)/admin/layout.tsx @@ -1,19 +1,15 @@ "use client"; -import { FileTextOutlined, HomeOutlined, LogoutOutlined, PictureOutlined, SettingOutlined, TransactionOutlined, UserOutlined } from "@ant-design/icons"; +import { FileTextOutlined, HomeOutlined, PictureOutlined, SettingOutlined } from "@ant-design/icons"; import { Button, Flex, Layout, Menu, Typography, theme } from "antd"; import Link from "next/link"; -import { usePathname, useRouter } from "next/navigation"; +import { usePathname } from "next/navigation"; import type { ReactNode } from "react"; -import { useEffect } from "react"; import { UserStatusActions } from "@/components/layout/user-status-actions"; import { adminLayoutStyle } from "@/lib/app-theme"; -import { useUserStore } from "@/stores/use-user-store"; const adminMenus = [ - { key: "/admin/users", icon: , label: "用户管理" }, - { key: "/admin/credit-logs", icon: , label: "算力点日志" }, { key: "/admin/prompts", icon: , label: "提示词管理" }, { key: "/admin/assets", icon: , label: "素材库" }, { key: "/admin/settings", icon: , label: "系统设置" }, @@ -21,43 +17,15 @@ const adminMenus = [ export default function AdminLayout({ children }: { children: ReactNode }) { const { token: antToken } = theme.useToken(); - const router = useRouter(); const pathname = usePathname(); - const token = useUserStore((state) => state.token); - const user = useUserStore((state) => state.user); - const isReady = useUserStore((state) => state.isReady); - const logout = useUserStore((state) => state.clearSession); const activeKey = pathname.startsWith("/admin/settings") ? "/admin/settings" : pathname.startsWith("/admin/assets") ? "/admin/assets" : pathname.startsWith("/admin/prompts") ? "/admin/prompts" - : pathname.startsWith("/admin/credit-logs") - ? "/admin/credit-logs" - : pathname.startsWith("/admin/users") - ? "/admin/users" - : ""; - const pageTitle = pathname.startsWith("/admin/settings") ? "系统设置" : pathname.startsWith("/admin/assets") ? "素材库管理" : pathname.startsWith("/admin/prompts") ? "提示词管理" : pathname.startsWith("/admin/credit-logs") ? "算力点日志" : "用户管理"; - - useEffect(() => { - if (!isReady) return; - if (!token) { - router.replace("/login?redirect=/admin"); - return; - } - if (user?.role !== "admin") { - router.replace("/"); - } - }, [isReady, router, token, user?.role]); - - if (!isReady || !token || user?.role !== "admin") { - return ( -
- -
- ); - } + : ""; + const pageTitle = pathname.startsWith("/admin/settings") ? "系统设置" : pathname.startsWith("/admin/assets") ? "素材库管理" : "提示词管理"; return ( @@ -86,9 +54,6 @@ export default function AdminLayout({ children }: { children: ReactNode }) { - diff --git a/web/src/app/(admin)/admin/page.tsx b/web/src/app/(admin)/admin/page.tsx index 5593850..cf5e9e8 100644 --- a/web/src/app/(admin)/admin/page.tsx +++ b/web/src/app/(admin)/admin/page.tsx @@ -1,5 +1,5 @@ import { redirect } from "next/navigation"; export default function AdminPage() { - redirect("/admin/users"); + redirect("/admin/settings"); } diff --git a/web/src/app/(admin)/admin/prompts/use-admin-prompts.ts b/web/src/app/(admin)/admin/prompts/use-admin-prompts.ts index 713a66f..b8b4840 100644 --- a/web/src/app/(admin)/admin/prompts/use-admin-prompts.ts +++ b/web/src/app/(admin)/admin/prompts/use-admin-prompts.ts @@ -6,15 +6,13 @@ import { App } from "antd"; import { deleteAdminPrompt, deleteAdminPrompts, fetchAdminPrompts, fetchAdminPromptCategories, saveAdminPrompt, syncAdminPromptCategory, type AdminPromptCategory } from "@/services/api/admin"; import type { Prompt } from "@/services/api/prompts"; -import { useUserStore } from "@/stores/use-user-store"; const defaultPageSize = 10; +const localToken = ""; export function useAdminPrompts() { const { message } = App.useApp(); const queryClient = useQueryClient(); - const token = useUserStore((state) => state.token); - const clearSession = useUserStore((state) => state.clearSession); const [keyword, setKeyword] = useState(""); const [category, setCategory] = useState(""); const [tag, setTag] = useState([]); @@ -22,23 +20,21 @@ export function useAdminPrompts() { const [pageSize, setPageSize] = useState(defaultPageSize); const categoriesQuery = useQuery({ - queryKey: ["admin", "prompt-categories", token], - queryFn: () => fetchAdminPromptCategories(token), - enabled: Boolean(token), + queryKey: ["admin", "prompt-categories"], + queryFn: () => fetchAdminPromptCategories(localToken), retry: false, }); const promptsQuery = useQuery({ - queryKey: ["admin", "prompts", token, keyword, category, tag, page, pageSize], - queryFn: () => fetchAdminPrompts(token, { keyword, category, tag, page, pageSize }), - enabled: Boolean(token), + queryKey: ["admin", "prompts", keyword, category, tag, page, pageSize], + queryFn: () => fetchAdminPrompts(localToken, { keyword, category, tag, page, pageSize }), retry: false, }); const syncMutation = useMutation({ - mutationFn: (category: string) => syncAdminPromptCategory(token, category), + mutationFn: (category: string) => syncAdminPromptCategory(localToken, category), onSuccess: async (categories) => { - queryClient.setQueryData(["admin", "prompt-categories", token], categories); + queryClient.setQueryData(["admin", "prompt-categories"], categories); await queryClient.invalidateQueries({ queryKey: ["admin", "prompts"] }); message.success("远程提示词源已同步"); }, @@ -48,7 +44,7 @@ export function useAdminPrompts() { }); const saveMutation = useMutation({ - mutationFn: (prompt: Partial) => saveAdminPrompt(token, prompt), + mutationFn: (prompt: Partial) => saveAdminPrompt(localToken, prompt), onSuccess: async (_, prompt) => { await queryClient.invalidateQueries({ queryKey: ["admin", "prompt-categories"] }); await queryClient.invalidateQueries({ queryKey: ["admin", "prompts"] }); @@ -60,7 +56,7 @@ export function useAdminPrompts() { }); const deleteMutation = useMutation({ - mutationFn: (id: string) => deleteAdminPrompt(token, id), + mutationFn: (id: string) => deleteAdminPrompt(localToken, id), onSuccess: async () => { await queryClient.invalidateQueries({ queryKey: ["admin", "prompt-categories"] }); await queryClient.invalidateQueries({ queryKey: ["admin", "prompts"] }); @@ -72,7 +68,7 @@ export function useAdminPrompts() { }); const batchDeleteMutation = useMutation({ - mutationFn: (ids: string[]) => deleteAdminPrompts(token, ids), + mutationFn: (ids: string[]) => deleteAdminPrompts(localToken, ids), onSuccess: async () => { await queryClient.invalidateQueries({ queryKey: ["admin", "prompt-categories"] }); await queryClient.invalidateQueries({ queryKey: ["admin", "prompts"] }); @@ -88,8 +84,7 @@ export function useAdminPrompts() { if (!error) return; const errorMessage = error instanceof Error ? error.message : "读取提示词失败"; message.error(errorMessage); - if (errorMessage.includes("未登录") || errorMessage.includes("权限不足") || errorMessage.includes("登录状态无效")) clearSession(); - }, [categoriesQuery.error, clearSession, message, promptsQuery.error]); + }, [categoriesQuery.error, message, promptsQuery.error]); const updateFilters = (next: Partial<{ keyword: string; category: string; tag: string[]; page: number; pageSize: number }>) => { const queryState = { keyword, category, tag, page, pageSize, ...next }; diff --git a/web/src/app/(admin)/admin/settings/page.tsx b/web/src/app/(admin)/admin/settings/page.tsx index 7b5029f..e18d4c2 100644 --- a/web/src/app/(admin)/admin/settings/page.tsx +++ b/web/src/app/(admin)/admin/settings/page.tsx @@ -1,980 +1,48 @@ "use client"; -import { CheckCircleOutlined, DeleteOutlined, FormatPainterOutlined, LoadingOutlined, PlusOutlined, ReloadOutlined, SaveOutlined } from "@ant-design/icons"; -import { json } from "@codemirror/lang-json"; -import { App, Button, Card, Checkbox, Col, Drawer, Flex, Form, Input, InputNumber, Modal, Row, Segmented, Select, Space, Switch, Table, Tabs, Tag, Typography } from "antd"; -import dynamic from "next/dynamic"; -import { useEffect, useMemo, useState } from "react"; -import { EditorView } from "@uiw/react-codemirror"; +import { Button, Card, Typography } from "antd"; +import { Database, Settings2, Sparkles } from "lucide-react"; +import Link from "next/link"; -import { fetchAdminSettings, fetchChannelModels, saveAdminSettings, testChannelModel, type AdminModelChannel, type AdminModelCost, type AdminSettings } from "@/services/api/admin"; -import { useUserStore } from "@/stores/use-user-store"; - -const CodeMirror = dynamic(() => import("@uiw/react-codemirror"), { ssr: false }); -const jsonEditorTheme = EditorView.theme({ - "&": { backgroundColor: "var(--ant-color-bg-container)", color: "var(--ant-color-text)" }, - ".cm-content": { caretColor: "var(--ant-color-text)", padding: "12px 0" }, - ".cm-line": { padding: "0 18px" }, - ".cm-gutters": { backgroundColor: "var(--ant-color-fill-quaternary)", borderRight: "1px solid var(--ant-color-border)", color: "var(--ant-color-text-tertiary)" }, - ".cm-activeLine": { backgroundColor: "var(--ant-color-fill-quaternary)" }, - ".cm-activeLineGutter": { backgroundColor: "var(--ant-color-fill-quaternary)", color: "var(--ant-color-text)" }, - ".cm-cursor": { borderLeftColor: "var(--ant-color-text)" }, - ".cm-selectionBackground, &.cm-focused .cm-selectionBackground": { backgroundColor: "var(--ant-control-item-bg-active)" }, - ".cm-foldPlaceholder": { backgroundColor: "var(--ant-color-fill-quaternary)", border: "1px solid var(--ant-color-border)", color: "var(--ant-color-text-tertiary)" }, - "&.cm-focused": { outline: "none" }, -}); - -const emptySettings: AdminSettings = { - public: { - modelChannel: { - availableModels: [], - modelCosts: [], - defaultModel: "", - defaultImageModel: "", - defaultVideoModel: "", - defaultTextModel: "", - systemPrompt: "", - allowCustomChannel: true, - }, - auth: { allowRegister: true, linuxDo: { enabled: false } }, - }, - private: { channels: [], promptSync: { enabled: true, cron: "*/5 * * * *" }, auth: { linuxDo: { clientId: "", clientSecret: "" } } }, -}; -const emptyChannel: AdminModelChannel = { protocol: "openai", name: "", baseUrl: "", apiKey: "", models: [], weight: 1, enabled: true, remark: "" }; - -type SettingsTabKey = "public" | "private"; -type EditorMode = "visual" | "json"; -type ModelSelectTabKey = "new" | "current"; +import { useConfigStore } from "@/stores/use-config-store"; export default function AdminSettingsPage() { - const token = useUserStore((state) => state.token); - const { message } = App.useApp(); - const [form] = Form.useForm(); - const [activeTab, setActiveTab] = useState("public"); - const [editorMode, setEditorMode] = useState>({ public: "visual", private: "visual" }); - const [jsonText, setJsonText] = useState>({ public: "", private: "" }); - const [channels, setChannels] = useState([]); - const [channelForm] = Form.useForm(); - const [editingChannelIndex, setEditingChannelIndex] = useState(null); - const [isChannelDrawerOpen, setIsChannelDrawerOpen] = useState(false); - const [testChannelIndex, setTestChannelIndex] = useState(null); - const [testKeyword, setTestKeyword] = useState(""); - const [selectedTestModels, setSelectedTestModels] = useState([]); - const [testingModels, setTestingModels] = useState([]); - const [testResults, setTestResults] = useState>({}); - const [isModelSelectorOpen, setIsModelSelectorOpen] = useState(false); - const [modelSelectSource, setModelSelectSource] = useState([]); - const [modelSelectExisting, setModelSelectExisting] = useState([]); - const [modelSelectSelected, setModelSelectSelected] = useState([]); - const [modelSelectKeyword, setModelSelectKeyword] = useState(""); - const [modelSelectNewModel, setModelSelectNewModel] = useState(""); - const [modelSelectTab, setModelSelectTab] = useState("new"); - const [isFetchingChannelModels, setIsFetchingChannelModels] = useState(false); - const [isLoading, setIsLoading] = useState(false); - const [isSaving, setIsSaving] = useState(false); - const [modelCosts, setModelCosts] = useState([]); - const [knownModels, setKnownModels] = useState([]); - const publicModels = Form.useWatch(["public", "modelChannel", "availableModels"], form) || []; - const channelModels = useMemo(() => collectChannelModels(channels), [channels]); - const channelTableData = useMemo(() => channels.map((channel, index) => ({ ...channel, _index: index, _rowKey: `${index}-${channel.name}-${channel.baseUrl}` })), [channels]); - const activeMode = editorMode[activeTab]; - const activeJsonText = jsonText[activeTab]; - const jsonError = activeMode === "json" ? getJsonError(activeJsonText) : ""; - const modelSelectGroups = useMemo(() => buildModelSelectGroups(modelSelectSource, modelSelectExisting), [modelSelectSource, modelSelectExisting]); - const activeModelSelectModels = useMemo(() => { - const keyword = modelSelectKeyword.trim().toLowerCase(); - return modelSelectGroups[modelSelectTab].filter((model) => model.toLowerCase().includes(keyword)); - }, [modelSelectGroups, modelSelectKeyword, modelSelectTab]); - const activeSelectedCount = activeModelSelectModels.filter((model) => modelSelectSelected.includes(model)).length; - - const loadSettings = async () => { - if (!token) return; - setIsLoading(true); - try { - const data = normalizeSettings(await fetchAdminSettings(token)); - form.setFieldsValue(data); - setChannels(data.private.channels); - setModelCosts(data.public.modelChannel.modelCosts); - setKnownModels(collectKnownModels(data)); - setJsonText({ - public: JSON.stringify(data.public, null, 2), - private: JSON.stringify(data.private, null, 2), - }); - } catch (error) { - message.error(error instanceof Error ? error.message : "读取设置失败"); - } finally { - setIsLoading(false); - } - }; - - useEffect(() => { - void loadSettings(); - }, [token]); - - const changeTab = (nextTab: SettingsTabKey) => { - setActiveTab(nextTab); - }; - - const saveSettings = async () => { - if (!token) return; - const values = await collectSettings(form, editorMode, jsonText, message); - if (!values) { - return; - } - setIsSaving(true); - try { - const saved = normalizeSettings(await saveAdminSettings(token, values)); - const merged = mergeChannelApiKeys(values.private.channels, saved); - form.setFieldsValue(merged); - setChannels(merged.private.channels); - setModelCosts(merged.public.modelChannel.modelCosts); - rememberKnownModels(merged); - setJsonText({ - public: JSON.stringify(merged.public, null, 2), - private: JSON.stringify(merged.private, null, 2), - }); - message.success("已保存"); - } catch (error) { - message.error(error instanceof Error ? error.message : "保存失败"); - } finally { - setIsSaving(false); - } - }; - - const toggleMode = (tab: SettingsTabKey, nextMode: EditorMode) => { - if (nextMode === "json") { - setJsonText((current) => ({ - ...current, - [tab]: JSON.stringify(tab === "public" ? normalizePublicSetting(form.getFieldValue(["public"]) as Partial) : normalizePrivateSetting(form.getFieldValue(["private"]) as Partial), null, 2), - })); - setEditorMode((current) => ({ ...current, [tab]: nextMode })); - return; - } - const parsed = parseTabJson(tab, jsonText[tab]); - if (!parsed) { - message.error("JSON 格式不正确"); - return; - } - form.setFieldsValue({ [tab]: parsed } as Partial); - if (tab === "private") setChannels((parsed as AdminSettings["private"]).channels); - if (tab === "public") setModelCosts((parsed as AdminSettings["public"]).modelChannel.modelCosts); - rememberKnownModels({ ...normalizeSettings(form.getFieldsValue(true) as AdminSettings), [tab]: parsed }); - setEditorMode((current) => ({ ...current, [tab]: nextMode })); - }; - - const formatJson = (tab: SettingsTabKey) => { - const parsed = parseTabJson(tab, jsonText[tab]); - if (!parsed) { - message.error("JSON 格式不正确"); - return; - } - if (tab === "public") setModelCosts((parsed as AdminSettings["public"]).modelChannel.modelCosts); - setJsonText((current) => ({ - ...current, - [tab]: JSON.stringify(parsed, null, 2), - })); - }; - - const openChannelDrawer = (index: number | null) => { - setEditingChannelIndex(index); - setIsChannelDrawerOpen(true); - const channel = index === null ? emptyChannel : normalizeChannel(channels[index]); - channelForm.setFieldsValue(channel); - rememberModels(channel.models); - }; - - const closeChannelDrawer = () => { - setIsChannelDrawerOpen(false); - setEditingChannelIndex(null); - channelForm.resetFields(); - }; - - const saveChannel = async () => { - const channel = normalizeChannel(await channelForm.validateFields()); - rememberModels(channel.models); - const nextChannels = [...channels]; - if (editingChannelIndex === null) nextChannels.push(channel); - else nextChannels[editingChannelIndex] = channel; - await persistChannels(nextChannels); - closeChannelDrawer(); - }; - - const fetchChannelModelList = async () => { - if (!token) return; - const channel = channelForm.getFieldsValue(); - if (!channel?.baseUrl) { - message.warning("请先填写接口地址"); - return; - } - if (editingChannelIndex === null && !channel?.apiKey) { - message.warning("请先填写 API Key"); - return; - } - setIsFetchingChannelModels(true); - try { - const channelModels = await fetchChannelModels(token, { index: editingChannelIndex ?? undefined, channel: normalizeChannel(channel) }); - const current = isModelSelectorOpen ? uniqueModels(modelSelectSelected) : uniqueModels(channelForm.getFieldValue("models") || []); - rememberModels(channelModels); - if (!channelModels.length) { - message.warning("上游未返回模型列表，请手动输入模型名称"); - return; - } - setModelSelectExisting(current); - setModelSelectSource(uniqueModels(channelModels)); - setModelSelectSelected(uniqueModels([...current, ...channelModels])); - setModelSelectKeyword(""); - setModelSelectNewModel(""); - setModelSelectTab("new"); - setIsModelSelectorOpen(true); - message.success(`已获取 ${channelModels.length} 个模型，请选择后确认`); - } catch (error) { - message.error(error instanceof Error ? error.message : "读取模型失败"); - } finally { - setIsFetchingChannelModels(false); - } - }; - - const openChannelModelSelector = (sourceModels?: string[]) => { - const current = uniqueModels(channelForm.getFieldValue("models") || []); - const source = uniqueModels(sourceModels !== undefined ? sourceModels : [...knownModels, ...current]); - setModelSelectExisting(current); - setModelSelectSource(source); - setModelSelectSelected(sourceModels ? uniqueModels([...current, ...source]) : current); - setModelSelectKeyword(""); - setModelSelectNewModel(""); - setModelSelectTab(sourceModels ? "new" : "current"); - setIsModelSelectorOpen(true); - }; - - const closeChannelModelSelector = () => { - setIsModelSelectorOpen(false); - setModelSelectKeyword(""); - setModelSelectNewModel(""); - }; - - const confirmChannelModelSelector = () => { - const models = uniqueModels(modelSelectSelected); - channelForm.setFieldValue("models", models); - rememberModels(models); - closeChannelModelSelector(); - }; - - const toggleSelectedModel = (model: string, checked: boolean) => { - setModelSelectSelected((current) => (checked ? uniqueModels([...current, model]) : current.filter((item) => item !== model))); - }; - - const selectActiveModels = () => { - setModelSelectSelected((current) => uniqueModels([...current, ...activeModelSelectModels])); - }; - - const clearActiveModels = () => { - const active = new Set(activeModelSelectModels); - setModelSelectSelected((current) => current.filter((model) => !active.has(model))); - }; - - const addModelInSelector = () => { - const model = modelSelectNewModel.trim(); - if (!model) return; - setModelSelectExisting((current) => uniqueModels([...current, model])); - setModelSelectSelected((current) => uniqueModels([...current, model])); - setModelSelectNewModel(""); - setModelSelectTab("current"); - }; - - function rememberModels(models: string[]) { - setKnownModels((current) => uniqueModels([...current, ...models])); - } - - function rememberKnownModels(settings: AdminSettings) { - rememberModels(collectKnownModels(settings)); - } - - const openTestDialog = (index: number) => { - const channel = normalizeChannel(channels[index]); - if (!channel.baseUrl || channel.models.length === 0) { - message.warning("请先填写接口地址和至少一个模型"); - return; - } - setTestChannelIndex(index); - setTestKeyword(""); - setSelectedTestModels([]); - setTestingModels([]); - setTestResults({}); - }; - - const closeTestDialog = () => { - setTestChannelIndex(null); - setTestKeyword(""); - setSelectedTestModels([]); - setTestingModels([]); - setTestResults({}); - }; - - const testModelOnline = async (model: string) => { - if (testChannelIndex === null) return; - if (!token) return; - const channel = normalizeChannel(channels[testChannelIndex]); - setTestingModels((current) => [...current, model]); - try { - const startedAt = performance.now(); - const result = await testChannelModel(token, { index: testChannelIndex, channel, model }); - setTestResults((current) => ({ ...current, [model]: { status: "success", duration: `${((performance.now() - startedAt) / 1000).toFixed(2)}s`, message: result } })); - } catch (error) { - setTestResults((current) => ({ ...current, [model]: { status: "error", message: error instanceof Error ? error.message : "测试失败" } })); - } finally { - setTestingModels((current) => current.filter((item) => item !== model)); - } - }; - - const batchTestModels = async () => { - for (const model of selectedTestModels) { - await testModelOnline(model); - } - }; - - const testChannel = testChannelIndex === null ? null : normalizeChannel(channels[testChannelIndex]); - const testModels = (testChannel?.models || []).filter((model) => model.toLowerCase().includes(testKeyword.trim().toLowerCase())); - - async function persistChannels(nextChannels: AdminModelChannel[]) { - if (!token) return; - const values = normalizeSettings(form.getFieldsValue(true) as AdminSettings); - const nextChannelModels = collectChannelModels(nextChannels); - const nextSettings = normalizeSettings({ - ...values, - public: { ...values.public, modelChannel: { ...values.public.modelChannel, availableModels: nextChannelModels } }, - private: { ...values.private, channels: nextChannels }, - }); - const saved = normalizeSettings(await saveAdminSettings(token, nextSettings)); - const merged = mergeChannelApiKeys(nextChannels, saved); - setChannels(merged.private.channels); - setModelCosts(merged.public.modelChannel.modelCosts); - rememberKnownModels(merged); - form.setFieldsValue(merged); - setJsonText({ - public: JSON.stringify(merged.public, null, 2), - private: JSON.stringify(merged.private, null, 2), - }); - message.success("已保存"); - } + const openConfigDialog = useConfigStore((state) => state.openConfigDialog); return ( -
- - - - changeTab(key as SettingsTabKey)} - items={[ - { key: "public", label: "公开配置（对外暴露）" }, - { key: "private", label: "私有配置（不会对外暴露）" }, - ]} - /> - - - - - +
+
+ + + + 前台直连配置 + + 模型 Base URL、API Key、默认模型和 WebDAV 同步都保存在浏览器本地，不再通过后台渠道转发。 + - - - - toggleMode(activeTab, value as EditorMode)} - options={[ - { label: "可视化编辑", value: "visual" }, - { label: "手动编辑 JSON", value: "json" }, - ]} - /> - {activeMode === "json" ? ( - - {jsonError ? ( - {jsonError} - ) : ( - }> - JSON 格式正确 - - )} - - - ) : ( - {activeTab === "public" ? "这些配置会暴露给前端读取" : "这些配置只会在后台保存"} - )} - - - {activeTab === "public" ? ( - activeMode === "visual" ? ( -
- - - - ({ label: item, value: item }))} /> - - - - - ({ label: item, value: item }))} /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - value || "未命名渠道" }, - { title: "协议", dataIndex: "protocol", width: 96, render: (value) => {value || "openai"} }, - { title: "状态", dataIndex: "enabled", width: 96, render: (value) => {value ? "已启用" : "已停用"} }, - { - title: "模型", - dataIndex: "models", - render: (value: string[]) => ( - - {modelSummary(value || [])} - - ), - }, - { title: "权重", dataIndex: "weight", width: 88 }, - { - title: "操作", - key: "actions", - width: 220, - align: "right", - render: (_, item) => ( - - - - + - - - - - } - destroyOnHidden - > - - - - - - - - - - - - - - - - - - - - - - setModelSelectNewModel(event.target.value)} onPressEnter={addModelInSelector} /> - - - - - 如果上游不提供 OpenAI /models 模型列表接口，请在这里手动增加模型名称。 - setModelSelectTab(key as ModelSelectTabKey)} - items={[ - { key: "new", label: `新获取的模型 (${modelSelectGroups.new.length})` }, - { key: "current", label: `已有的模型 (${modelSelectGroups.current.length})` }, - ]} - /> - - - 当前列表已选择 {activeSelectedCount} / {activeModelSelectModels.length} - - - - - - -
- {activeModelSelectModels.length ? ( -
- {activeModelSelectModels.map((model) => ( - toggleSelectedModel(model, event.target.checked)}> - {model} - - ))} -
- ) : ( -
- 没有匹配的模型 -
- )} -
- - - - {testChannel?.name || "渠道"} 渠道的模型测试共 {testChannel?.models.length || 0} 个模型 - - } - open={testChannelIndex !== null} - width={920} - onCancel={closeTestDialog} - footer={ - - - - - } - destroyOnHidden - > - - 普通文本模型会发送一条 hi；Agent Plan / Seedance 视频模型只做配置格式检查，不会发起视频生成，也不代表模型权限已验证。 - setTestKeyword(event.target.value)} /> -
({ model }))} - rowSelection={{ - selectedRowKeys: selectedTestModels, - onChange: (keys) => setSelectedTestModels(keys.map(String)), - }} - columns={[ - { title: "模型名称", dataIndex: "model", render: (value) => {value} }, - { - title: "状态", - dataIndex: "model", - width: 260, - render: (value) => { - if (testingModels.includes(value)) return }>测试中; - const result = testResults[value]; - if (!result) return 未开始; - return result.status === "success" ? ( - - 成功 - 请求时长: {result.duration} - - ) : ( - {result.message} - ); - }, - }, - { - title: "操作", - key: "actions", - width: 120, - align: "right", - render: (_, item) => ( - - ), - }, - ]} - /> - - - - + + + + 本地数据 + + 画布项目、我的素材、生成记录和 AI Key 默认留在浏览器本地；需要跨设备时请在配置弹窗里使用 WebDAV 同步。 + + + + + + ); } - -function normalizeSettings(settings: Partial = {}): AdminSettings { - const privateSetting = normalizePrivateSetting(settings.private); - return { - public: { - ...normalizePublicSetting(settings.public), - }, - private: privateSetting, - }; -} - -function normalizePublicSetting(setting: Partial = {}): AdminSettings["public"] { - return { - ...emptySettings.public, - modelChannel: { - ...emptySettings.public.modelChannel, - ...(setting.modelChannel || {}), - availableModels: setting.modelChannel?.availableModels || [], - modelCosts: normalizeModelCosts(setting.modelChannel?.modelCosts || []), - }, - auth: { - allowRegister: setting.auth?.allowRegister !== false, - linuxDo: { - enabled: setting.auth?.linuxDo?.enabled === true, - }, - }, - }; -} - -function normalizeModelCosts(items: Partial[]) { - return items.filter((item) => item.model).map((item) => ({ model: item.model || "", credits: Math.max(0, Number(item.credits) || 0) })); -} - -function normalizePrivateSetting(setting: Partial = {}): AdminSettings["private"] { - return { - channels: (setting.channels || []).map(normalizeChannel), - promptSync: { - enabled: setting.promptSync?.enabled !== false, - cron: setting.promptSync?.cron || "*/5 * * * *", - }, - auth: { - linuxDo: { - clientId: setting.auth?.linuxDo?.clientId || "", - clientSecret: setting.auth?.linuxDo?.clientSecret || "", - }, - }, - }; -} - -function normalizeChannel(item: Partial = {}): AdminModelChannel { - return { - protocol: "openai", - name: item.name || "", - baseUrl: item.baseUrl || "", - apiKey: item.apiKey || "", - models: item.models || [], - weight: Math.max(1, Number(item.weight) || 1), - enabled: item.enabled !== false, - remark: item.remark || "", - }; -} - -function modelCostCredits(items: AdminSettings["public"]["modelChannel"]["modelCosts"], model: string) { - return items.find((item) => item.model === model)?.credits || 0; -} - -function setModelCost(form: any, setModelCosts: (items: AdminModelCost[]) => void, model: string, credits: number) { - const current = (form.getFieldValue(["public", "modelChannel", "modelCosts"]) || []) as AdminSettings["public"]["modelChannel"]["modelCosts"]; - const next = current.filter((item) => item.model !== model); - next.push({ model, credits: Math.max(0, credits) }); - form.setFieldValue(["public", "modelChannel", "modelCosts"], next); - setModelCosts(next); -} - -function mergeChannelApiKeys(currentChannels: AdminModelChannel[], saved: AdminSettings): AdminSettings { - const channels = saved.private.channels.map((item, index) => ({ - ...item, - apiKey: currentChannels[index]?.apiKey || item.apiKey, - })); - return { - public: saved.public, - private: { ...saved.private, channels }, - }; -} - -function collectChannelModels(channels: AdminModelChannel[]) { - return uniqueModels(channels.filter((channel) => channel.enabled).flatMap((channel) => channel.models || [])); -} - -function collectKnownModels(settings: AdminSettings) { - return uniqueModels([ - ...(settings.public.modelChannel.availableModels || []), - ...(settings.public.modelChannel.modelCosts || []).map((item) => item.model), - ...settings.private.channels.flatMap((channel) => channel.models || []), - ]); -} - -function buildModelSelectGroups(sourceModels: string[], existingModels: string[]): Record { - const source = uniqueModels(sourceModels); - const existing = uniqueModels(existingModels); - const existingSet = new Set(existing); - return { - new: source.filter((model) => !existingSet.has(model)), - current: existing, - }; -} - -function uniqueModels(models: string[]) { - return Array.from(new Set(models.filter(Boolean))); -} - -function modelSummary(models: string[]) { - if (!models.length) return "未配置模型"; - const preview = models.slice(0, 3).join(", "); - return models.length > 3 ? `${models.length} 个模型：${preview}...` : preview; -} - -function parseTabJson(tab: "public", value: string): AdminSettings["public"] | null; -function parseTabJson(tab: "private", value: string): AdminSettings["private"] | null; -function parseTabJson(tab: SettingsTabKey, value: string): AdminSettings[SettingsTabKey] | null; -function parseTabJson(tab: SettingsTabKey, value: string): AdminSettings[SettingsTabKey] | null { - try { - return tab === "public" ? normalizePublicSetting(JSON.parse(value) as Partial) : normalizePrivateSetting(JSON.parse(value) as Partial); - } catch { - return null; - } -} - -async function collectSettings(form: any, editorMode: Record, jsonText: Record, message: { error: (value: string) => void }) { - const values = normalizeSettings(form.getFieldsValue(true) as AdminSettings); - if (editorMode.public === "json") { - const publicSetting = parseTabJson("public", jsonText.public); - if (!publicSetting) { - message.error("公开配置 JSON 格式不正确"); - return null; - } - values.public = publicSetting; - } - if (editorMode.private === "json") { - const privateSetting = parseTabJson("private", jsonText.private); - if (!privateSetting) { - message.error("私有配置 JSON 格式不正确"); - return null; - } - values.private = privateSetting; - } - values.public.modelChannel.availableModels = collectChannelModels(values.private.channels); - return normalizeSettings(values); -} - -function getJsonError(value: string) { - try { - JSON.parse(value); - return ""; - } catch (error) { - return error instanceof Error ? error.message : "JSON 格式不正确"; - } -} diff --git a/web/src/app/(admin)/admin/users/page.tsx b/web/src/app/(admin)/admin/users/page.tsx index 82019d7..21bfc69 100644 --- a/web/src/app/(admin)/admin/users/page.tsx +++ b/web/src/app/(admin)/admin/users/page.tsx @@ -1,261 +1,5 @@ -"use client"; - -import { DeleteOutlined, EditOutlined, PlusOutlined, ReloadOutlined, SearchOutlined } from "@ant-design/icons"; -import { ProTable, type ProColumns } from "@ant-design/pro-components"; -import { Avatar, Button, Card, Col, Divider, Flex, Form, Input, InputNumber, Modal, Row, Select, Space, Tag, Tooltip, Typography } from "antd"; -import dayjs from "dayjs"; -import { useEffect, useState } from "react"; - -import type { AdminUser } from "@/services/api/admin"; -import { useAdminUsers } from "./use-admin-users"; - -type UserFormValues = Partial & { password?: string }; - -const roleOptions = [ - { label: "普通用户", value: "user" }, - { label: "管理员", value: "admin" }, -]; - -const statusOptions = [ - { label: "正常", value: "active" }, - { label: "禁用", value: "ban" }, -]; +import { redirect } from "next/navigation"; export default function AdminUsersPage() { - const { users, keyword, page, pageSize, total, isLoading, searchUsers, changePage, changePageSize, resetFilters, refreshUsers, saveUser: saveAdminUser, adjustCredits, deleteUser } = useAdminUsers(); - const [form] = Form.useForm(); - const [keywordText, setKeywordText] = useState(keyword); - const [editingUser, setEditingUser] = useState | null>(null); - const [deletingUser, setDeletingUser] = useState(null); - - useEffect(() => setKeywordText(keyword), [keyword]); - - useEffect(() => { - if (editingUser) form.setFieldsValue({ role: "user", status: "active", ...editingUser, password: "" }); - }, [editingUser, form]); - - const saveUser = async () => { - const value = await form.validateFields(); - const userValue = { ...value }; - delete userValue.credits; - await saveAdminUser({ ...editingUser, ...userValue, password: value.password || undefined }); - setEditingUser(null); - }; - - const saveCredits = async () => { - if (!editingUser?.id) return; - await adjustCredits(editingUser.id, form.getFieldValue("credits") || 0); - }; - - const columns: ProColumns[] = [ - { - title: "用户", - dataIndex: "username", - width: 260, - render: (_, item) => ( - - {(item.displayName || item.username || "U").slice(0, 1).toUpperCase()} - - - {item.displayName || item.username} - - - {item.username} - - - - ), - }, - { - title: "角色", - dataIndex: "role", - width: 100, - render: (_, item) => {item.role === "admin" ? "管理员" : "用户"}, - }, - { - title: "状态", - dataIndex: "status", - width: 90, - render: (_, item) => {item.status === "ban" ? "禁用" : "正常"}, - }, - { - title: "算力点", - dataIndex: "credits", - width: 100, - render: (_, item) => {item.credits}, - }, - { - title: "Linux.do", - dataIndex: "linuxDoId", - width: 140, - render: (_, item) => {item.linuxDoId || "-"}, - }, - { - title: "最近登录", - dataIndex: "lastLoginAt", - width: 180, - render: (_, item) => {item.lastLoginAt ? dayjs(item.lastLoginAt).format("YYYY-MM-DD HH:mm:ss") : "-"}, - }, - { - title: "操作", - key: "actions", - width: 96, - align: "right", - render: (_, item) => ( - - - - - } - onSearch={() => searchUsers(keywordText)} - onChange={(event) => setKeywordText(event.target.value)} - /> - - - - - - - - - - - - - - - rowKey="id" - columns={columns} - dataSource={users} - loading={isLoading} - search={false} - defaultSize="middle" - tableLayout="fixed" - cardProps={{ variant: "borderless" }} - headerTitle={ - - 用户列表 - {total} 人 - - } - options={{ density: true, setting: true, reload: () => void refreshUsers() }} - toolBarRender={() => [ - , - ]} - pagination={{ - current: page, - pageSize, - total, - showSizeChanger: true, - pageSizeOptions: [10, 20, 50, 100], - showTotal: (value) => `共 ${value} 人`, - onChange: (nextPage, nextPageSize) => (nextPageSize !== pageSize ? changePageSize(nextPageSize) : changePage(nextPage)), - }} - /> - - - setEditingUser(null)} onOk={() => void saveUser()} okText="保存" cancelText="取消" destroyOnHidden> -
- 基础信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - {editingUser?.id ? ( - <> - - 算力点调整 - - - - - - - - - - - - - - ) : null} - - - - setDeletingUser(null)} - onOk={async () => { - if (!deletingUser) return; - await deleteUser(deletingUser.id); - setDeletingUser(null); - }} - okText="删除" - okButtonProps={{ danger: true }} - cancelText="取消" - > - 确定删除「{deletingUser?.displayName || deletingUser?.username}」吗？删除后该账号将无法继续登录。 - - - ); + redirect("/admin/settings"); } diff --git a/web/src/app/(admin)/admin/users/use-admin-users.ts b/web/src/app/(admin)/admin/users/use-admin-users.ts deleted file mode 100644 index 2987de8..0000000 --- a/web/src/app/(admin)/admin/users/use-admin-users.ts +++ /dev/null @@ -1,89 +0,0 @@ -"use client"; - -import { useEffect, useState } from "react"; -import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; -import { App } from "antd"; - -import { adjustAdminUserCredits, deleteAdminUser, fetchAdminUsers, saveAdminUser, type AdminUser } from "@/services/api/admin"; -import { useUserStore } from "@/stores/use-user-store"; - -const defaultPageSize = 10; - -export function useAdminUsers() { - const { message } = App.useApp(); - const queryClient = useQueryClient(); - const token = useUserStore((state) => state.token); - const clearSession = useUserStore((state) => state.clearSession); - const [keyword, setKeyword] = useState(""); - const [page, setPage] = useState(1); - const [pageSize, setPageSize] = useState(defaultPageSize); - - const query = useQuery({ - queryKey: ["admin", "users", token, keyword, page, pageSize], - queryFn: () => fetchAdminUsers(token, { keyword, page, pageSize }), - enabled: Boolean(token), - retry: false, - }); - - const saveMutation = useMutation({ - mutationFn: (user: Partial & { password?: string }) => saveAdminUser(token, user), - onSuccess: async (_, user) => { - await queryClient.invalidateQueries({ queryKey: ["admin", "users"] }); - message.success(user.id ? "用户已保存" : "用户已新增"); - }, - onError: (error) => message.error(error instanceof Error ? error.message : "保存失败"), - }); - - const deleteMutation = useMutation({ - mutationFn: (id: string) => deleteAdminUser(token, id), - onSuccess: async () => { - await queryClient.invalidateQueries({ queryKey: ["admin", "users"] }); - message.success("用户已删除"); - }, - onError: (error) => message.error(error instanceof Error ? error.message : "删除失败"), - }); - - const creditMutation = useMutation({ - mutationFn: ({ id, credits }: { id: string; credits: number }) => adjustAdminUserCredits(token, id, credits), - onSuccess: async () => { - await queryClient.invalidateQueries({ queryKey: ["admin", "users"] }); - message.success("算力点已调整"); - }, - onError: (error) => message.error(error instanceof Error ? error.message : "调整失败"), - }); - - useEffect(() => { - if (query.isError) { - const errorMessage = query.error instanceof Error ? query.error.message : "读取用户失败"; - message.error(errorMessage); - if (errorMessage.includes("未登录") || errorMessage.includes("权限不足") || errorMessage.includes("登录状态无效")) clearSession(); - } - }, [clearSession, message, query.error, query.isError]); - - const updateFilters = (next: Partial<{ keyword: string; page: number; pageSize: number }>) => { - const queryState = { keyword, page, pageSize, ...next }; - if (next.keyword !== undefined || next.pageSize !== undefined) queryState.page = 1; - setKeyword(queryState.keyword); - setPage(queryState.page); - setPageSize(queryState.pageSize); - }; - - const data = query.data; - - return { - users: data?.items || [], - keyword, - page, - pageSize, - total: data?.total || 0, - isLoading: query.isFetching || saveMutation.isPending || deleteMutation.isPending || creditMutation.isPending, - searchUsers: (value = keyword) => updateFilters({ keyword: value }), - changePage: (value: number) => updateFilters({ page: value }), - changePageSize: (value: number) => updateFilters({ pageSize: value }), - resetFilters: () => updateFilters({ keyword: "", page: 1, pageSize: defaultPageSize }), - refreshUsers: () => query.refetch(), - saveUser: (user: Partial & { password?: string }) => saveMutation.mutateAsync(user), - adjustCredits: (id: string, credits: number) => creditMutation.mutateAsync({ id, credits }), - deleteUser: (id: string) => deleteMutation.mutateAsync(id), - }; -} diff --git a/web/src/app/(user)/canvas/components/canvas-agent-chat-ui.tsx b/web/src/app/(user)/canvas/components/canvas-agent-chat-ui.tsx index dbe4a68..25d97c2 100644 --- a/web/src/app/(user)/canvas/components/canvas-agent-chat-ui.tsx +++ b/web/src/app/(user)/canvas/components/canvas-agent-chat-ui.tsx @@ -48,7 +48,7 @@ export function AgentChatMessage({ item, theme, user, onRejectTool, onApproveToo
{!isUser ? : null}
-
{item.text}
+
{item.text}
{item.attachments?.length ? : null} {item.meta ?
{item.meta}
: null}
diff --git a/web/src/app/(user)/login/page.tsx b/web/src/app/(user)/login/page.tsx index e9f1936..f9a3234 100644 --- a/web/src/app/(user)/login/page.tsx +++ b/web/src/app/(user)/login/page.tsx @@ -1,136 +1,35 @@ "use client"; -import { LockOutlined, UserOutlined } from "@ant-design/icons"; -import { App, Button, Form, Input, Segmented, Space } from "antd"; -import { useRouter, useSearchParams } from "next/navigation"; -import { Suspense, useEffect, useState } from "react"; +import { Button } from "antd"; +import { ArrowLeft, Settings2 } from "lucide-react"; +import Link from "next/link"; -import { fetchCurrentUser } from "@/services/api/auth"; import { useConfigStore } from "@/stores/use-config-store"; -import { useUserStore } from "@/stores/use-user-store"; - -type LoginFormValues = { - username: string; - password: string; - confirmPassword?: string; -}; - -// 仅放行站内相对路径，拦截开放重定向。浏览器会忽略 URL 中的 Tab/换行/回车，并把 -// //host 或 /\host 解析为协议相对的跨站地址，因此先剥离控制字符，再拒绝 // 与 /\ 前缀。 -function safeRedirect(value: string | null): string { - const cleaned = (value ?? "").replace(/[\t\n\r]/g, ""); - if (!cleaned.startsWith("/") || cleaned.startsWith("//") || cleaned.startsWith("/\\")) { - return "/"; - } - return cleaned; -} export default function LoginPage() { - return ( - - - - ); -} - -function LoginContent() { - const { message } = App.useApp(); - const router = useRouter(); - const searchParams = useSearchParams(); - const login = useUserStore((state) => state.login); - const register = useUserStore((state) => state.register); - const setSession = useUserStore((state) => state.setSession); - const isLoading = useUserStore((state) => state.isLoading); - const linuxDoEnabled = useConfigStore((state) => state.publicSettings?.auth?.linuxDo?.enabled === true); - const allowRegister = useConfigStore((state) => state.publicSettings?.auth?.allowRegister !== false); - const [mode, setMode] = useState<"login" | "register">("login"); - const redirect = safeRedirect(searchParams.get("redirect")); - - useEffect(() => { - const token = searchParams.get("token"); - const error = searchParams.get("error"); - if (error) message.error(error); - if (!token) return; - void fetchCurrentUser(token).then((user) => { - setSession(token, user); - message.success("登录成功"); - router.replace(redirect); - router.refresh(); - }); - }, [message, redirect, router, searchParams, setSession]); - - useEffect(() => { - if (!allowRegister && mode === "register") setMode("login"); - }, [allowRegister, mode]); - - const submit = async (values: LoginFormValues) => { - try { - if (mode === "register" && !allowRegister) { - message.error("当前未开放注册"); - return; - } - if (mode === "register" && values.password !== values.confirmPassword) { - message.error("两次输入的密码不一致"); - return; - } - const action = mode === "register" ? register : login; - const user = await action({ username: values.username, password: values.password }); - message.success(mode === "register" ? "注册成功" : "登录成功"); - router.replace(redirect); - router.refresh(); - if (user.role !== "admin") router.replace("/"); - } catch (error) { - message.error(error instanceof Error ? error.message : "登录失败"); - } - }; + const openConfigDialog = useConfigStore((state) => state.openConfigDialog); return (
-
-
- -

账号登录

-

支持账号密码和 Linux.do 登录。

+
+ +

无需账号登录

+

当前版本以浏览器本地数据为主，AI 请求使用你在本机配置的 Base URL 和 API Key 前台直连。

+
+ + + +
- - layout="vertical" size="large" requiredMark={false} onFinish={submit}> - - setMode(value as "login" | "register")} - options={allowRegister ? [{ label: "登录", value: "login" }, { label: "注册", value: "register" }] : [{ label: "登录", value: "login" }]} - /> - - 用户名} rules={[{ required: true, message: "请输入用户名" }]}> - } autoComplete="username" /> - - 密码} rules={[{ required: true, message: "请输入密码" }]}> - } autoComplete="current-password" /> - - {mode === "register" ? ( - 确认密码} rules={[{ required: true, message: "请再次输入密码" }]}> - } autoComplete="new-password" /> - - ) : null} - - - {linuxDoEnabled ? ( - - ) : null} - -
); diff --git a/web/src/app/api/[...path]/route.ts b/web/src/app/api/[...path]/route.ts deleted file mode 100644 index 1abbc35..0000000 --- a/web/src/app/api/[...path]/route.ts +++ /dev/null @@ -1,60 +0,0 @@ -import type { NextRequest } from "next/server"; - -export const runtime = "nodejs"; -export const maxDuration = 300; - -type RouteContext = { - params: Promise<{ path: string[] }>; -}; - -function proxyHeaders(request: NextRequest) { - const headers = new Headers(request.headers); - headers.delete("host"); - headers.delete("content-length"); - headers.delete("connection"); - headers.set("x-forwarded-host", request.nextUrl.host); - headers.set("x-forwarded-proto", request.nextUrl.protocol.replace(":", "")); - return headers; -} - -function responseHeaders(response: Response) { - const headers = new Headers(response.headers); - headers.delete("content-length"); - headers.delete("content-encoding"); - headers.delete("transfer-encoding"); - return headers; -} - -async function proxy(request: NextRequest, context: RouteContext) { - const { path } = await context.params; - const apiBaseUrl = process.env.API_BASE_URL || "http://127.0.0.1:8080"; - const target = `${apiBaseUrl.replace(/\/$/, "")}/api/${path.map(encodeURIComponent).join("/")}${request.nextUrl.search}`; - const hasBody = request.method !== "GET" && request.method !== "HEAD"; - - try { - const response = await fetch(target, { - method: request.method, - headers: proxyHeaders(request), - body: hasBody ? request.body : undefined, - duplex: hasBody ? "half" : undefined, - redirect: "manual", - } as RequestInit & { duplex?: "half" }); - - return new Response(response.body, { - status: response.status, - statusText: response.statusText, - headers: responseHeaders(response), - }); - } catch (error) { - console.error("Failed to proxy", target, error); - return Response.json({ code: 1, data: null, msg: "接口连接失败，请确认后端服务已启动" }, { status: 502 }); - } -} - -export const GET = proxy; -export const HEAD = proxy; -export const POST = proxy; -export const PUT = proxy; -export const PATCH = proxy; -export const DELETE = proxy; -export const OPTIONS = proxy; diff --git a/web/src/app/api/prompts/route.ts b/web/src/app/api/prompts/route.ts new file mode 100644 index 0000000..8585827 --- /dev/null +++ b/web/src/app/api/prompts/route.ts @@ -0,0 +1,258 @@ +import type { NextRequest } from "next/server"; + +export const runtime = "nodejs"; +export const dynamic = "force-dynamic"; + +type Prompt = { + id: string; + title: string; + coverUrl: string; + prompt: string; + tags: string[]; + category: string; + githubUrl: string; + preview: string; + createdAt: string; + updatedAt: string; +}; + +type PromptCategory = { + category: string; + githubUrl: string; + build: () => Promise[]>; +}; + +const gptImage2RawBase = "https://raw.githubusercontent.com/EvoLinkAI/awesome-gpt-image-2-API-and-Prompts/main"; +const awesomeGptImageRawBase = "https://raw.githubusercontent.com/ZeroLu/awesome-gpt-image/main"; +const awesomeGpt4oImagePromptsBase = "https://raw.githubusercontent.com/ImgEdify/Awesome-GPT4o-Image-Prompts/main"; +const youMindGptImage2RawBase = "https://raw.githubusercontent.com/YouMind-OpenLab/awesome-gpt-image-2/main"; +const youMindNanoBananaProRawBase = "https://raw.githubusercontent.com/YouMind-OpenLab/awesome-nano-banana-pro-prompts/main"; +const davidWuGptImage2RawBase = "https://raw.githubusercontent.com/davidwuw0811-boop/awesome-gpt-image2-prompts/main"; +const gptImage2CaseFiles = ["README.md", "cases/ad-creative.md", "cases/character.md", "cases/comparison.md", "cases/ecommerce.md", "cases/portrait.md", "cases/poster.md", "cases/ui.md"]; +const cacheTtlMs = 1000 * 60 * 60; + +const categories: PromptCategory[] = [ + { category: "gpt-image-2-prompts", githubUrl: "https://github.com/EvoLinkAI/awesome-gpt-image-2-API-and-Prompts", build: buildGptImage2Prompts }, + { category: "awesome-gpt-image", githubUrl: "https://github.com/ZeroLu/awesome-gpt-image", build: buildAwesomeGptImagePrompts }, + { category: "awesome-gpt4o-image-prompts", githubUrl: "https://github.com/ImgEdify/Awesome-GPT4o-Image-Prompts", build: buildAwesomeGpt4oImagePrompts }, + { category: "youmind-gpt-image-2", githubUrl: "https://github.com/YouMind-OpenLab/awesome-gpt-image-2", build: () => buildYouMindPrompts(youMindGptImage2RawBase, "youmind-gpt-image-2", "gpt-image-2") }, + { category: "youmind-nano-banana-pro", githubUrl: "https://github.com/YouMind-OpenLab/awesome-nano-banana-pro-prompts", build: () => buildYouMindPrompts(youMindNanoBananaProRawBase, "youmind-nano-banana-pro", "nano-banana-pro") }, + { category: "davidwu-gpt-image2-prompts", githubUrl: "https://github.com/davidwuw0811-boop/awesome-gpt-image2-prompts", build: buildDavidWuGptImage2Prompts }, +]; + +let memoryCache: { items: Prompt[]; fetchedAt: number } | null = null; +let loadingPrompts: Promise | null = null; + +export async function GET(request: NextRequest) { + const params = request.nextUrl.searchParams; + const keyword = (params.get("keyword") || "").trim().toLowerCase(); + const tags = params.getAll("tag").filter(Boolean); + const category = params.get("category") || ""; + const page = Math.max(1, Number(params.get("page")) || 1); + const pageSize = Math.max(1, Math.min(100, Number(params.get("pageSize")) || 20)); + const items = await getPrompts(); + const withoutTagFilter = filterPrompts(items, { keyword, category, tags: [] }); + const filtered = filterPrompts(items, { keyword, category, tags }); + + return Response.json({ + items: filtered.slice((page - 1) * pageSize, page * pageSize), + tags: collectTags(withoutTagFilter), + categories: categories.map((item) => item.category), + total: filtered.length, + }); +} + +async function getPrompts() { + if (memoryCache && Date.now() - memoryCache.fetchedAt < cacheTtlMs) return memoryCache.items; + if (loadingPrompts) return loadingPrompts; + loadingPrompts = loadPrompts().finally(() => { + loadingPrompts = null; + }); + return loadingPrompts; +} + +async function loadPrompts() { + const settled = await Promise.all( + categories.map(async (category) => { + try { + const items = await category.build(); + return items.map((item) => ({ ...item, category: category.category, githubUrl: category.githubUrl })); + } catch { + return []; + } + }), + ); + const items = settled.flat(); + memoryCache = { items, fetchedAt: Date.now() }; + return items; +} + +function filterPrompts(items: Prompt[], options: { keyword: string; category: string; tags: string[] }) { + return items.filter((item) => { + if (isActiveOption(options.category) && item.category !== options.category) return false; + if (options.tags.length && !options.tags.some((tag) => item.tags.includes(tag))) return false; + if (!options.keyword) return true; + return [item.title, item.prompt, item.category, ...item.tags].join(" ").toLowerCase().includes(options.keyword); + }); +} + +async function buildGptImage2Prompts() { + const data = (await fetchJson<{ records?: Array<{ title?: string; tweet_url?: string; image_dir?: string; category?: string; added_at?: string }> }>(gptImage2RawBase, "data/ingested_tweets.json")).records || []; + const cases = new Map(); + const markdowns = await Promise.all(gptImage2CaseFiles.map((file) => fetchText(gptImage2RawBase, file))); + markdowns.forEach((markdown) => collectGptImage2Cases(cases, markdown)); + const items: Omit[] = []; + data.forEach((item) => { + const prompt = cases.get(item.tweet_url || ""); + if (!item.title || !prompt || !item.image_dir) return; + const image = `${gptImage2RawBase}/${item.image_dir}/output.jpg`; + items.push({ id: `gpt-image-2-prompts-${leftPad(items.length + 1)}`, title: item.title, coverUrl: image, prompt, tags: tagsFromCategory(item.category || ""), preview: markdownPreview([image]), createdAt: item.added_at || "", updatedAt: item.added_at || "" }); + }); + return items; +} + +function collectGptImage2Cases(cases: Map, markdown: string) { + for (const match of markdown.matchAll(/### Case \d+: \[[^\]]+]\(([^)]+)\).*?\*\*Prompt:\*\*\s*\r?\n\s*```[\w-]*\r?\n(.*?)\r?\n```/gs)) { + cases.set(match[1], match[2].trim()); + } +} + +async function buildAwesomeGptImagePrompts() { + const markdown = await fetchText(awesomeGptImageRawBase, "README.zh-CN.md"); + const items: Omit[] = []; + for (const section of splitBeforeHeading(markdown, "## ")) { + const tags = tagsFromHeading(firstMatch(section, /^##\s+(.+)$/m)); + for (const block of splitBeforeHeading(section, "### ")) { + const title = firstMatch(block, /^###\s+(.+)$/m).replace(/\[([^\]]+)]\([^)]+\)/g, "$1").trim(); + const prompt = firstMatch(block, /\*\*提示词:\*\*\s*\r?\n\s*```[\w-]*\r?\n(.*?)\r?\n```/s).trim(); + if (!title || !prompt) continue; + const images = extractMarkdownImages(awesomeGptImageRawBase, block); + items.push(defaultPrompt(`awesome-gpt-image-${leftPad(items.length + 1)}`, title, prompt, images[0] || "", tags, markdownPreview(images))); + } + } + return items; +} + +async function buildAwesomeGpt4oImagePrompts() { + const markdown = await fetchText(awesomeGpt4oImagePromptsBase, "README.zh-CN.md"); + const items: Omit[] = []; + for (const block of splitBeforeHeading(markdown, "### ")) { + const title = firstMatch(block, /^###\s+(.+)$/m).trim(); + const prompt = firstMatch(block, /- \*\*提示词文本：\*\*\s*`(.*?)`/s).trim(); + if (!title || !prompt) continue; + const images = extractMarkdownImages(awesomeGpt4oImagePromptsBase, block); + items.push(defaultPrompt(`awesome-gpt4o-image-prompts-${leftPad(items.length + 1)}`, title, prompt, images[0] || "", ["gpt4o"], markdownPreview(images))); + } + return items; +} + +async function buildYouMindPrompts(baseUrl: string, idPrefix: string, modelTag: string) { + const markdown = await fetchText(baseUrl, "README_zh.md"); + const items: Omit[] = []; + for (const block of splitBeforeHeading(markdown, "### ")) { + const title = firstMatch(block, /^###\s+No\.\s*\d+:\s*(.+)$/m).trim(); + const prompt = firstMatch(block, /#### .*?提示词\s*\r?\n\s*```[\w-]*\r?\n(.*?)\r?\n```/s).trim(); + if (!title || !prompt) continue; + const images = extractMarkdownImages(baseUrl, block); + items.push(defaultPrompt(`${idPrefix}-${leftPad(items.length + 1)}`, title, prompt, images[0] || "", youMindTags(title, modelTag), markdownPreview(images))); + } + return items; +} + +async function buildDavidWuGptImage2Prompts() { + const data = await fetchJson>(davidWuGptImage2RawBase, "prompts.json"); + return data + .map((item, index) => { + const title = (item.title_cn || item.title_en || "").trim(); + const prompt = (item.prompt || "").trim(); + if (!title || !prompt) return null; + const image = absoluteImage(davidWuGptImage2RawBase, item.image || ""); + const preview = [item.title_en, item.note, image ? `![](${image})` : ""].filter(Boolean).join("\n\n"); + return defaultPrompt(`davidwu-gpt-image2-prompts-${leftPad(item.id || index + 1)}`, title, prompt, image, davidWuTags(item), preview); + }) + .filter((item): item is Omit => Boolean(item)); +} + +function defaultPrompt(id: string, title: string, prompt: string, coverUrl: string, tags: string[], preview: string): Omit { + return { id, title, coverUrl, prompt, tags, preview, createdAt: "", updatedAt: "" }; +} + +async function fetchText(baseUrl: string, file: string) { + const response = await fetch(`${baseUrl}/${file}`, { cache: "no-store" }); + if (!response.ok) throw new Error(`${file} 拉取失败`); + return response.text(); +} + +async function fetchJson(baseUrl: string, file: string) { + return JSON.parse(await fetchText(baseUrl, file)) as T; +} + +function splitBeforeHeading(markdown: string, prefix: string) { + const blocks: string[] = []; + let current: string[] = []; + for (const line of markdown.split("\n")) { + if (line.startsWith(prefix) && current.length) { + blocks.push(current.join("\n")); + current = []; + } + current.push(line); + } + blocks.push(current.join("\n")); + return blocks; +} + +function firstMatch(value: string, pattern: RegExp) { + return pattern.exec(value)?.[1] || ""; +} + +function extractMarkdownImages(baseUrl: string, markdown: string) { + return Array.from(markdown.matchAll(/!\[[^\]]*]\(([^)]+)\)/g), (match) => absoluteImage(baseUrl, match[1])).filter(Boolean); +} + +function absoluteImage(baseUrl: string, image: string) { + if (!image) return ""; + if (/^https?:\/\//i.test(image)) return image; + return `${baseUrl}/${image.replace(/^\.?\//, "")}`; +} + +function tagsFromCategory(category: string) { + return splitTags(category.replace(/\s+Cases$/i, ""), /\s*(?:&|and)\s*/); +} + +function tagsFromHeading(heading: string) { + return splitTags(heading.replace(/[^\p{L}\p{N}/&、与 ]/gu, ""), /\s*(?:\/|&|、|与)\s*/); +} + +function youMindTags(title: string, modelTag: string) { + const [, prefix] = title.match(/^(.+?) - /) || []; + return [modelTag, ...tagsFromHeading(prefix || "")]; +} + +function davidWuTags(item: { category_cn?: string; category?: string; author?: string; source?: string; needs_ref?: boolean }) { + const tags = splitTags([item.category_cn, item.category, item.author, item.source].filter(Boolean).join("/"), /\//); + if (item.needs_ref) tags.push("需要参考图"); + return tags; +} + +function splitTags(value: string, pattern: RegExp) { + return value + .split(pattern) + .map((tag) => tag.trim().toLowerCase()) + .filter(Boolean); +} + +function markdownPreview(images: string[]) { + return images.filter(Boolean).map((image) => `![](${image})`).join("\n\n"); +} + +function collectTags(items: Prompt[]) { + return Array.from(new Set(items.flatMap((item) => item.tags).filter(Boolean))); +} + +function leftPad(value: number) { + return String(value).padStart(4, "0"); +} + +function isActiveOption(value: string) { + return value && value !== "全部" && value !== "all"; +} diff --git a/web/src/components/layout/app-config-modal.tsx b/web/src/components/layout/app-config-modal.tsx index 728a75e..bacee23 100644 --- a/web/src/components/layout/app-config-modal.tsx +++ b/web/src/components/layout/app-config-modal.tsx @@ -9,7 +9,7 @@ import { fetchImageModels } from "@/services/api/image"; import { syncAppDataToWebdav, type AppSyncDomainKey, type AppSyncProgressEvent } from "@/services/app-sync"; import { testWebdavConnection, WEBDAV_MANIFEST_FILE_NAME } from "@/services/webdav-sync"; import { audioFormatOptions, audioVoiceOptions, normalizeAudioSpeedValue } from "@/lib/audio-generation"; -import { filterModelsByCapability, useConfigStore, useEffectiveConfig, type AiConfig, type ModelCapability } from "@/stores/use-config-store"; +import { filterModelsByCapability, useConfigStore, type ModelCapability } from "@/stores/use-config-store"; type ModelGroup = { capability: ModelCapability; @@ -67,26 +67,19 @@ export function AppConfigModal() { const shouldPromptContinue = useConfigStore((state) => state.shouldPromptContinue); const setConfigDialogOpen = useConfigStore((state) => state.setConfigDialogOpen); const clearPromptContinue = useConfigStore((state) => state.clearPromptContinue); - const publicSettings = useConfigStore((state) => state.publicSettings); - const effectiveConfig = useEffectiveConfig(); - const modelChannel = publicSettings?.modelChannel; - const allowCustomChannel = modelChannel?.allowCustomChannel === true; - const effectiveMode = allowCustomChannel ? config.channelMode : "remote"; - const modelConfig = effectiveMode === "remote" ? effectiveConfig : config; const modelOptions = config.models.map((model) => ({ label: model, value: model })); const webdavReady = Boolean(webdav.url.trim()); const finishConfig = () => { setConfigDialogOpen(false); - if (effectiveMode === "local" && (!config.baseUrl.trim() || !config.apiKey.trim())) return; - if (!modelConfig.imageModel.trim() || !modelConfig.videoModel.trim() || !modelConfig.textModel.trim()) return; - if (!allowCustomChannel && config.channelMode !== "remote") updateConfig("channelMode", "remote"); + if (!config.baseUrl.trim() || !config.apiKey.trim()) return; + if (!config.imageModel.trim() || !config.videoModel.trim() || !config.textModel.trim()) return; + if (config.channelMode !== "local") updateConfig("channelMode", "local"); message.success(shouldPromptContinue ? "配置已保存，请继续刚才的请求" : "配置已保存"); clearPromptContinue(); }; const refreshModels = async () => { - if (effectiveMode === "remote") return; if (!config.baseUrl.trim() || !config.apiKey.trim()) { message.error("请先填写 Base URL 和 API Key"); return; @@ -197,74 +190,53 @@ export function AppConfigModal() { >
- {allowCustomChannel ? ( - - updateConfig("channelMode", value as AiConfig["channelMode"])} - options={[ - { label: "本地直连", value: "local" }, - { label: "云端渠道", value: "remote" }, - ]} - /> +
+
前台直连
+
AI 请求由浏览器直接发送到你配置的 OpenAI 兼容地址，API Key 只保存在当前浏览器本地。
+
+
+ + updateConfig("baseUrl", event.target.value)} /> - ) : null} - {effectiveMode === "local" ? ( - <> -
- - updateConfig("baseUrl", event.target.value)} /> - - - updateConfig("apiKey", event.target.value)} /> - -
-
-
-
模型列表
-
当前已保存 {config.models.length} 个模型
-
- -
- - ) : ( -
-
云端渠道
-
由系统后台渠道转发请求，当前可用 {modelChannel?.availableModels.length || 0} 个模型。
+ + updateConfig("apiKey", event.target.value)} /> + +
+
+
+
模型列表
+
当前已保存 {config.models.length} 个模型
- )} - {effectiveMode === "local" ? ( -
-
-
本地模型可选项
-
从已拉取模型中选择哪些模型可进入各类下拉。
-
-
- {modelGroups.map((group) => ( - - updateCapabilityModels(group, models)} + /> + + ))} +
+
{modelGroups.map((group) => ( - updateConfig(group.modelKey, model)} capability={group.capability} fullWidth /> + updateConfig(group.modelKey, model)} capability={group.capability} fullWidth /> ))}
@@ -300,11 +272,9 @@ export function AppConfigModal() { updateConfig("audioInstructions", event.target.value)} /> - {effectiveMode === "local" ? ( - - updateConfig("systemPrompt", event.target.value)} /> - - ) : null} + + updateConfig("systemPrompt", event.target.value)} /> +
diff --git a/web/src/components/layout/client-root-init.tsx b/web/src/components/layout/client-root-init.tsx index 3523ee4..11da38a 100644 --- a/web/src/components/layout/client-root-init.tsx +++ b/web/src/components/layout/client-root-init.tsx @@ -2,54 +2,39 @@ import type { ReactNode } from "react"; import { useEffect, useRef } from "react"; -import { usePathname } from "next/navigation"; import { App } from "antd"; import { useConfigStore } from "@/stores/use-config-store"; -import { useUserStore } from "@/stores/use-user-store"; export function ClientRootInit({ children }: { children: ReactNode }) { const { message } = App.useApp(); const handledConfigParams = useRef(false); - const pathname = usePathname(); - const hydrateUser = useUserStore((state) => state.hydrateUser); const loadPublicSettings = useConfigStore((state) => state.loadPublicSettings); - const publicSettings = useConfigStore((state) => state.publicSettings); const updateConfig = useConfigStore((state) => state.updateConfig); const openConfigDialog = useConfigStore((state) => state.openConfigDialog); - const isLoginPage = pathname === "/login" || pathname === "/admin/login"; useEffect(() => { void loadPublicSettings(); }, [loadPublicSettings]); - useEffect(() => { - if (!isLoginPage) void hydrateUser(); - }, [hydrateUser, isLoginPage]); - useEffect(() => { if (handledConfigParams.current) return; const searchParams = new URLSearchParams(window.location.search); const baseUrl = searchParams.get("baseUrl") || searchParams.get("baseurl"); const apiKey = searchParams.get("apiKey") || searchParams.get("apikey"); if (!baseUrl && !apiKey) return; - if (!publicSettings) return; handledConfigParams.current = true; searchParams.delete("baseUrl"); searchParams.delete("baseurl"); searchParams.delete("apiKey"); searchParams.delete("apikey"); window.history.replaceState(null, "", `${window.location.pathname}${searchParams.size ? `?${searchParams}` : ""}${window.location.hash}`); - if (!publicSettings.modelChannel.allowCustomChannel) { - openConfigDialog(false); - message.error("后台未允许用户自定义渠道，请联系管理员进行配置"); - return; - } updateConfig("channelMode", "local"); if (baseUrl) updateConfig("baseUrl", baseUrl); if (apiKey) updateConfig("apiKey", apiKey); openConfigDialog(false); - }, [message, openConfigDialog, publicSettings, updateConfig]); + message.success("已导入本地直连配置"); + }, [message, openConfigDialog, updateConfig]); return <>{children}; } diff --git a/web/src/components/layout/user-status-actions.tsx b/web/src/components/layout/user-status-actions.tsx index a035278..829615d 100644 --- a/web/src/components/layout/user-status-actions.tsx +++ b/web/src/components/layout/user-status-actions.tsx @@ -1,15 +1,13 @@ "use client"; import type { CSSProperties, RefObject } from "react"; -import { Avatar, Dropdown, Tooltip } from "antd"; -import { BookOpen, Keyboard, LogOut, Settings2, Shield } from "lucide-react"; +import { Avatar, Dropdown } from "antd"; +import { BookOpen, Keyboard, LogOut, Settings2 } from "lucide-react"; import type { ItemType } from "antd/es/menu/interface"; -import Link from "next/link"; import { AnimatedThemeToggler } from "@/components/ui/animated-theme-toggler"; import { GitHubLink } from "@/components/layout/github-link"; import { VersionReleaseModal } from "@/components/layout/version-release-modal"; -import { CreditSymbol } from "@/constant/credits"; import { DOCS_URL } from "@/constant/env"; import { cn } from "@/lib/utils"; import { canvasThemes } from "@/lib/canvas-theme"; @@ -35,7 +33,6 @@ export function UserStatusActions({ showConfig = true, variant = "default", onOp const openConfigDialog = useConfigStore((state) => state.openConfigDialog); const canvasTheme = canvasThemes[theme]; const userName = user?.displayName || user?.username || ""; - const credits = user?.credits ?? 0; const avatarUrl = user?.avatarUrl?.trim(); const avatarText = (userName.trim()[0] || "U").toUpperCase(); const naturalIconClass = "inline-flex size-7 shrink-0 items-center justify-center text-stone-600 transition hover:text-stone-950 dark:text-stone-300 dark:hover:text-white [&_svg]:size-4"; @@ -46,10 +43,9 @@ export function UserStatusActions({ showConfig = true, variant = "default", onOp const avatarStyle: CSSProperties | undefined = variant === "canvas" ? { borderColor: canvasTheme.toolbar.border, color: canvasTheme.node.text, background: "transparent" } : undefined; const menuItems: ItemType[] = [ { key: "user", disabled: true, label: {userName} }, - ...(user?.role === "admin" ? [{ key: "admin", icon: , label: 管理后台 }] : []), ...(onOpenShortcuts ? [{ key: "shortcuts", icon: , label: "快捷键", onClick: onOpenShortcuts }] : []), { type: "divider" }, - { key: "logout", icon: , label: "退出登录", onClick: logout }, + { key: "logout", icon: , label: "清除本地账户", onClick: logout }, ]; return ( @@ -65,24 +61,11 @@ export function UserStatusActions({ showConfig = true, variant = "default", onOp - {variant === "canvas" && user ? ( - -
- - {credits.toLocaleString()} -
- - ) : null} {!user && onOpenShortcuts ? ( ) : null} - {!user ? ( - - 登录 - - ) : null} {user ? (
diff --git a/web/src/components/model-picker.tsx b/web/src/components/model-picker.tsx index 869f3dd..6065af3 100644 --- a/web/src/components/model-picker.tsx +++ b/web/src/components/model-picker.tsx @@ -85,7 +85,6 @@ export function ModelPicker({ config, value, onChange, capability, className, fu function emptyModelLabel(config: AiConfig, capability?: ModelCapability) { const label = capability === "image" ? "生图" : capability === "video" ? "视频" : capability === "text" ? "文本" : capability === "audio" ? "音频" : ""; - if (config.channelMode === "remote") return `暂无可用${label}模型`; if (capability && config.models.length) return "请先在上方配置可选模型"; return config.models.length ? `暂无匹配的${label}模型` : "请先到配置里拉取模型列表"; } diff --git a/web/src/services/api/admin.ts b/web/src/services/api/admin.ts index d4971ab..d04ef70 100644 --- a/web/src/services/api/admin.ts +++ b/web/src/services/api/admin.ts @@ -1,5 +1,7 @@ -import { apiDelete, apiGet, apiPost, compactApiParams } from "@/services/api/request"; -import type { Prompt, PromptListResponse } from "@/services/api/prompts"; +import { nanoid } from "nanoid"; + +import { fetchPrompts, type Prompt, type PromptListResponse } from "@/services/api/prompts"; +import { fetchImageModels } from "@/services/api/image"; export type AdminPromptCategory = { category: string; @@ -57,39 +59,40 @@ export type AdminUserQuery = { }; export async function fetchAdminUsers(token: string, query: AdminUserQuery = {}) { - return apiGet("/api/admin/users", compactApiParams(query), token); + return { items: [], total: 0 }; } export async function saveAdminUser(token: string, user: Partial & { password?: string }) { - return apiPost("/api/admin/users", user, token); + return { ...emptyAdminUser(), ...user, id: user.id || nanoid() }; } export async function adjustAdminUserCredits(token: string, id: string, credits: number) { - return apiPost(`/api/admin/users/${encodeURIComponent(id)}/credits`, { credits }, token); + return { ...emptyAdminUser(), id, credits }; } export async function deleteAdminUser(token: string, id: string) { - return apiDelete(`/api/admin/users/${encodeURIComponent(id)}`, token); + return true; } export async function fetchAdminCreditLogs(token: string, query: AdminUserQuery = {}) { - return apiGet("/api/admin/credit-logs", compactApiParams(query), token); + return { items: [], total: 0 }; } export async function saveAdminCreditLog(token: string, log: Partial) { - return apiPost("/api/admin/credit-logs", log, token); + return { id: log.id || nanoid(), userId: "", type: "", amount: 0, balance: 0, relatedId: "", remark: "", extra: "", createdAt: new Date().toISOString(), ...log }; } export async function deleteAdminCreditLog(token: string, id: string) { - return apiDelete(`/api/admin/credit-logs/${encodeURIComponent(id)}`, token); + return true; } export async function fetchAdminPromptCategories(token: string) { - return apiGet("/api/admin/prompt-categories", undefined, token); + return promptCategories; } export async function syncAdminPromptCategory(token: string, category: string) { - return apiPost("/api/admin/prompt-categories/sync", { category }, token); + await fetchPrompts({ category, pageSize: 1 }); + return promptCategories; } export type AdminPromptQuery = { @@ -121,19 +124,20 @@ export type AdminAssetListResponse = { }; export async function fetchAdminPrompts(token: string, query: AdminPromptQuery = {}) { - return apiGet("/api/admin/prompts", compactApiParams(query), token); + return fetchPrompts(query); } export async function saveAdminPrompt(token: string, prompt: Partial) { - return apiPost("/api/admin/prompts", prompt, token); + const now = new Date().toISOString(); + return { id: prompt.id || nanoid(), title: "", coverUrl: "", prompt: "", tags: [], category: "", githubUrl: "", preview: "", createdAt: now, updatedAt: now, ...prompt }; } export async function deleteAdminPrompt(token: string, id: string) { - return apiDelete(`/api/admin/prompts/${encodeURIComponent(id)}`, token); + return true; } export async function deleteAdminPrompts(token: string, ids: string[]) { - return apiPost("/api/admin/prompts/batch-delete", { ids }, token); + return true; } export type AdminAssetQuery = { @@ -145,15 +149,15 @@ export type AdminAssetQuery = { }; export async function fetchAdminAssets(token: string, query: AdminAssetQuery = {}) { - return apiGet("/api/admin/assets", compactApiParams(query), token); + return { items: [], tags: [], total: 0 }; } export async function saveAdminAsset(token: string, asset: Partial) { - return apiPost("/api/admin/assets", asset, token); + return { id: asset.id || nanoid(), title: "", type: "text", coverUrl: "", tags: [], category: "", description: "", content: "", url: "", createdAt: new Date().toISOString(), updatedAt: new Date().toISOString(), ...asset }; } export async function deleteAdminAsset(token: string, id: string) { - return apiDelete(`/api/admin/assets/${encodeURIComponent(id)}`, token); + return true; } export type AdminModelChannel = { @@ -213,11 +217,11 @@ export type AdminSettings = { }; export async function fetchAdminSettings(token: string) { - return apiGet("/api/admin/settings", undefined, token); + return defaultAdminSettings(); } export async function saveAdminSettings(token: string, settings: AdminSettings) { - return apiPost("/api/admin/settings", settings, token); + return settings; } export type AdminChannelActionRequest = { @@ -227,9 +231,64 @@ export type AdminChannelActionRequest = { }; export async function fetchChannelModels(token: string, payload: AdminChannelActionRequest) { - return apiPost("/api/admin/settings/channel-models", payload, token); + return fetchImageModels({ ...defaultAiConfig(), baseUrl: payload.channel.baseUrl, apiKey: payload.channel.apiKey || "local", model: payload.model || "", models: payload.channel.models }); } export async function testChannelModel(token: string, payload: AdminChannelActionRequest) { - return apiPost("/api/admin/settings/channel-test", payload, token); + return "前台直连配置已保存，请在前台生成时验证模型可用性"; +} + +const promptCategories: AdminPromptCategory[] = [ + { category: "gpt-image-2-prompts", name: "GPT Image 2 Prompts", description: "", file: "", githubUrl: "https://github.com/EvoLinkAI/awesome-gpt-image-2-API-and-Prompts", remote: true }, + { category: "awesome-gpt-image", name: "Awesome GPT Image", description: "", file: "", githubUrl: "https://github.com/ZeroLu/awesome-gpt-image", remote: true }, + { category: "awesome-gpt4o-image-prompts", name: "Awesome GPT-4o Image Prompts", description: "", file: "", githubUrl: "https://github.com/ImgEdify/Awesome-GPT4o-Image-Prompts", remote: true }, + { category: "youmind-gpt-image-2", name: "YouMind GPT Image 2", description: "", file: "", githubUrl: "https://github.com/YouMind-OpenLab/awesome-gpt-image-2", remote: true }, + { category: "youmind-nano-banana-pro", name: "YouMind Nano Banana Pro", description: "", file: "", githubUrl: "https://github.com/YouMind-OpenLab/awesome-nano-banana-pro-prompts", remote: true }, + { category: "davidwu-gpt-image2-prompts", name: "DavidWu GPT Image2 Prompts", description: "", file: "", githubUrl: "https://github.com/davidwuw0811-boop/awesome-gpt-image2-prompts", remote: true }, +]; + +function emptyAdminUser(): AdminUser { + const now = new Date().toISOString(); + return { id: "", username: "", email: "", displayName: "", avatarUrl: "", role: "user", credits: 0, affCode: "", affCount: 0, inviterId: "", linuxDoId: "", status: "active", lastLoginAt: "", createdAt: now, updatedAt: now }; +} + +function defaultAdminSettings(): AdminSettings { + return { + public: { + modelChannel: { availableModels: [], modelCosts: [], defaultModel: "", defaultImageModel: "", defaultVideoModel: "", defaultTextModel: "", systemPrompt: "", allowCustomChannel: true }, + auth: { allowRegister: false, linuxDo: { enabled: false } }, + }, + private: { channels: [], promptSync: { enabled: false, cron: "" }, auth: { linuxDo: { clientId: "", clientSecret: "" } } }, + }; +} + +function defaultAiConfig() { + return { + channelMode: "local" as const, + baseUrl: "", + apiKey: "", + model: "", + imageModel: "", + videoModel: "", + textModel: "", + audioModel: "", + audioVoice: "", + audioFormat: "", + audioSpeed: "", + audioInstructions: "", + videoSeconds: "", + vquality: "", + videoGenerateAudio: "", + videoWatermark: "", + systemPrompt: "", + models: [], + imageModels: [], + videoModels: [], + textModels: [], + audioModels: [], + quality: "", + size: "", + count: "", + canvasImageCount: "", + }; } diff --git a/web/src/services/api/assets.ts b/web/src/services/api/assets.ts index cc8ddf9..236479f 100644 --- a/web/src/services/api/assets.ts +++ b/web/src/services/api/assets.ts @@ -1,5 +1,3 @@ -import { apiGet, compactApiParams } from "@/services/api/request"; - export type AssetLibraryItem = { id: string; title: string; @@ -29,5 +27,19 @@ export type AssetLibraryQuery = { }; export async function fetchAssetLibrary(query: AssetLibraryQuery = {}) { - return apiGet("/api/assets", compactApiParams(query)); + const items: AssetLibraryItem[] = []; + const filtered = items.filter((item) => { + const keyword = query.keyword?.trim().toLowerCase(); + if (query.type && item.type !== query.type) return false; + if (query.tag?.length && !query.tag.some((tag) => item.tags.includes(tag))) return false; + if (!keyword) return true; + return [item.title, item.description, item.content, item.url, item.category, ...item.tags].join(" ").toLowerCase().includes(keyword); + }); + const page = Math.max(1, Number(query.page) || 1); + const pageSize = Math.max(1, Number(query.pageSize) || filtered.length || 1); + return { + items: filtered.slice((page - 1) * pageSize, page * pageSize), + tags: Array.from(new Set(filtered.flatMap((item) => item.tags).filter(Boolean))), + total: filtered.length, + }; } diff --git a/web/src/services/api/audio.ts b/web/src/services/api/audio.ts index e68db39..a951c84 100644 --- a/web/src/services/api/audio.ts +++ b/web/src/services/api/audio.ts @@ -3,27 +3,16 @@ import axios from "axios"; import { audioMimeType, normalizeAudioFormatValue, normalizeAudioSpeedValue, normalizeAudioVoiceValue } from "@/lib/audio-generation"; import { uploadMediaFile, type UploadedFile } from "@/services/file-storage"; import { buildApiUrl, type AiConfig } from "@/stores/use-config-store"; -import { useUserStore } from "@/stores/use-user-store"; function aiApiUrl(config: AiConfig, path: string) { - return config.channelMode === "remote" ? `/api/v1${path}` : buildApiUrl(config.baseUrl, path); + return buildApiUrl(config.baseUrl, path); } function aiHeaders(config: AiConfig) { - const token = useUserStore.getState().token; - return config.channelMode === "remote" - ? { - ...(token ? { Authorization: `Bearer ${token}` } : {}), - "Content-Type": "application/json", - } - : { - Authorization: `Bearer ${config.apiKey}`, - "Content-Type": "application/json", - }; -} - -function refreshRemoteUser(config: AiConfig) { - if (config.channelMode === "remote") void useUserStore.getState().hydrateUser(); + return { + Authorization: `Bearer ${config.apiKey}`, + "Content-Type": "application/json", + }; } export async function requestAudioGeneration(config: AiConfig, prompt: string): Promise { @@ -46,7 +35,6 @@ export async function requestAudioGeneration(config: AiConfig, prompt: string): { headers: aiHeaders(config), responseType: "blob" }, ); await assertAudioBlob(response.data); - refreshRemoteUser(config); return response.data.type.startsWith("audio/") ? response.data : new Blob([response.data], { type: audioMimeType(format) }); } catch (error) { throw new Error(readAxiosError(error, "音频生成失败")); @@ -60,8 +48,8 @@ export async function storeGeneratedAudio(blob: Blob, format = "mp3"): Promise("/api/auth/login", payload); + const now = new Date().toISOString(); + return { token: "", user: { id: "local-user", username: payload.username || "local", displayName: payload.username || "本地用户", avatarUrl: "", role: "user" as const, credits: 0, createdAt: now, updatedAt: now } }; } export async function register(payload: AuthPayload) { - return apiPost("/api/auth/register", payload); + return login(payload); } export async function fetchCurrentUser(token?: string) { - return apiGet("/api/auth/me", undefined, token); + return { id: "local-user", username: "local", displayName: "本地用户", avatarUrl: "", role: "user" as const, credits: 0, createdAt: "", updatedAt: "" }; } diff --git a/web/src/services/api/image.ts b/web/src/services/api/image.ts index c5a6c77..e7706c4 100644 --- a/web/src/services/api/image.ts +++ b/web/src/services/api/image.ts @@ -1,7 +1,6 @@ import axios from "axios"; import { buildApiUrl, type AiConfig } from "@/stores/use-config-store"; -import { useUserStore } from "@/stores/use-user-store"; import { nanoid } from "nanoid"; import { dataUrlToFile } from "@/lib/image-utils"; import { buildImageReferencePromptText } from "@/lib/image-reference-prompt"; @@ -169,24 +168,14 @@ function withSystemPrompt(config: AiConfig, prompt: string) { } function aiApiUrl(config: AiConfig, path: string) { - return config.channelMode === "remote" ? `/api/v1${path}` : buildApiUrl(config.baseUrl, path); + return buildApiUrl(config.baseUrl, path); } function aiHeaders(config: AiConfig, contentType?: string) { - const token = useUserStore.getState().token; - return config.channelMode === "remote" - ? { - ...(token ? { Authorization: `Bearer ${token}` } : {}), - ...(contentType ? { "Content-Type": contentType } : {}), - } - : { - Authorization: `Bearer ${config.apiKey}`, - ...(contentType ? { "Content-Type": contentType } : {}), - }; -} - -function refreshRemoteUser(config: AiConfig) { - if (config.channelMode === "remote") void useUserStore.getState().hydrateUser(); + return { + Authorization: `Bearer ${config.apiKey}`, + ...(contentType ? { "Content-Type": contentType } : {}), + }; } function withSystemMessage(config: AiConfig, messages: ChatCompletionMessage[]) { @@ -215,7 +204,6 @@ export async function requestGeneration(config: AiConfig, prompt: string) { }, ); const images = parseImagePayload(response.data); - refreshRemoteUser(config); return images; } catch (error) { throw new Error(readAxiosError(error, "请求失败")); @@ -246,7 +234,6 @@ export async function requestEdit(config: AiConfig, prompt: string, references: try { const response = await axios.post(aiApiUrl(config, "/images/edits"), formData, { headers: aiHeaders(config) }); const images = parseImagePayload(response.data); - refreshRemoteUser(config); return images; } catch (error) { throw new Error(readAxiosError(error, "请求失败")); @@ -311,12 +298,10 @@ export async function requestImageQuestion(config: AiConfig, messages: ChatCompl } catch (error) { throw new Error(readAxiosError(error, "请求失败")); } - refreshRemoteUser(config); return answer || "没有返回内容"; } export async function fetchImageModels(config: AiConfig) { - if (config.channelMode === "remote") return config.models; try { const response = await axios.get<{ data?: Array<{ id?: string }>; error?: { message?: string } }>(buildApiUrl(config.baseUrl, "/models"), { headers: { diff --git a/web/src/services/api/prompts.ts b/web/src/services/api/prompts.ts index ed653ae..09b4de0 100644 --- a/web/src/services/api/prompts.ts +++ b/web/src/services/api/prompts.ts @@ -1,4 +1,4 @@ -import { apiGet, compactApiParams } from "@/services/api/request"; +import { compactApiParams, serializeApiParams } from "@/services/api/request"; export type Prompt = { id: string; @@ -23,8 +23,7 @@ export type PromptListResponse = { }; export async function fetchPrompts({ keyword = "", tag = [], category = ALL_PROMPTS_OPTION, page, pageSize }: { keyword?: string; tag?: string[]; category?: string; page?: number; pageSize?: number } = {}) { - return apiGet( - "/api/prompts", + const params = serializeApiParams( compactApiParams({ ...(keyword ? { keyword } : {}), ...(tag.length ? { tag } : {}), @@ -33,6 +32,9 @@ export async function fetchPrompts({ keyword = "", tag = [], category = ALL_PROM ...(pageSize ? { pageSize } : {}), }), ); + const response = await fetch(`/api/prompts${params.size ? `?${params}` : ""}`); + if (!response.ok) throw new Error("获取提示词失败"); + return (await response.json()) as PromptListResponse; } export function formatPromptDate(value: string) { diff --git a/web/src/services/api/request.ts b/web/src/services/api/request.ts index 8423063..9375bfe 100644 --- a/web/src/services/api/request.ts +++ b/web/src/services/api/request.ts @@ -1,13 +1,5 @@ -import axios from "axios"; - export type ApiParams = Record; -type ApiResponse = { - code: number; - data: T; - msg: string; -}; - export function compactApiParams(params: ApiParams) { return Object.fromEntries(Object.entries(params).filter(([, value]) => value !== "" && value !== undefined && (!Array.isArray(value) || value.length > 0))) as ApiParams; } @@ -21,61 +13,3 @@ export function serializeApiParams(params?: ApiParams) { } return queryParams; } - -export async function apiGet(url: string, params?: ApiParams, token?: string) { - return apiRequest({ - url, - method: "GET", - params: params || undefined, - headers: token ? { Authorization: `Bearer ${token}` } : undefined, - }); -} - -export async function apiPost(url: string, body?: unknown, token?: string) { - return apiRequest({ - url, - method: "POST", - data: body ?? {}, - headers: { - "Content-Type": "application/json", - ...(token ? { Authorization: `Bearer ${token}` } : {}), - }, - }); -} - -export async function apiDelete(url: string, token?: string) { - return apiRequest({ - url, - method: "DELETE", - headers: token ? { Authorization: `Bearer ${token}` } : undefined, - }); -} - -async function apiRequest(config: { url: string; method: "GET" | "POST" | "DELETE"; params?: ApiParams; data?: unknown; headers?: Record }) { - let response; - try { - response = await axios.request>({ - url: config.url, - method: config.method, - params: config.params, - paramsSerializer: { serialize: (params) => serializeApiParams(params as ApiParams).toString() }, - data: config.data, - headers: config.headers, - validateStatus: () => true, - }); - } catch { - throw new Error("接口连接失败，请确认后端服务已启动"); - } - - const result = response.data; - if (!result || typeof result !== "object") { - throw new Error(response.status === 404 ? "接口不存在，请确认后端服务已启动" : "接口返回异常，请稍后重试"); - } - - const payload = result as ApiResponse; - if (response.status < 200 || response.status >= 300 || payload.code !== 0) { - throw new Error(payload.msg || "请求失败"); - } - - return payload.data; -} diff --git a/web/src/services/api/video.ts b/web/src/services/api/video.ts index b5f36fb..648beaf 100644 --- a/web/src/services/api/video.ts +++ b/web/src/services/api/video.ts @@ -5,7 +5,6 @@ import { getMediaBlob, uploadMediaFile, type UploadedFile } from "@/services/fil import { imageToDataUrl } from "@/services/image-storage"; import { boolConfig, buildSeedancePromptText, isSeedanceVideoConfig, normalizeSeedanceDuration, normalizeSeedanceRatio, normalizeSeedanceResolution, seedanceVideoReferenceError, SEEDANCE_REFERENCE_LIMITS } from "@/lib/seedance-video"; import { buildApiUrl, type AiConfig } from "@/stores/use-config-store"; -import { useUserStore } from "@/stores/use-user-store"; import type { ReferenceImage } from "@/types/image"; import type { ReferenceAudio, ReferenceVideo } from "@/types/media"; @@ -18,31 +17,20 @@ type SeedanceTask = { content?: { video_url?: string; last_frame_url?: string } | null; }; type ApiEnvelope = T | { code?: number; data?: T | null; msg?: string }; -type ReferenceMediaUploadResponse = { id: string; url: string; mimeType: string; bytes: number }; export type VideoGenerationResult = { blob?: Blob; url?: string; mimeType?: string }; export type VideoGenerationTask = { id: string; provider: "openai" | "seedance"; model: string }; export type VideoGenerationTaskState = { status: "pending" } | { status: "completed"; result: VideoGenerationResult } | { status: "failed"; error: string }; function aiApiUrl(config: AiConfig, path: string) { - return config.channelMode === "remote" ? `/api/v1${path}` : buildApiUrl(config.baseUrl, path); + return buildApiUrl(config.baseUrl, path); } function aiHeaders(config: AiConfig, contentType?: string) { - const token = useUserStore.getState().token; - return config.channelMode === "remote" - ? { - ...(token ? { Authorization: `Bearer ${token}` } : {}), - ...(contentType ? { "Content-Type": contentType } : {}), - } - : { - Authorization: `Bearer ${config.apiKey}`, - ...(contentType ? { "Content-Type": contentType } : {}), - }; -} - -function refreshRemoteUser(config: AiConfig) { - if (config.channelMode === "remote") void useUserStore.getState().hydrateUser(); + return { + Authorization: `Bearer ${config.apiKey}`, + ...(contentType ? { "Content-Type": contentType } : {}), + }; } export async function requestVideoGeneration(config: AiConfig, prompt: string, references: ReferenceImage[] = [], videoReferences: ReferenceVideo[] = [], audioReferences: ReferenceAudio[] = []): Promise { @@ -102,11 +90,10 @@ async function createOpenAIVideoTask(config: AiConfig, model: string, prompt: st async function pollOpenAIVideoTask(config: AiConfig, task: VideoGenerationTask): Promise { try { - const video = unwrapVideoResponse((await axios.get(aiApiUrl(config, `/videos/${task.id}`), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model: task.model } : undefined })).data); + const video = unwrapVideoResponse((await axios.get(aiApiUrl(config, `/videos/${task.id}`), { headers: aiHeaders(config) })).data); if (video.status === "completed") { - const content = await axios.get(aiApiUrl(config, `/videos/${task.id}/content`), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model: task.model } : undefined, responseType: "blob" }); + const content = await axios.get(aiApiUrl(config, `/videos/${task.id}/content`), { headers: aiHeaders(config), responseType: "blob" }); await assertVideoBlob(content.data); - refreshRemoteUser(config); return { status: "completed", result: { blob: content.data } }; } if (video.status === "failed" || video.status === "cancelled") return { status: "failed", error: video.error?.message || "视频生成失败" }; @@ -145,11 +132,10 @@ async function createSeedanceTask(config: AiConfig, model: string, prompt: strin async function pollSeedanceTask(config: AiConfig, task: VideoGenerationTask): Promise { try { - const state = unwrapSeedanceTask((await axios.get>(seedanceApiUrl(config, task.id), { headers: aiHeaders(config), params: config.channelMode === "remote" ? { model: task.model } : undefined })).data); + const state = unwrapSeedanceTask((await axios.get>(seedanceApiUrl(config, task.id), { headers: aiHeaders(config) })).data); if (state.status === "succeeded") { const url = state.content?.video_url; if (!url) return { status: "failed", error: "Seedance 任务成功但没有返回视频 URL" }; - refreshRemoteUser(config); return { status: "completed", result: await videoResultFromUrl(url) }; } if (state.status === "failed" || state.status === "cancelled" || state.status === "expired") return { status: "failed", error: state.error?.message || `Seedance 视频生成${state.status === "expired" ? "超时" : "失败"}` }; @@ -182,7 +168,6 @@ function assertSeedanceAudioReferences(audioReferences: ReferenceAudio[]) { } function seedanceApiUrl(config: AiConfig, taskId?: string) { - if (config.channelMode === "remote") return taskId ? `/api/v1/videos/${encodeURIComponent(taskId)}` : "/api/v1/videos"; return buildApiUrl(config.baseUrl, `/contents/generations/tasks${taskId ? `/${encodeURIComponent(taskId)}` : ""}`); } @@ -207,9 +192,6 @@ async function resolveSeedanceImageUrl(config: AiConfig, image: ReferenceImage) if (isPublicMediaUrl(directUrl) || directUrl.startsWith("asset://")) return directUrl; const dataUrl = await imageToDataUrl(image); if (!dataUrl) throw new Error("参考图读取失败，请换一张图片或重新上传"); - if (config.channelMode === "remote") { - return uploadReferenceMedia(dataUrlToFile({ ...image, dataUrl })); - } return dataUrl; } @@ -219,8 +201,7 @@ async function resolveSeedanceVideoUrl(video: ReferenceVideo) { if (video.storageKey) blob = await getMediaBlob(video.storageKey); if (!blob && video.url?.startsWith("blob:")) blob = await (await fetch(video.url)).blob(); if (!blob) throw new Error("参考视频必须是公网 URL、素材 ID，或本地已保存的视频"); - const file = new File([blob], video.name || "reference-video.mp4", { type: video.type || blob.type || "video/mp4" }); - return uploadReferenceMedia(file); + return blobToDataUrl(blob); } async function resolveSeedanceAudioUrl(audio: ReferenceAudio) { @@ -229,19 +210,7 @@ async function resolveSeedanceAudioUrl(audio: ReferenceAudio) { if (audio.storageKey) blob = await getMediaBlob(audio.storageKey); if (!blob && audio.url?.startsWith("blob:")) blob = await (await fetch(audio.url)).blob(); if (!blob) throw new Error("参考音频必须是公网 URL、素材 ID，或本地已保存的音频"); - const file = new File([blob], audio.name || "reference-audio.mp3", { type: audio.type || blob.type || "audio/mpeg" }); - return uploadReferenceMedia(file); -} - -async function uploadReferenceMedia(file: File) { - const token = useUserStore.getState().token; - if (!token) throw new Error("使用本地参考素材需要先登录，并在服务端配置 PUBLIC_BASE_URL"); - const body = new FormData(); - body.append("file", file, file.name); - const response = await axios.post>("/api/v1/media/references", body, { headers: { Authorization: `Bearer ${token}` } }); - const payload = unwrapEnvelope(response.data, "参考素材上传失败"); - if (!payload.url) throw new Error("参考素材上传后没有返回公网 URL"); - return payload.url; + return blobToDataUrl(blob); } async function videoResultFromUrl(url: string): Promise { @@ -256,8 +225,8 @@ async function videoResultFromUrl(url: string): Promise { function assertVideoConfig(config: AiConfig, model: string) { if (!model) throw new Error("请先配置视频模型"); - if (config.channelMode === "local" && !config.baseUrl.trim()) throw new Error("请先配置 Base URL"); - if (config.channelMode === "local" && !config.apiKey.trim()) throw new Error("请先配置 API Key"); + if (!config.baseUrl.trim()) throw new Error("请先配置 Base URL"); + if (!config.apiKey.trim()) throw new Error("请先配置 API Key"); } function normalizeVideoSeconds(value: string) { @@ -330,3 +299,12 @@ function isPublicMediaUrl(value: string) { function delay(ms: number) { return new Promise((resolve) => setTimeout(resolve, ms)); } + +function blobToDataUrl(blob: Blob) { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.onload = () => resolve(String(reader.result || "")); + reader.onerror = () => reject(new Error("读取本地素材失败")); + reader.readAsDataURL(blob); + }); +} diff --git a/web/src/stores/use-config-store.ts b/web/src/stores/use-config-store.ts index c3ba817..0a61927 100644 --- a/web/src/stores/use-config-store.ts +++ b/web/src/stores/use-config-store.ts @@ -4,7 +4,6 @@ import { useMemo } from "react"; import { create } from "zustand"; import { persist } from "zustand/middleware"; -import { apiGet } from "@/services/api/request"; import type { AdminPublicSettings } from "@/services/api/admin"; export type AiConfig = { @@ -102,40 +101,6 @@ type ConfigStore = { clearPromptContinue: () => void; }; -function resolveEffectiveConfig(config: AiConfig, modelChannel: AdminPublicSettings["modelChannel"] | null) { - const channelMode = modelChannel?.allowCustomChannel ? config.channelMode : "remote"; - if (channelMode === "local" || !modelChannel) return { ...config, channelMode }; - const models = modelChannel.availableModels; - const textModels = filterModelsByCapability(models, "text"); - const imageModels = filterModelsByCapability(models, "image"); - const videoModels = filterModelsByCapability(models, "video"); - const audioModels = filterModelsByCapability(models, "audio"); - const fallbackTextModel = validDefault(modelChannel.defaultTextModel, textModels) || preferredModel(textModels, isTextModelName); - const fallbackModel = validDefault(modelChannel.defaultModel, textModels) || fallbackTextModel; - const fallbackImageModel = validDefault(modelChannel.defaultImageModel, imageModels) || preferredModel(imageModels, isImageModelName); - const fallbackVideoModel = validDefault(modelChannel.defaultVideoModel, videoModels) || preferredModel(videoModels, isVideoModelName); - const fallbackAudioModel = preferredModel(audioModels, isAudioModelName); - return { - ...config, - channelMode, - models, - imageModels, - videoModels, - textModels, - audioModels, - model: textModels.includes(config.model) ? config.model : fallbackModel, - imageModel: imageModels.includes(config.imageModel) ? config.imageModel : fallbackImageModel, - videoModel: videoModels.includes(config.videoModel) ? config.videoModel : fallbackVideoModel, - textModel: textModels.includes(config.textModel) ? config.textModel : fallbackTextModel || fallbackModel, - audioModel: audioModels.includes(config.audioModel) ? config.audioModel : fallbackAudioModel, - systemPrompt: modelChannel.systemPrompt, - }; -} - -function validDefault(model: string, models: string[]) { - return models.includes(model) ? model : ""; -} - function preferredModel(models: string[], predicate: (model: string) => boolean) { return models.find(predicate) || ""; } @@ -181,7 +146,7 @@ function modelListKey(capability: ModelCapability) { } function isAiConfigReady(config: AiConfig, model: string) { - return Boolean(model.trim()) && (config.channelMode === "remote" || Boolean(config.baseUrl.trim() && config.apiKey.trim())); + return Boolean(model.trim() && config.baseUrl.trim() && config.apiKey.trim()); } export const useConfigStore = create()( @@ -211,7 +176,7 @@ export const useConfigStore = create()( if (get().isPublicSettingsLoading) return; set({ isPublicSettingsLoading: true }); try { - set({ publicSettings: await apiGet("/api/settings") }); + set({ publicSettings: defaultPublicSettings(get().config) }); } finally { set({ isPublicSettingsLoading: false }); } @@ -234,7 +199,7 @@ export const useConfigStore = create()( webdav: { ...defaultWebdavSyncConfig, ...persistedWebdav }, config: { ...config, - channelMode: config.channelMode || "remote", + channelMode: "local", imageModel: config.imageModel || config.model, videoModel: config.videoModel || "grok-imagine-video", textModel: config.textModel || config.model, @@ -265,8 +230,23 @@ function normalizeModelList(models: string[]) { export function useEffectiveConfig() { const config = useConfigStore((state) => state.config); - const modelChannel = useConfigStore((state) => state.publicSettings?.modelChannel || null); - return useMemo(() => resolveEffectiveConfig(config, modelChannel), [config, modelChannel]); + return useMemo(() => ({ ...config, channelMode: "local" as const }), [config]); +} + +function defaultPublicSettings(config: AiConfig): AdminPublicSettings { + return { + modelChannel: { + availableModels: config.models, + modelCosts: [], + defaultModel: config.model, + defaultImageModel: config.imageModel, + defaultVideoModel: config.videoModel, + defaultTextModel: config.textModel, + systemPrompt: config.systemPrompt, + allowCustomChannel: true, + }, + auth: { allowRegister: false, linuxDo: { enabled: false } }, + }; } export function buildApiUrl(baseUrl: string, path: string) { diff --git a/web/src/stores/use-user-store.ts b/web/src/stores/use-user-store.ts index 14628e3..f107230 100644 --- a/web/src/stores/use-user-store.ts +++ b/web/src/stores/use-user-store.ts @@ -3,7 +3,7 @@ import { create } from "zustand"; import { persist } from "zustand/middleware"; -import { AUTH_TOKEN_KEY, fetchCurrentUser, login, register, type AuthPayload, type AuthUser } from "@/services/api/auth"; +import { AUTH_TOKEN_KEY, type AuthPayload, type AuthUser } from "@/services/api/auth"; type UserStore = { token: string; @@ -27,44 +27,17 @@ export const useUserStore = create()( setSession: (token, user) => set({ token, user, isReady: true }), clearSession: () => set({ token: "", user: null, isReady: true }), hydrateUser: async () => { - const token = get().token; - if (!token) { - set({ user: null, isReady: true }); - return; - } - set({ isLoading: true }); - try { - const user = await fetchCurrentUser(token); - if (user.role === "guest") { - set({ token: "", user: null, isReady: true, isLoading: false }); - return; - } - set({ user, isReady: true, isLoading: false }); - } catch { - set({ token: "", user: null, isReady: true, isLoading: false }); - } + set({ token: "", user: null, isReady: true, isLoading: false }); }, login: async (payload) => { set({ isLoading: true }); - try { - const session = await login(payload); - set({ token: session.token, user: session.user, isReady: true, isLoading: false }); - return session.user; - } catch (error) { - set({ isLoading: false }); - throw error; - } + const now = new Date().toISOString(); + const user: AuthUser = { id: "local-user", username: payload.username || "local", displayName: payload.username || "本地用户", avatarUrl: "", role: "user", credits: 0, createdAt: now, updatedAt: now }; + set({ token: "", user, isReady: true, isLoading: false }); + return user; }, register: async (payload) => { - set({ isLoading: true }); - try { - const session = await register(payload); - set({ token: session.token, user: session.user, isReady: true, isLoading: false }); - return session.user; - } catch (error) { - set({ isLoading: false }); - throw error; - } + return get().login(payload); }, }), {