diff --git a/.env.example b/.env.example index 8ca9ebc..0d755df 100644 --- a/.env.example +++ b/.env.example @@ -1,9 +1,9 @@ # 复制为 .env;此文件不能填写真实凭据后提交。 -DB_URL='jdbc:mysql://localhost:3306/community?useUnicode=true&characterEncoding=utf8&connectionTimeZone=UTC' -DB_USERNAME=community_app +DB_URL='jdbc:mysql://localhost:3306/vibemake?useUnicode=true&characterEncoding=utf8&connectionTimeZone=UTC' +DB_USERNAME=vibemake_app DB_PASSWORD='replace-with-your-database-password' GITEA_BASE_URL=http://localhost:3000 -GITEA_ORGANIZATION=community +GITEA_ORGANIZATION=vibemake GITEA_TOKEN='replace-with-your-gitea-token' # 可选,仅供批量导入读取 GitHub 元数据;不能填写 Gitea Token。 GITHUB_TOKEN='' @@ -42,8 +42,8 @@ FORK_GIT_EXECUTABLE=git FORK_TIMEOUT=5m FORK_MAX_CONCURRENT=2 FORK_MAX_TEMPORARY_BYTES=5368709120 -# 可选:独立临时磁盘目录,默认系统临时目录下 community-fork。 -# FORK_TEMPORARY_DIRECTORY=/var/tmp/community-fork +# 可选:独立临时磁盘目录,默认系统临时目录下 vibemake-fork。 +# FORK_TEMPORARY_DIRECTORY=/var/tmp/vibemake-fork # 管理端:共用上述 DB_* / GITEA_* / OSS_*,独立端口、跨域来源及本机登录会话。 ADMIN_SERVER_PORT=8994 @@ -56,3 +56,34 @@ ADMIN_MIGRATION_TIMEOUT=30m # ADMIN_MYSQL_TEST_URL= # ADMIN_MYSQL_TEST_USERNAME= # ADMIN_MYSQL_TEST_PASSWORD= + +# Redis 8.10.2,凭据不放入 URL;两个应用共用连接,按环境/应用前缀隔离。 +REDIS_HOST=localhost +REDIS_PORT=6379 +REDIS_USERNAME= +REDIS_PASSWORD='' +REDIS_DATABASE=0 +REDIS_SSL_ENABLED=false +REDIS_CONNECT_TIMEOUT=2s +REDIS_TIMEOUT=1s +# 留空不设置此变量时由 profile 使用 vibemake:test / vibemake:prod。 +# REDIS_KEY_PREFIX=vibemake:prod +# 仅填写实际可信反向代理的 IP/CIDR,逗号分隔;默认忽略转发头。 +TRUSTED_PROXY_CIDRS= +HTTP_JSON_MAX_BYTES=262144 +HTTP_URDF_JSON_MAX_BYTES=2097152 +HTTP_COMMIT_JSON_MAX_BYTES=67108864 +FILE_MAX_CONCURRENT=4 +RATE_CAPTCHA_PER_MINUTE=20 +RATE_LOGIN_IP_PER_MINUTE=20 +RATE_LOGIN_ACCOUNT_PER_MINUTE=10 +RATE_ADMIN_LOGIN_PER_MINUTE=30 +RATE_VIBEMAKE_READ_PER_MINUTE=120 +RATE_FILE_READ_PER_MINUTE=60 +RATE_CREATE_PER_MINUTE=5 +RATE_FORK_PER_MINUTE=10 +RATE_FILE_WRITE_PER_MINUTE=10 +RATE_COVER_SIGN_PER_MINUTE=30 +RATE_URDF_SIGN_PER_MINUTE=20 +RATE_COMMENT_PER_MINUTE=10 +RATE_LIKE_PER_MINUTE=60 diff --git a/README.md b/README.md index 30a3852..14feed4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# Community +# Vibemake -Spring Boot 社区后端,工程分层参考 cadworld。使用 Java 21、Spring Boot 3.5.7、MyBatis-Plus 3.5.11、MySQL 和 Gitea API v1。业务库名为 community,包含 sys_user、project、project_comment、project_like,以及管理端的 project_import_task。 +Spring Boot 社区后端,工程分层参考 cadworld。使用 Java 21、Spring Boot 3.5.16、MyBatis-Plus 3.5.11、MySQL 和 Gitea API v1。业务库名为 vibemake,包含 sys_user、project、project_comment、project_like,以及管理端的 project_import_task。 + +项目模块和 Java 包名统一使用 `vibemake`,对外接口继续使用原有 `/api/community/**` 等路径,前端调用方式保持不变。 平台管理用户、项目归属、类型、发布、评论、点赞和 Fork 来源;Gitea 管理文件、目录、Commit 与历史。仓库统一存放在配置的 Gitea 组织下,为私有仓库。 @@ -10,39 +12,39 @@ Spring Boot 社区后端,工程分层参考 cadworld。使用 Java 21、Spring | 模块 | 职责与主要包 | | --- | --- | -| community-api | 应用入口、HTTP 接口和接口配置;使用 api.controller、api.config | -| community-bean | 数据库实体在 bean.entity,常规请求与响应在 bean.Contracts,AI 协议在 bean.ai | -| community-service | 业务 Service 接口在 service 根包,实现类在 service.impl;包含 mapper、config、gitea、ai、support | -| community-security | 平台登录会话、验证码、身份上下文、认证过滤器和安全配置 | -| community-common | 通用响应、分页、异常处理、requestId 和基础工具 | -| community-adminapi | 独立管理端应用,用户角色鉴权、用户与全站项目管理、GitHub 在线迁移 | -| community-import | 固定 Excel 的 GitHub 项目运维导入命令,不提供 HTTP 接口 | +| vibemake-api | 应用入口、HTTP 接口和接口配置;使用 api.controller、api.config | +| vibemake-bean | 数据库实体在 bean.entity,常规请求与响应在 bean.Contracts,AI 协议在 bean.ai | +| vibemake-service | 业务 Service 接口在 service 根包,实现类在 service.impl;包含 mapper、config、gitea、ai、support | +| vibemake-security | 平台登录会话、验证码、身份上下文、认证过滤器和安全配置 | +| vibemake-common | 通用响应、分页、异常处理、requestId 和基础工具 | +| vibemake-adminapi | 独立管理端应用,用户角色鉴权、用户与全站项目管理、GitHub 在线迁移 | +| vibemake-import | 固定 Excel 的 GitHub 项目运维导入命令,不提供 HTTP 接口 | -UserService、ProjectService、FileService、InteractionService、CoverUploadService、UrdfService 采用接口加实现类,Controller、安全模块和服务之间通过接口注入。GiteaClient 与 RestGiteaClient 定义仓库调用边界;项目锁、UTC 时间和分页检查归入 support。安全模块内的 TokenService、CaptchaService 保留具体类,首期沿用本机缓存。 +UserService、ProjectService、FileService、InteractionService、CoverUploadService、UrdfService 采用接口加实现类,Controller、安全模块和服务之间通过接口注入。GiteaClient 与 RestGiteaClient 定义仓库调用边界;项目锁、UTC 时间和分页检查归入 support。安全模块内的 TokenService、CaptchaService 保留具体类,短期状态使用 Redis,限流和共享响应组装位于 service。 ## 功能与边界 -支持邮箱加图片验证码登录、我的项目列表、在线文本编辑、新建文件和目录、上传及多文件提交、手动发布和撤回、已发布版本浏览、快照 Fork、平铺评论和点赞,以及可配置开启的 Maker AI(聊天问答、查找、创建空项目、Fork)。工作区是用户项目列表,没有 workspace 表。没有 repository_operation 表、草稿保存、类型表、标签、收藏、成员协作;管理后台接口由 community-adminapi 提供。 +支持邮箱加图片验证码登录、我的项目列表、在线文本编辑、新建文件和目录、上传及多文件提交、手动发布和撤回、已发布版本浏览、快照 Fork、平铺评论和点赞,以及可配置开启的 Maker AI(聊天问答、查找、创建空项目、Fork)。工作区是用户项目列表,没有 workspace 表。没有 repository_operation 表、草稿保存、类型表、标签、收藏、成员协作;管理后台接口由 vibemake-adminapi 提供。 -**普通用户登录不验证邮箱归属,知道别人的邮箱也可能登录其账号;ADMIN 和 OFFICIAL 禁止通过该入口登录,后台管理员必须验证密码。** 验证码和登录会话使用本机缓存,单实例部署,重启后重新登录。所有仓库写入统一经过平台后端。 +**普通用户登录不验证邮箱归属,知道别人的邮箱也可能登录其账号;ADMIN 和 OFFICIAL 禁止通过该入口登录,后台管理员必须验证密码。** 验证码、登录会话和请求频率使用 Redis;两个应用仍各单实例部署,应用重启后保留 Redis 中未过期的会话。首次从本机缓存版本升级需要重新登录。所有仓库写入统一经过平台后端。 ## 启动 1. 安装 Java 21、Maven 3.9+,准备 MySQL 8.0.13 及以上和现有 Gitea。 2. 新建数据库手动执行 [基础四表 SQL](docs/database.md),并创建 [迁移任务表](docs/admin-database.md)。已有数据库执行管理端文档的增量 SQL;应用不会自动迁库。 3. 在 Gitea 创建私有组织,将技术账号设为组织所有者,生成具有 write:repository、write:organization、read:user 权限的 Token。 -4. 将 .env.example 复制为 .env,填写数据库连接与 Gitea 地址、组织、Token;默认使用 test 环境,.env 被 Git 忽略,不提交真实凭据。 +4. 将 .env.example 复制为 .env,填写数据库连接、Redis 连接与 Gitea 地址、组织、Token;默认使用 test 环境,.env 被 Git 忽略,不提交真实凭据。 5. 执行: ```bash bash scripts/run-local.sh ``` -当前机器已配置 Gitea 26.4.0,并建立私有组织 community。本机 .env 已保存 Gitea Token,权限为 0600;没有保存管理员密码。保留这些 Gitea 配置,再补充 DB_URL、DB_USERNAME、DB_PASSWORD 即可,不要用示例覆盖已有 Token。 +当前机器已配置 Gitea 26.4.0,并建立私有组织 vibemake。本机 .env 已保存 Gitea Token,权限为 0600;没有保存管理员密码。保留这些 Gitea 配置,再补充 DB_URL、DB_USERNAME、DB_PASSWORD 和 REDIS_* 连接配置,不要用示例覆盖已有 Token。 -直接部署时通过环境变量配置,运行打包后的 community-api/target/community-api-0.0.1-SNAPSHOT.jar。默认端口 8993,SERVER_PORT 或 PORT 可覆盖(SERVER_PORT 优先)。本机脚本会加载 .env,直接运行 jar 不会自动加载该文件。 +直接部署时通过环境变量配置,运行打包后的 vibemake-api/target/vibemake-api-0.0.1-SNAPSHOT.jar。默认端口 8993,SERVER_PORT 或 PORT 可覆盖(SERVER_PORT 优先)。本机脚本会加载 .env,直接运行 jar 不会自动加载该文件。 -接口文档:[前端接口对接文档](docs/community-api.md),包含全部接口、字段结构、请求响应示例、页面调用顺序和错误处理。启动后访问 /swagger-ui.html;机器可读 OpenAPI 为 /v3/api-docs。 +接口文档:[前端接口对接文档](docs/vibemake-api.md),包含全部接口、字段结构、请求响应示例、页面调用顺序和错误处理。test 环境启动后访问 /swagger-ui.html;机器可读 OpenAPI 为 /v3/api-docs。prod 默认关闭这两个入口。 ## 环境与日志 @@ -52,8 +54,8 @@ prod 启动时检查数据库连接、用户名、密码、Gitea 地址和 Token | 配置 | test | prod | | --- | --- | --- | -| 数据库 | 默认本机 community,可用 DB_* 覆盖 | 必须配置 DB_URL、DB_USERNAME、DB_PASSWORD | -| Gitea | 默认本机地址,使用 GITEA_* 覆盖 | 必须配置 GITEA_BASE_URL、GITEA_TOKEN;组织默认 community | +| 数据库 | 默认本机 vibemake,可用 DB_* 覆盖 | 必须配置 DB_URL、DB_USERNAME、DB_PASSWORD | +| Gitea | 默认本机地址,使用 GITEA_* 覆盖 | 必须配置 GITEA_BASE_URL、GITEA_TOKEN、GITEA_ORGANIZATION | | API 跨域来源 | `https://dev-vibemake.robotquan.com` | `https://vibemake.robotquan.com` | | OSS 封面目录 | vibemake_dev/project-covers/ | vibemake/project-covers/ | | OSS URDF 目录 | vibemake_dev/urdf/{projectCode}/{batchCode}/ | vibemake/urdf/{projectCode}/{batchCode}/ | @@ -64,16 +66,16 @@ prod 启动时检查数据库连接、用户名、密码、Gitea 地址和 Token 生产部署示例(先在部署环境配置以上连接变量): ```bash -SPRING_PROFILES_ACTIVE=prod java -Djava.awt.headless=true -jar community-api/target/community-api-0.0.1-SNAPSHOT.jar +SPRING_PROFILES_ACTIVE=prod java -Djava.awt.headless=true -jar vibemake-api/target/vibemake-api-0.0.1-SNAPSHOT.jar ``` 本机脚本支持传递启动参数,例如 `bash scripts/run-local.sh --spring.profiles.active=prod`,此时加载 .env 中的连接信息并使用 prod 配置。测试和生产数据库、Gitea 组织需要各自隔离时,分别设置对应的 DB_*、GITEA_* 变量。 -跨域白名单由 `community.cors.allowed-origins` 指定,仅作用于 `/api/**`。支持 Bearer Token、JSON、文件上传下载和 AI SSE,预检缓存 3600 秒,暴露 `X-Request-Id`、`Content-Disposition`,不启用跨域 Cookie 凭据。启动日志会记录生效的白名单。默认不开放 HTTP、localhost、其他端口或跨环境来源;本地继续使用前端开发代理,配置见[开发代理示例](docs/community-api.md#开发代理示例)。部署代理需透传预检请求、Origin 和后端 CORS 响应头,避免重复添加跨域头;OSS Bucket 的 CORS 仍需独立配置。 +跨域白名单由 `vibemake.cors.allowed-origins` 指定,仅作用于 `/api/**`。支持 Bearer Token、JSON、文件上传下载和 AI SSE,预检缓存 3600 秒,暴露 `X-Request-Id`、`Content-Disposition`、`Retry-After`,不启用跨域 Cookie 凭据。启动日志会记录生效的白名单。默认不开放 HTTP、localhost、其他端口或跨环境来源;本地继续使用前端开发代理,配置见[开发代理示例](docs/vibemake-api.md#开发代理示例)。部署代理需透传预检请求、Origin 和后端 CORS 响应头,避免重复添加跨域头;OSS Bucket 的 CORS 仍需独立配置。 -日志配置沿用 cadworld-common 的 logback-spring.xml 模板,放在 community-common;应用名为 community-api。测试和生产默认都写入 logs,可用 LOG_PATH 覆盖目录;目录相对于应用启动时的工作目录。本机启动脚本从项目根目录运行。 +日志配置沿用 cadworld-common 的 logback-spring.xml 模板,放在 vibemake-common;应用名为 vibemake-api。测试和生产默认都写入 logs,可用 LOG_PATH 覆盖目录;目录相对于应用启动时的工作目录。本机启动脚本从项目根目录运行。 -同时输出控制台、community-api.log 和 community-api-error.log,日志时间使用 Asia/Shanghai,格式包含线程、级别、requestId 和类名。应用日志按天或每 100MB 归档,保留 30 天、总归档上限 10GB;错误日志仅接收 ERROR,按天或每 50MB 归档,保留 60 天、总归档上限 5GB。归档写入 archive 子目录并压缩为 gzip。SQL Mapper 和 Spring Web 保持 INFO,不记录凭据、邮箱或代码内容。 +同时输出控制台、vibemake-api.log 和 vibemake-api-error.log,日志时间使用 Asia/Shanghai,格式包含线程、级别、requestId 和类名。应用日志按天或每 100MB 归档,保留 30 天、总归档上限 10GB;错误日志仅接收 ERROR,按天或每 50MB 归档,保留 60 天、总归档上限 5GB。归档写入 archive 子目录并压缩为 gzip。SQL Mapper 和 Spring Web 保持 INFO,不记录凭据、邮箱或代码内容。 ## 验证 @@ -93,7 +95,7 @@ python3 scripts/test-gitea.py ## 测试 Gitea 组织仓库复制到生产 -`scripts/migrate-gitea-org.py` 使用 Python 3.9+ 标准库,将测试 `community` 下的 Git 仓库复制到生产 `vibemake`(组织可通过参数修改)。生产 Gitea 应先初始化,并创建目标组织。目标为同名私有普通仓库,保留默认分支、历史、分支和标签,并请求迁移 LFS;不复制 Issue、PR、Release、Wiki、用户、组织成员、权限、Webhook 或 Actions 执行记录,也不导入 Gitea 整库、不复制实例配置。 +`scripts/migrate-gitea-org.py` 使用 Python 3.9+ 标准库,将测试 `vibemake` 下的 Git 仓库复制到生产 `vibemake`(组织可通过参数修改)。生产 Gitea 应先初始化,并创建目标组织。目标为同名私有普通仓库,保留默认分支、历史、分支和标签,并请求迁移 LFS;不复制 Issue、PR、Release、Wiki、用户、组织成员、权限、Webhook 或 Actions 执行记录,也不导入 Gitea 整库、不复制实例配置。 两端账号需是对应组织的所有者或站点管理员。测试 Token 需有 `read:repository`、`read:organization`、`read:user`、`read:misc`,生产 Token 需有 `write:repository`、`write:organization`、`read:user`、`read:misc`;仓库访问范围应包含私有仓库。迁移期间暂停源组织写入、导入任务以及目标后端写入,Gitea 本身保持运行。生产 Gitea 容器必须能通过 HTTP Git 和 LFS 访问测试地址,两端开启 HTTP Git/LFS,生产开启仓库迁移。 @@ -120,7 +122,7 @@ python3 scripts/migrate-gitea-org.py \ --execute ``` -可重复指定 `--repo p_项目编码` 限定仓库;`--source-org` 默认 `community`,`--target-org` 默认 `vibemake`。非交互执行可通过 `GITEA_MIGRATION_SOURCE_TOKEN`、`GITEA_MIGRATION_TARGET_TOKEN` 注入凭据,不接受 Token 命令行参数。默认只允许 HTTPS;仅在可信网络确需明文连接时指定 `--allow-http`。API 请求不跟随重定向,不将凭据放入 URL、状态文件或日志。迁移请求会将源账号和 Token 放在发往生产 Gitea 的请求体中,生产 Gitea 用它们读取源私有 Git/LFS。单仓库请求超时默认 1800 秒,可用 `--migration-timeout` 调整;生产反向代理的超时也应相应配置。 +可重复指定 `--repo p_项目编码` 限定仓库;`--source-org` 默认 `vibemake`,`--target-org` 默认 `vibemake`。非交互执行可通过 `GITEA_MIGRATION_SOURCE_TOKEN`、`GITEA_MIGRATION_TARGET_TOKEN` 注入凭据,不接受 Token 命令行参数。默认只允许 HTTPS;仅在可信网络确需明文连接时指定 `--allow-http`。API 请求不跟随重定向,不将凭据放入 URL、状态文件或日志。迁移请求会将源账号和 Token 放在发往生产 Gitea 的请求体中,生产 Gitea 用它们读取源私有 Git/LFS。单仓库请求超时默认 1800 秒,可用 `--migration-timeout` 调整;生产反向代理的超时也应相应配置。 `--state-dir` 默认 `logs/gitea-org-migration`,同一批次只允许运行一个进程;目录权限 0700,文件权限 0600。目录绑定源/目标地址、组织和初始仓库清单;组织仓库发生增删或同名重建时停止,不自动改变迁移范围。`state.json` 保存进度、源分支/标签快照及成功迁移返回的目标仓库标识;`mapping.json` 仅包含已取得 HTTP 201 完成收据并核对仓库身份、私有属性、默认分支、分支和标签提交的记录。LFS 由 Gitea 迁移流程处理,脚本不逐对象下载核验;先试迁一个带 LFS 的仓库,用 `git lfs pull`/实际下载检查实体后再批量执行。子模块只保留 Git 引用,不递归复制其他仓库。 @@ -136,13 +138,13 @@ python3 scripts/migrate-gitea-org.py \ 已有数据库必须先执行 [封面字段升级 SQL](docs/database.md#已有数据库增加项目封面),再部署新应用;新建数据库使用更新后的建表 SQL。应用不会自动变更表结构。 -OSS 默认关闭,外部 HTTPS 封面仍可使用。启用时设置 `OSS_ENABLED=true`,并配置 `OSS_REGION`、`OSS_BUCKET`、`OSS_ACCESS_KEY_ID`、`OSS_ACCESS_KEY_SECRET`。地域 ID 使用 `cn-beijing` 等编码,不带 `oss-` 前缀。Endpoint 默认根据地域推导为 `https://oss-{region}.aliyuncs.com`,无需配置环境变量;特殊域名场景可显式配置 `community.oss.endpoint`,使用可供浏览器访问的公网 HTTPS 地址,不包含 Bucket、路径或查询参数。`OSS_PUBLIC_BASE_URL` 可选,用于公开 CDN/OSS 基础地址;省略时使用 Bucket 标准 HTTPS 域名。启用但配置缺失或不合法时停止启动,未启用时签名接口返回 503 `OSS_UNAVAILABLE`。 +OSS 默认关闭,外部 HTTPS 封面仍可使用。启用时设置 `OSS_ENABLED=true`,并配置 `OSS_REGION`、`OSS_BUCKET`、`OSS_ACCESS_KEY_ID`、`OSS_ACCESS_KEY_SECRET`。地域 ID 使用 `cn-beijing` 等编码,不带 `oss-` 前缀。Endpoint 默认根据地域推导为 `https://oss-{region}.aliyuncs.com`,无需配置环境变量;特殊域名场景可显式配置 `vibemake.oss.endpoint`,使用可供浏览器访问的公网 HTTPS 地址,不包含 Bucket、路径或查询参数。`OSS_PUBLIC_BASE_URL` 可选,用于公开 CDN/OSS 基础地址;省略时使用 Bucket 标准 HTTPS 域名。启用但配置缺失或不合法时停止启动,未启用时签名接口返回 503 `OSS_UNAVAILABLE`。 目录由环境配置指定:test 使用 `vibemake_dev/`,prod 使用 `vibemake/`;二者均为桶内对象前缀。凭据使用仅能写入对应环境 `project-covers/*` 路径的 RAM 用户,密钥保留在服务端。实际 Bucket 和 CDN/OSS 域名由部署环境提供,不由应用创建。 登录后请求 `POST /api/uploads/project-covers/signature`,获得 OSS POST V4 表单和固定 `coverUrl`。签名有效期 5 分钟,支持 JPG、PNG、WebP,单张最多 5 MiB。浏览器直传成功后再保存项目,后端不接收图片内容。签名支持创建项目前上传;当前不提供上传完成回调、服务端图片内容检测或未绑定图片自动清理。 -Bucket 需要配置前端实际域名的 CORS,允许 POST;图片通过公开读取规则或公开 CDN 地址访问。完整配置步骤、错误处理和前端 FormData 示例见[封面上传接口](docs/community-api.md#项目封面与-oss-直传)。官方协议参考 [OSS POST V4](https://www.alibabacloud.com/help/en/oss/developer-reference/signature-version-4-recommend) 和[服务端签名直传](https://www.alibabacloud.com/help/en/oss/user-guide/obtain-signature-information-from-the-server-and-upload-data-to-oss)。 +Bucket 需要配置前端实际域名的 CORS,允许 POST;图片通过公开读取规则或公开 CDN 地址访问。完整配置步骤、错误处理和前端 FormData 示例见[封面上传接口](docs/vibemake-api.md#项目封面与-oss-直传)。官方协议参考 [OSS POST V4](https://www.alibabacloud.com/help/en/oss/developer-reference/signature-version-4-recommend) 和[服务端签名直传](https://www.alibabacloud.com/help/en/oss/user-guide/obtain-signature-information-from-the-server-and-upload-data-to-oss)。 部署验收:在 test 环境登录,获取签名、浏览器直传、保存项目并匿名访问封面;确认 OSS 对象位于 `vibemake_dev/project-covers/`,网络请求中的图片内容直接发往 OSS。prod 切换到 `vibemake/project-covers/`,图片地址不带临时下载签名。 @@ -184,7 +186,7 @@ python3 scripts/test-ai.py | FORK_TIMEOUT | 5m | Git、LFS、核验和 OSS 共用的总时间预算 | | FORK_MAX_CONCURRENT | 2 | 单实例并发上限,实际工作结束后释放名额 | | FORK_MAX_TEMPORARY_BYTES | 5368709120 | 每次临时磁盘上限,含 LFS 源缓存与副本校验缓存 | -| FORK_TEMPORARY_DIRECTORY | 系统临时目录/community-fork | 建议使用容量充足的独立临时磁盘 | +| FORK_TEMPORARY_DIRECTORY | 系统临时目录/vibemake-fork | 建议使用容量充足的独立临时磁盘 | 服务账号的 GITEA_TOKEN 需同时允许 REST 仓库创建、HTTP Git 读写及 LFS 读写。凭据通过进程环境注入,只用于配置的 Gitea 地址;不写入 URL、命令参数、Git 配置或日志。Fork 接口继续同步返回,前端和反向代理读取超时至少400秒;AI 进入 forking 后切换专用预算并继续发送心跳。 @@ -256,7 +258,7 @@ bash scripts/import-github-projects.sh --excel "$IMPORT_EXCEL" --execute --owner ## 管理端 -独立端口默认 `8994`,共用现有 `sys_user`,通过 `USER/ADMIN/OFFICIAL` 角色鉴权,不新增管理员或会话表。后台管理员以邮箱和 BCrypt 密码登录;会话使用本机缓存,默认 8 小时,重启后重新登录。第一版社区端和后台各单实例,Token 不互通。 +独立端口默认 `8994`,共用现有 `sys_user`,通过 `USER/ADMIN/OFFICIAL` 角色鉴权,不新增管理员或会话表。后台管理员以邮箱和 BCrypt 密码登录;会话使用 Redis,默认 8 小时,应用重启后保留未过期会话。社区端和后台各单实例,使用不同 Redis Key 域,Token 不互通。 启用前先手工执行 [管理端 SQL](docs/admin-database.md),停止并排空旧写入进程,更新社区端、后台和 Excel 导入工具,最后启用后台。全部仓库写入端使用相同数据库的项目命名锁;不可让仍使用本地锁的旧版应用并行写入。 @@ -269,3 +271,15 @@ bash scripts/test-admin-mysql.sh ``` 前端对接见 [管理后台接口文档](docs/admin-api.md),服务初始化、配置与故障处理见 [管理端部署说明](docs/admin-deployment.md)。数据库 SQL 不会由启动脚本自动执行;真实仓库迁移和正式发布需在部署后由管理员通过接口触发,普通测试不会访问真实 GitHub、Gitea 或 OSS。 + +## Redis、安全限制与批量查询 + +在线应用依赖 Redis 8.10.2,使用 Spring Data Redis/Lettuce。配置 `REDIS_HOST`、`REDIS_PORT`(6379)、`REDIS_USERNAME`(可选)、`REDIS_PASSWORD`、`REDIS_DATABASE`(0)、`REDIS_SSL_ENABLED`(false);连接/命令超时默认 2s/1s。prod 必须显式提供 Redis 主机、密码及 `GITEA_ORGANIZATION`,与数据库、Gitea 凭据一样只由环境注入。 + +环境 Key 前缀默认 `vibemake:test` / `vibemake:prod`,可用 `REDIS_KEY_PREFIX` 覆盖;后续自动追加 `api:v1:` / `admin:v1:`。会话 Key 使用 Token 的 SHA-256 摘要;会话 JSON 仅包含用户标识和会话版本。社区和后台 TTL 分别为 24h/8h,不滑动续期,验证码 2m 且一次消费。每次请求仍检查数据库账号状态、角色、会话版本。Redis 故障返回 503 `REDIS_UNAVAILABLE`,不回退本机或放行。离线导入和管理员初始化命令不检查 Redis。 + +全部默认限额、变量、ACL 与发布操作见 [部署说明](docs/admin-deployment.md#redis-安全与资源保护)。Fork 为每用户 10 次/分钟、URDF 批次签名 20 次/分钟;Fork 同时执行仍最多 2 个。请求频率统计的是尝试次数,包括繁忙或失败的调用,按首次请求建立 60 秒固定窗口;窗口内各操作独立,换 Token 或 IP 不重置用户额度。限流只计一次业务调用,AI 创建/Fork 共用业务入口。 + +项目响应采用数据库批量查询,不缓存业务列表。列表和 AI 检索不读取体积较大的 URDF 文件清单,Fork 来源仅批量读取标识和编码。按业务服务层统计(不包含安全过滤器独立账号查询),20 条带 Fork 来源、登录用户点赞和导入来源的项目列表最多 8 次 SQL,评论列表最多 4 次,后台用户列表最多 3 次;避免记录数增加造成逐条查询。昵称、互动和下架可见性仍读取当前数据。 + +普通 `AI_ENABLED=false OSS_ENABLED=false mvn verify` 使用只存在于 tests 分类制品中的状态存储,不依赖 Redis,生产 jar 不包含该实现。真实 Redis 联调不自动读取 `.env`,通过 `REDIS_TEST_HOST`、`REDIS_TEST_PORT`、`REDIS_TEST_USERNAME`、`REDIS_TEST_PASSWORD`、`REDIS_TEST_DATABASE`、`REDIS_TEST_SSL_ENABLED` 连接独立测试实例,执行 `bash scripts/test-redis.sh`;只使用随机测试 Key 前缀,不执行 FLUSHDB。真实联调验证 TTL、消费竞争、计数、断开后重建连接、会话撤销与账号禁用。 diff --git a/community-adminapi/src/main/resources/application-prod.yml b/community-adminapi/src/main/resources/application-prod.yml deleted file mode 100644 index 9b41fa1..0000000 --- a/community-adminapi/src/main/resources/application-prod.yml +++ /dev/null @@ -1,26 +0,0 @@ -spring: - datasource: - url: ${DB_URL} - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - pool-name: CommunityAdminHikariCP - minimum-idle: 1 - maximum-pool-size: 20 - connection-timeout: 5000 - -community: - cors: - allowed-origins: - - https://vibemake.robotquan.com - oss: - root-directory: vibemake - gitea: - base-url: ${GITEA_BASE_URL} - owner: ${GITEA_ORGANIZATION:vibemake} - token: ${GITEA_TOKEN} - -logging: - level: - com.linkerbot.community: INFO diff --git a/community-security/src/main/java/com/linkerbot/community/security/TokenService.java b/community-security/src/main/java/com/linkerbot/community/security/TokenService.java deleted file mode 100644 index 16441f6..0000000 --- a/community-security/src/main/java/com/linkerbot/community/security/TokenService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.linkerbot.community.security; - -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.linkerbot.community.service.config.CommunityProperties; - -import org.springframework.stereotype.Service; - -import java.security.SecureRandom; -import java.util.Base64; - -@Service -public class TokenService { - private final Cache sessions; - private final SecureRandom random = new SecureRandom(); - - public TokenService(CommunityProperties config) { - sessions = - Caffeine.newBuilder() - .maximumSize(10000) - .expireAfterWrite(config.getTokenTtl()) - .build(); - } - - public record Session(long userId, long version) {} - - public String issue(long userId) { return issue(userId, 0L); } - - public String issue(long userId, long version) { - byte[] bytes = new byte[32]; - random.nextBytes(bytes); - String token = Base64.getUrlEncoder().withoutPadding().encodeToString(bytes); - sessions.put(token, new Session(userId, version)); - return token; - } - - public Long resolve(String token) { - Session session = session(token); - return session == null ? null : session.userId(); - } - - public Session session(String token) { return sessions.getIfPresent(token); } - - public void revoke(String token) { - if (token != null) sessions.invalidate(token); - } -} diff --git a/community-security/src/test/java/com/linkerbot/community/security/SessionTest.java b/community-security/src/test/java/com/linkerbot/community/security/SessionTest.java deleted file mode 100644 index 428775c..0000000 --- a/community-security/src/test/java/com/linkerbot/community/security/SessionTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.linkerbot.community.security; - -import static org.assertj.core.api.Assertions.*; - -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.CommunityProperties; - -import org.junit.jupiter.api.Test; - -import java.time.Duration; - -class SessionTest { - @Test - void expiredCaptchaAndTokenCannotBeUsed() throws Exception { - CommunityProperties properties = new CommunityProperties(); - properties.setCaptchaTtl(Duration.ofMillis(1)); - properties.setTokenTtl(Duration.ofMillis(1)); - CaptchaService captcha = - new CaptchaService(properties) { - @Override - protected String generateAnswer() { - return "ABCDE"; - } - }; - String code = captcha.issue().captchaCode(); - TokenService tokens = new TokenService(properties); - String token = tokens.issue(1L); - Thread.sleep(20); - assertThatThrownBy(() -> captcha.verify(code, "ABCDE")) - .isInstanceOf(BusinessException.class); - assertThat(tokens.resolve(token)).isNull(); - } - - @Test - void tokensAreRandomAndRevocable() { - TokenService tokens = new TokenService(new CommunityProperties()); - String a = tokens.issue(1L); - String b = tokens.issue(1L); - assertThat(a).isNotEqualTo(b); - assertThat(tokens.resolve(a)).isEqualTo(1L); - tokens.revoke(a); - assertThat(tokens.resolve(a)).isNull(); - assertThat(tokens.resolve(b)).isEqualTo(1L); - } -} diff --git a/community-service/src/main/java/com/linkerbot/community/service/UrdfService.java b/community-service/src/main/java/com/linkerbot/community/service/UrdfService.java deleted file mode 100644 index 360d551..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/UrdfService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.linkerbot.community.service; - -import com.linkerbot.community.bean.Contracts.ProjectView; -import com.linkerbot.community.bean.Contracts.UrdfConfirmInput; -import com.linkerbot.community.bean.Contracts.UrdfUploadInput; -import com.linkerbot.community.bean.Contracts.UrdfUploadSignature; - -public interface UrdfService { - UrdfUploadSignature signature(long userId, String projectCode, UrdfUploadInput input); - - ProjectView confirm(long userId, String projectCode, UrdfConfirmInput input); - - void clear(long userId, String projectCode); -} diff --git a/community-service/src/main/java/com/linkerbot/community/service/UserService.java b/community-service/src/main/java/com/linkerbot/community/service/UserService.java deleted file mode 100644 index 7ab9ec5..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/UserService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.linkerbot.community.service; - -import com.linkerbot.community.bean.Contracts.PublicUser; -import com.linkerbot.community.bean.Contracts.UserView; -import com.linkerbot.community.bean.entity.User; - -/** 平台用户查询、登录和公开信息转换。 */ -public interface UserService { - User login(String email); - - User require(long id); - - UserView view(User user); - - PublicUser publicView(long id); -} diff --git a/community-service/src/main/java/com/linkerbot/community/service/impl/AiSearchServiceImpl.java b/community-service/src/main/java/com/linkerbot/community/service/impl/AiSearchServiceImpl.java deleted file mode 100644 index 5b32fe2..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/impl/AiSearchServiceImpl.java +++ /dev/null @@ -1,221 +0,0 @@ -package com.linkerbot.community.service.impl; - -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.linkerbot.community.bean.ai.AiContracts.*; -import com.linkerbot.community.common.ApiResponse; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.AiSearchService; -import com.linkerbot.community.service.ai.AiProjectAssistant; -import com.linkerbot.community.service.config.AiProperties; -import com.linkerbot.community.service.config.ForkProperties; -import jakarta.annotation.PreDestroy; -import java.io.IOException; -import java.time.Duration; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicBoolean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.MDC; -import org.springframework.stereotype.Service; -import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; - -/** 本机限流与 SSE 生命周期,不创建持久化会话或后台恢复任务。 */ -@Service -public class AiSearchServiceImpl implements AiSearchService { - private static final Logger log = LoggerFactory.getLogger(AiSearchServiceImpl.class); - private final AiProperties properties; - private final AiProjectAssistant assistant; - private final ForkProperties forkProperties; - private final Semaphore permits; - private final ExecutorService workers = Executors.newThreadPerTaskExecutor( - Thread.ofVirtual().name("ai-search-", 0).factory()); - private final ScheduledExecutorService timer = Executors.newScheduledThreadPool(2, - Thread.ofPlatform().daemon(true).name("ai-search-timer-", 0).factory()); - private final Cache> rates = Caffeine.newBuilder() - .expireAfterAccess(Duration.ofMinutes(1)).maximumSize(10000).build(); - private final Set active = ConcurrentHashMap.newKeySet(); - - public AiSearchServiceImpl(AiProperties properties, AiProjectAssistant assistant, ForkProperties forkProperties) { - this.properties = properties; - this.assistant = assistant; - this.forkProperties = forkProperties; - permits = new Semaphore(properties.getMaxConcurrent()); - } - - @Override - public SseEmitter chat(long userId, ChatRequest request) { - validateHistory(request); - if (!properties.isEnabled()) throw new BusinessException(503, "AI_UNAVAILABLE", "Maker AI 暂未开启"); - if (!permits.tryAcquire()) throw new BusinessException(429, "AI_BUSY", "Maker AI 繁忙,请稍后重试"); - try { - rateLimit(userId); - } catch (RuntimeException error) { - permits.release(); - throw error; - } - Job job = new Job(userId, request, MDC.get("requestId")); - active.add(job); - try { - job.start(); - return job.emitter; - } catch (RejectedExecutionException error) { - job.cancel(); - job.release(); - throw new BusinessException(503, "AI_UNAVAILABLE", "Maker AI 暂不可用"); - } - } - - private void validateHistory(ChatRequest request) { - if (request.history().size() % 2 != 0) throw BusinessException.badRequest("history 必须为完整的用户和助手对话轮次"); - for (int index = 0; index < request.history().size(); index++) { - String expected = index % 2 == 0 ? "user" : "assistant"; - if (!expected.equals(request.history().get(index).role())) - throw BusinessException.badRequest("history 必须由 user 和 assistant 交替组成"); - } - } - - private void rateLimit(long userId) { - Deque timestamps = rates.get(userId, ignored -> new ArrayDeque<>()); - synchronized (timestamps) { - long now = System.nanoTime(); - long window = Duration.ofMinutes(1).toNanos(); - while (!timestamps.isEmpty() && now - timestamps.peekFirst() >= window) timestamps.removeFirst(); - if (timestamps.size() >= properties.getRequestsPerMinute()) - throw new BusinessException(429, "AI_RATE_LIMITED", "Maker AI 请求过于频繁,请稍后重试"); - timestamps.addLast(now); - } - } - - @PreDestroy - public void close() { - active.forEach(Job::cancel); - workers.shutdownNow(); - timer.shutdownNow(); - } - - private final class Job { - private final long userId; - private final ChatRequest request; - private final String requestId; - private final long started = System.nanoTime(); - private final SseEmitter emitter = new SseEmitter(properties.getSearchTimeout().plus(forkProperties.getTimeout()).plusSeconds(15).toMillis()); - private final AtomicBoolean finished = new AtomicBoolean(); - private final AtomicBoolean released = new AtomicBoolean(); - private final FutureTask task; - private volatile ScheduledFuture heartbeat; - private volatile ScheduledFuture deadline; - - private Job(long userId, ChatRequest request, String requestId) { - this.userId = userId; - this.request = request; - this.requestId = requestId; - task = new FutureTask<>(() -> { run(); return null; }); - emitter.onCompletion(this::cancel); - emitter.onError(ignored -> cancel()); - emitter.onTimeout(() -> fail(new BusinessException(504, "AI_TIMEOUT", "Maker AI 处理超时,若涉及创建或 Fork,请先核对工作区项目状态"))); - } - - private void start() { - heartbeat = timer.scheduleAtFixedRate(this::heartbeat, - properties.getHeartbeatInterval().toMillis(), properties.getHeartbeatInterval().toMillis(), TimeUnit.MILLISECONDS); - deadline = timer.schedule(() -> fail(new BusinessException(504, "AI_TIMEOUT", "Maker AI 处理超时,若涉及创建或 Fork,请先核对工作区项目状态")), - properties.getSearchTimeout().toMillis(), TimeUnit.MILLISECONDS); - workers.execute(() -> { - try { task.run(); } - finally { release(); } - }); - if (finished.get()) stopTimers(); - } - - private void run() { - if (requestId != null) MDC.put("requestId", requestId); - try { - log.info("Maker AI 开始 requestId={}", requestId); - ChatResult result = assistant.chat(userId, request, progress -> send("progress", progress)); - if (finished.compareAndSet(false, true)) { - write("result", success(result)); - stopTimers(); - emitter.complete(); - log.info("Maker AI 完成 requestId={} status={} resultCount={} projectCode={} durationMs={}", - requestId, result.status(), result.projects().size(), result.project() == null ? null : result.project().projectCode(), elapsed()); - } - } catch (BusinessException error) { - fail(error); - } catch (Exception error) { - log.warn("Maker AI 异常 requestId={} exceptionType={} location={} durationMs={}", requestId, error.getClass().getSimpleName(), - error.getStackTrace().length == 0 ? null : error.getStackTrace()[0], elapsed()); - fail(new BusinessException(500, "AI_SEARCH_FAILURE", "Maker AI 处理失败,若涉及创建或 Fork,请先核对工作区项目状态")); - } finally { - stopTimers(); - MDC.remove("requestId"); - } - } - - private void send(String event, Object data) { - if (finished.get() || Thread.currentThread().isInterrupted()) throw cancelled(); - if (data instanceof Progress progress && "forking".equals(progress.stage())) { - if (deadline != null) deadline.cancel(false); - deadline = timer.schedule(() -> fail(new BusinessException(504, "FORK_TIMEOUT", "Fork 超时,请先核对工作区项目状态")), - forkProperties.getTimeout().plusSeconds(15).toMillis(), TimeUnit.MILLISECONDS); - } - if (!write(event, success(data))) throw cancelled(); - } - - private ApiResponse success(Object data) { - return new ApiResponse<>("OK", "成功", data, requestId); - } - - private boolean write(String event, ApiResponse data) { - try { - emitter.send(SseEmitter.event().name(event).data(data)); - return true; - } catch (IOException | IllegalStateException error) { - cancel(); - return false; - } - } - - private void heartbeat() { - if (finished.get()) return; - try { emitter.send(SseEmitter.event().comment("keep-alive")); } - catch (IOException | IllegalStateException error) { cancel(); } - } - - private void fail(BusinessException error) { - if (!finished.compareAndSet(false, true)) return; - log.warn("Maker AI 失败 requestId={} code={} durationMs={}", requestId, error.code(), elapsed()); - stopTimers(); - write("error", new ApiResponse<>(error.code(), error.getMessage(), error.details(), requestId)); - emitter.complete(); - task.cancel(true); - } - - private void cancel() { - boolean first = finished.compareAndSet(false, true); - stopTimers(); - // 即使终态写出时连接断开,也必须停止未完成的工作。 - if (first) { - task.cancel(true); - emitter.complete(); - log.info("Maker AI 连接关闭 requestId={} durationMs={}", requestId, elapsed()); - } - } - - private void stopTimers() { - if (heartbeat != null) heartbeat.cancel(false); - if (deadline != null) deadline.cancel(false); - } - - private void release() { - if (released.compareAndSet(false, true)) { - active.remove(this); - permits.release(); - } - } - - private long elapsed() { return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - started); } - private BusinessException cancelled() { return new BusinessException(499, "AI_CANCELLED", "Maker AI 已取消"); } - } -} diff --git a/community-service/src/main/java/com/linkerbot/community/service/impl/UrdfServiceImpl.java b/community-service/src/main/java/com/linkerbot/community/service/impl/UrdfServiceImpl.java deleted file mode 100644 index 0b75d00..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/impl/UrdfServiceImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.linkerbot.community.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.linkerbot.community.bean.Contracts.ProjectView; -import com.linkerbot.community.bean.Contracts.UrdfConfirmInput; -import com.linkerbot.community.bean.Contracts.UrdfUploadInput; -import com.linkerbot.community.bean.Contracts.UrdfUploadSignature; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.UrdfService; -import com.linkerbot.community.service.mapper.ProjectMapper; -import com.linkerbot.community.service.oss.UrdfResources; -import com.linkerbot.community.service.support.ProjectLocks; -import com.linkerbot.community.service.support.ProjectSupport; -import lombok.RequiredArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class UrdfServiceImpl implements UrdfService { - private static final Logger log = LoggerFactory.getLogger(UrdfServiceImpl.class); - private final ProjectService projects; - private final ProjectMapper mapper; - private final UrdfResources resources; - private final ProjectLocks locks; - - @Override - public UrdfUploadSignature signature(long userId, String projectCode, UrdfUploadInput input) { - projects.readyOwner(userId, projectCode); - return resources.sign(projectCode, input.files()); - } - - @Override - public ProjectView confirm(long userId, String projectCode, UrdfConfirmInput input) { - projects.readyOwner(userId, projectCode); - // OSS 网络调用在锁外执行,最终落库时重新检查项目归属及状态。 - resources.verify(projectCode, input.batchCode(), input.files()); - String prefix = resources.prefix(projectCode, input.batchCode()); - String main = resources.validate(prefix, input.files()); - String manifest = resources.manifest(input.files()); - return locks.serial(projectCode, () -> { - Project project = projects.readyOwner(userId, projectCode); - project.setUrdfPrefix(prefix); - project.setUrdfMainObjectKey(prefix + main); - project.setUrdfFiles(manifest); - persist(project); - log.info("绑定 URDF 资源 projectCode={} batchCode={} fileCount={}", - projectCode, input.batchCode(), input.files().size()); - return projects.view(project, userId); - }); - } - - @Override - public void clear(long userId, String projectCode) { - locks.serial(projectCode, () -> { - Project project = projects.owner(userId, projectCode); - project.setUrdfMainObjectKey(""); - project.setUrdfPrefix(""); - project.setUrdfFiles("[]"); - persist(project); - log.info("清除 URDF 绑定 projectCode={}", projectCode); - return null; - }); - } - - private void persist(Project project) { - project.setUpdatedAt(ProjectSupport.now()); - int updated = mapper.update(null, new LambdaUpdateWrapper() - .eq(Project::getProjectCode, project.getProjectCode()) - .eq(Project::getOwnerUserId, project.getOwnerUserId()) - .eq(Project::getDeleted, false) - .set(Project::getUrdfMainObjectKey, project.getUrdfMainObjectKey()) - .set(Project::getUrdfFiles, project.getUrdfFiles()) - .set(Project::getUrdfPrefix, project.getUrdfPrefix()) - .set(Project::getUpdatedAt, project.getUpdatedAt())); - if (updated != 1) throw BusinessException.notFound(); - } -} diff --git a/community-service/src/main/java/com/linkerbot/community/service/mapper/AiProjectMapper.java b/community-service/src/main/java/com/linkerbot/community/service/mapper/AiProjectMapper.java deleted file mode 100644 index b59e50a..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/mapper/AiProjectMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.linkerbot.community.service.mapper; - -import com.linkerbot.community.bean.entity.Project; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -@Mapper -public interface AiProjectMapper { - @Select(""" - - """) - List candidates( - @Param("projectType") String projectType, - @Param("patterns") List patterns, - @Param("focusCodes") List focusCodes); -} diff --git a/community-service/src/main/java/com/linkerbot/community/service/mapper/CommentMapper.java b/community-service/src/main/java/com/linkerbot/community/service/mapper/CommentMapper.java deleted file mode 100644 index 4e5df66..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/mapper/CommentMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.linkerbot.community.service.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.linkerbot.community.bean.entity.ProjectComment; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CommentMapper extends BaseMapper {} diff --git a/community-service/src/main/java/com/linkerbot/community/service/mapper/LikeMapper.java b/community-service/src/main/java/com/linkerbot/community/service/mapper/LikeMapper.java deleted file mode 100644 index 138a1d7..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/mapper/LikeMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.linkerbot.community.service.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.linkerbot.community.bean.entity.ProjectLike; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface LikeMapper extends BaseMapper {} diff --git a/community-service/src/main/java/com/linkerbot/community/service/mapper/ProjectMapper.java b/community-service/src/main/java/com/linkerbot/community/service/mapper/ProjectMapper.java deleted file mode 100644 index 19c084e..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/mapper/ProjectMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.linkerbot.community.service.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.linkerbot.community.bean.entity.Project; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface ProjectMapper extends BaseMapper {} diff --git a/community-service/src/main/java/com/linkerbot/community/service/support/OfficialUsers.java b/community-service/src/main/java/com/linkerbot/community/service/support/OfficialUsers.java deleted file mode 100644 index db3424b..0000000 --- a/community-service/src/main/java/com/linkerbot/community/service/support/OfficialUsers.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.linkerbot.community.service.support; - -public final class OfficialUsers { - public static final String EMAIL = "community-official@internal.invalid"; - - private OfficialUsers() {} -} diff --git a/community-service/src/test/java/com/linkerbot/community/service/fork/ProjectForkStateTest.java b/community-service/src/test/java/com/linkerbot/community/service/fork/ProjectForkStateTest.java deleted file mode 100644 index 2ef4de4..0000000 --- a/community-service/src/test/java/com/linkerbot/community/service/fork/ProjectForkStateTest.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.linkerbot.community.service.fork; - -import static org.assertj.core.api.Assertions.*; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; - -import com.linkerbot.community.bean.Contracts.ForkInput; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.UserService; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.config.ForkProperties; -import com.linkerbot.community.service.gitea.GiteaClient; -import com.linkerbot.community.service.impl.ProjectServiceImpl; -import com.linkerbot.community.service.mapper.*; -import com.linkerbot.community.service.oss.UrdfResources; -import com.linkerbot.community.service.oss.OssResourcePaths; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.support.ProjectLocks; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; -import org.springframework.beans.factory.support.StaticListableBeanFactory; - -class ProjectForkStateTest { - @ParameterizedTest - @ValueSource(strings = {"initial", "association", "completion"}) - void databaseWriteFailuresRemainUncertainWithCode(String stage) { - boolean completion = stage.equals("completion"); - Project source = new Project(); - source.setId(1L); - source.setProjectCode("111111111111"); - source.setPublishedCommitSha("a".repeat(40)); - source.setProjectType("GENERAL"); - source.setName("来源"); - source.setDescription(""); - source.setGiteaRepoId(1L); - source.setGiteaOwner("community"); - source.setGiteaRepoName("p_111111111111"); - ProjectMapper projects = mock(ProjectMapper.class); - when(projects.selectOne(any())).thenReturn(source); - AtomicReference target = new AtomicReference<>(); - when(projects.insert(any(Project.class))).thenAnswer(call -> { - Project project = call.getArgument(0); - project.setId(2L); - target.set(project); - if (stage.equals("initial")) throw new IllegalStateException("simulated insertion receipt lost"); - return 1; - }); - AtomicReference failed = new AtomicReference<>(false); - when(projects.updateById(any(Project.class))).thenAnswer(call -> { - Project project = call.getArgument(0); - if (!failed.get() && (completion == "READY".equals(project.getRepoStatus()))) { - failed.set(true); - throw new IllegalStateException("simulated database write failure"); - } - return 1; - }); - User user = new User(); - user.setNickname("测试用户"); - user.setUserCode("user-code"); - UserService users = mock(UserService.class); - when(users.require(1)).thenReturn(user); - GiteaClient gitea = mock(GiteaClient.class); - when(gitea.createRepository(anyString(), eq(false))).thenReturn(new GiteaClient.Repository(2, "community", "target")); - GitSnapshotCopier copier = mock(GitSnapshotCopier.class); - GitSnapshotCopier.PreparedSnapshot snapshot = mock(GitSnapshotCopier.PreparedSnapshot.class); - when(copier.prepare(any(), anyString(), anyString(), anyString(), any())).thenReturn(snapshot); - when(snapshot.push(any())).thenReturn("b".repeat(40)); - ForkExecutor executor = new ForkExecutor(new ForkProperties(), copier); - StaticListableBeanFactory factory = new StaticListableBeanFactory(); - factory.addBean("forks", executor); - factory.addBean("snapshots", copier); - ProjectLocks locks = new ProjectLocks(); - ProjectServiceImpl service = new ProjectServiceImpl(projects, mock(ProjectImportTaskMapper.class), mock(LikeMapper.class), mock(CommentMapper.class), users, - gitea, new CommunityProperties(), locks, new OssResourcePaths(new OssProperties()), factory.getBeanProvider(UrdfResources.class), - factory.getBeanProvider(ForkExecutor.class), factory.getBeanProvider(GitSnapshotCopier.class)); - try { - assertThatThrownBy(() -> service.fork(1, source.getProjectCode(), new ForkInput(source.getPublishedCommitSha(), "副本"))) - .isInstanceOfSatisfying(BusinessException.class, error -> { - assertThat(error.code()).isEqualTo("PROJECT_INITIALIZATION_ERROR"); - assertThat(error.details()).isEqualTo(Map.of("projectCode", target.get().getProjectCode())); - }); - assertThat(target.get().getRepoStatus()).isEqualTo("CREATING"); - assertThat(target.get().getGiteaRepoId()).isEqualTo(stage.equals("initial") ? null : 2L); - assertThatThrownBy(() -> locks.write(target.get().getProjectCode(), () -> true)) - .isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("REMOTE_RESULT_UNKNOWN")); - if (completion) verify(snapshot).push(any()); - else verify(snapshot, never()).push(any()); - if (stage.equals("initial")) { - verify(copier, never()).prepare(any(), anyString(), anyString(), anyString(), any()); - verify(snapshot, never()).close(); - } else verify(snapshot).close(); - } finally { executor.close(); } - } -} diff --git a/docs/admin-api.md b/docs/admin-api.md index 403c502..63572eb 100644 --- a/docs/admin-api.md +++ b/docs/admin-api.md @@ -1,6 +1,6 @@ -# Community 管理后台前端接口文档 +# Vibemake 管理后台前端接口文档 -适用模块:`community-adminapi`。本文按当前后端实现整理,可直接用于后台页面开发和联调。接口均已包含 `/admin-api` 前缀;示例数据仅用于说明字段结构。 +适用模块:`vibemake-adminapi`。本文按当前后端实现整理,可直接用于后台页面开发和联调。接口均已包含 `/admin-api` 前缀;示例数据仅用于说明字段结构。 部署、管理员初始化及服务配置见 [部署说明](admin-deployment.md),前端对接无需执行数据库操作。 @@ -1106,3 +1106,15 @@ requestId 同时可能出现在响应头 `X-Request-Id`。错误提示可附“ - 在迁移表单上传封面和 URDF 后即可创建任务;不必等待仓库 READY 再绑定 URDF;未完整上传时不能创建任务。 - 重复来源提供现有项目入口;任务失败、超时及待核对不自动重建迁移任务。 - 重试按钮使用 canRetry 控制,确认框显示 retryMessage;明确失败时可清理重迁,结果未知时不盲目删库;CLEANING 阶段展示清理提示。 + +## Redis 接入后的兼容与错误处理 + +接口路径、请求字段和正常响应字段保持兼容,仍只暴露业务编码。普通用户登录方式不变。会话已存入 Redis,应用重启保留未过期会话,首次从本机缓存版本升级需要重新登录。生产环境默认关闭 Swagger/OpenAPI;test 保留。 + +新增错误:429 RATE_LIMITED(频率超限)、429 FILE_BUSY(文件处理并发繁忙)、503 REDIS_UNAVAILABLE(安全状态服务不可用)、413 REQUEST_TOO_LARGE(JSON 请求字节超限)、502 GITEA_RESPONSE_TOO_LARGE(上游读取超限)。429 频率/文件繁忙响应提供 Retry-After 秒数,并通过 CORS 暴露;前端等待后手动重试。保留原 AI_BUSY、AI_RATE_LIMITED、FORK_BUSY、ADMIN_LOGIN_LIMITED 及文件大小错误码。 + +鉴权或普通业务请求收到 503 时保留本地 Token,提示服务暂不可用;正常 401 仍清除登录状态。用户主动退出时始终清理本地 Token;退出接口若返回 503,表示服务端撤销结果尚未确认。仓库写入遇到 REMOTE_RESULT_UNKNOWN 时先核对项目和 requestId,不自动重发。请求限流在解析大内容前执行,部分超限请求可能先返回 429。 + +Fork 每用户每分钟 10 次、URDF 批次签名 20 次、封面签名 30 次,均为独立请求尝试次数;一个 URDF 文件夹的一次批次签名算一次,不按文件数计。Fork 同时执行仍最多 2 个,文件读取/目录/历史/提交/上传合计最多 4 个。普通 JSON 256 KiB、URDF 清单 2 MiB、提交 JSON 64 MiB,原有单文件和总内容约束继续保留。全部规则和可配置变量见 [部署说明](admin-deployment.md#redis-安全与资源保护)。 + +登录和签名响应显式禁止缓存。CORS 新增暴露 Retry-After,不启用跨域 Cookie;正文、Token、邮箱及验证码答案不得写入前端日志。 diff --git a/docs/admin-database.md b/docs/admin-database.md index a926f7e..770fc54 100644 --- a/docs/admin-database.md +++ b/docs/admin-database.md @@ -51,7 +51,7 @@ CREATE TABLE project_import_task ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='后台公开GitHub项目迁移任务'; ``` -没有管理员账号表、管理员会话表、审计表或仓库状态表。第一位管理员使用初始化命令设置,禁止手写明文密码入库。后续手工修改角色时必须同时递增 session_version,且 ADMIN 必须具有通过 BCrypt 编码的密码。官方托管账号由后台首次创建或迁移项目时自动建立,保留邮箱为 community-official@internal.invalid。 +没有管理员账号表、管理员会话表、审计表或仓库状态表。第一位管理员使用初始化命令设置,禁止手写明文密码入库。后续手工修改角色时必须同时递增 session_version,且 ADMIN 必须具有通过 BCrypt 编码的密码。官方托管账号由后台首次创建或迁移项目时自动建立,保留邮箱为 vibemake-official@internal.invalid。 REVIEW 或遗留 WRITING 不应直接改为 IDLE:先核对 Gitea 写入、迁移收据、LFS 完成情况、仓库身份及提交。已持久化成功收据时提供只读核对后的续跑;明确 GITEA_MIGRATION_REJECTED 的任务允许通过 retry 进入 CLEANING,核验并清理归属于该任务的失败仓库后重迁。清理身份使用现有 project.gitea_repo_id 保存,保留原任务与项目,不新增字段或表。已有 phase 为 VARCHAR,无需因新增 CLEANING 阶段执行数据库变更。不提供强制成功操作。 diff --git a/docs/admin-deployment.md b/docs/admin-deployment.md index 14e3f21..47fd735 100644 --- a/docs/admin-deployment.md +++ b/docs/admin-deployment.md @@ -1,24 +1,24 @@ -# Community 管理端部署与运维 +# Vibemake 管理端部署与运维 -管理端为独立 Spring Boot 应用 `community-adminapi`,默认端口 8994,接口前缀 `/admin-api`。项目文件复用现有 Gitea 私有组织仓库,封面与 URDF 复用 OSS;不需要新建 Gitea 账号或组织。前端对接见 [管理后台接口文档](admin-api.md)。 +管理端为独立 Spring Boot 应用 `vibemake-adminapi`,默认端口 8994,接口前缀 `/admin-api`。项目文件复用现有 Gitea 私有组织仓库,封面与 URDF 复用 OSS;不需要新建 Gitea 账号或组织。前端对接见 [管理后台接口文档](admin-api.md)。 ## 部署与初始化 1. 备份数据库、暂停写入、排空旧进程。已有数据库手工执行 [增量 SQL](admin-database.md),新数据库先执行 [基础四表 SQL](database.md),再创建迁移任务表。应用不自动执行 SQL。社区端也会读取迁移任务,因此暂不启用管理端时仍需创建该表。 2. 更新社区端、管理端和 Excel 导入工具,确保全部写入端使用数据库共享锁。 -3. 在 `.env` 或部署环境中提供现有 `DB_*`、`GITEA_*`、`OSS_*`;后台默认关闭 AI。默认环境为 `test`,正式部署显式设置 `SPRING_PROFILES_ACTIVE=prod`。真实 `.env` 不提交,不用示例覆盖已有凭据。 +3. 在 `.env` 或部署环境中提供现有 `DB_*`、`GITEA_*`、`OSS_*`;后台默认关闭 AI,OSS 也需显式启用。另需提供 `REDIS_*` 连接变量,默认环境为 `test`,正式部署显式设置 `SPRING_PROFILES_ACTIVE=prod`。真实 `.env` 不提交,不用示例覆盖已有凭据。 4. 选择一个已有、正常的普通用户,执行初始化命令,交互输入两次管理员密码。密码至少 12 字符、UTF-8 最多 72 字节,不会写入命令参数或日志。该命令只初始化 USER,不用于重置已有管理员密码;成功后进程退出。 -5. 正常启动管理端,配置前端代理或后台跨域来源。第一版两个应用分别单实例运行,不能通过负载均衡随机分发同一应用的登录会话。 +5. 正常启动管理端,配置前端代理或后台跨域来源。两个应用仍分别单实例运行;共享会话不代表导入恢复和 AI/Fork 并发模型已支持多实例。 ```bash bash scripts/run-admin-local.sh --bootstrap-admin-user-code='<已有用户编码>' bash scripts/run-admin-local.sh ``` -如仅初始化管理员、当前没有 OSS 凭据,可以传 `--community.oss.enabled=false`。直接运行 jar 时不会自动读取 `.env`,必须先在部署环境提供连接变量。本地脚本以 ADMIN_SERVER_PORT 设置后台端口,避免共用 `.env` 中的社区 SERVER_PORT 覆盖;直接部署时也应避免传入社区端的 SERVER_PORT。 +如仅初始化管理员、当前没有 OSS 凭据,可以传 `--vibemake.oss.enabled=false`。直接运行 jar 时不会自动读取 `.env`,必须先在部署环境提供连接变量。本地脚本以 ADMIN_SERVER_PORT 设置后台端口,避免共用 `.env` 中的社区 SERVER_PORT 覆盖;直接部署时也应避免传入社区端的 SERVER_PORT。 ```bash -SPRING_PROFILES_ACTIVE=prod java -jar community-adminapi/target/community-adminapi-0.0.1-SNAPSHOT.jar +SPRING_PROFILES_ACTIVE=prod java -jar vibemake-adminapi/target/vibemake-adminapi-0.0.1-SNAPSHOT.jar ``` | 配置 | 默认值/说明 | @@ -29,19 +29,19 @@ SPRING_PROFILES_ACTIVE=prod java -jar community-adminapi/target/community-admina | `ADMIN_IMPORT_CONCURRENCY` | 2,范围 1~4 | | `ADMIN_MIGRATION_TIMEOUT` | 30m,仅迁移请求使用,普通 Gitea 超时不变 | | `GITHUB_TOKEN` | 可选,只访问 GitHub 元数据 API,不能填写 Gitea Token | -| `community.token-ttl` | 后台默认 8h,可通过 Spring 配置覆盖 | +| `vibemake.token-ttl` | 后台默认 8h,可通过 Spring 配置覆盖 | -日志为 `community-adminapi.log` 和 `community-adminapi-error.log`,沿用 requestId、归档和脱敏规范。写操作记录实际操作用户编码、目标编码、接口动作、HTTP 结果和耗时;关键项目与迁移步骤另有业务日志。 +日志为 `vibemake-adminapi.log` 和 `vibemake-adminapi-error.log`,沿用 requestId、归档和脱敏规范。写操作记录实际操作用户编码、目标编码、接口动作、HTTP 结果和耗时;关键项目与迁移步骤另有业务日志。 ## 账号与权限 -复用 sys_user:USER 普通用户、ADMIN 管理员、OFFICIAL 官方托管账号。后台必须同时验证邮箱、密码、正常状态和 ADMIN 角色。管理员及官方账号不允许通过社区无密码入口登录,两个应用的本机 Token 不互通。后台重启后需要重新登录。 +复用 sys_user:USER 普通用户、ADMIN 管理员、OFFICIAL 官方托管账号。后台必须同时验证邮箱、密码、正常状态和 ADMIN 角色。管理员及官方账号不允许通过社区无密码入口登录,两个应用的 Redis Key 域隔离、Token 不互通。应用重启后保留未过期会话。 每次请求检查角色、状态和会话版本。禁用、修改密码或手工变更角色并递增 session_version 后,旧 Token 失效;恢复状态不会恢复旧会话。第一版无角色修改接口。 连续登录失败按账号 5 次、来源地址 30 次限速,15 分钟后重试;只使用连接来源地址,不信任任意客户端提交的转发 IP 头。 -项目不指定归属用户时,自动创建或复用官方账号,保留邮箱 `community-official@internal.invalid`。该地址在账号建立前也禁止社区登录。若已有账号的角色或状态异常,停止创建并人工核对,不接管普通用户。 +项目不指定归属用户时,自动创建或复用官方账号,保留邮箱 `vibemake-official@internal.invalid`。该地址在账号建立前也禁止社区登录。若已有账号的角色或状态异常,停止创建并人工核对,不接管普通用户。 ## 仓库写入与迁移 @@ -79,4 +79,101 @@ AI_ENABLED=false OSS_ENABLED=false mvn clean verify bash scripts/test-admin-mysql.sh ``` -普通测试使用 H2 和模拟 GitHub/Gitea/OSS,不访问现有业务库或真实仓库。真实 MySQL 测试使用 `.env` 的 DB_* 或 ADMIN_MYSQL_TEST_* 连接配置,只创建/删除随机 `community_admin_verify_*` 临时库;需要创建临时库权限。验证跨实例互斥、重入、持久化阻断、断开持锁连接及新进程恢复,不对已有业务库执行 DDL。 +普通测试使用 H2 和模拟 GitHub/Gitea/OSS,不访问现有业务库或真实仓库。真实 MySQL 测试使用 `.env` 的 DB_* 或 ADMIN_MYSQL_TEST_* 连接配置,只创建/删除随机 `vibemake_admin_verify_*` 临时库;需要创建临时库权限。验证跨实例互斥、重入、持久化阻断、断开持锁连接及新进程恢复,不对已有业务库执行 DDL。 + +## Redis 安全与资源保护 + +本版本采用 Redis 8.10.2 单节点直连,两个在线应用各单实例。首次部署时停止并排空旧进程再替换,新旧会话存储不混用;旧本机会话和验证码不会迁移,需重新登录一次。应用重启可保留 Redis 中未过期的会话,Redis 自身重启能否保留取决于服务器持久化配置。回退旧版本需要重新登录,不执行 Redis 全库清理,遗留 Key 按 TTL 过期。本次无数据库迁移。 + +### 连接与隔离 + +| 环境变量 | 默认值与用途 | +| --- | --- | +| REDIS_HOST / REDIS_PORT | test 为 localhost / 6379;prod 主机必须显式配置 | +| REDIS_USERNAME / REDIS_PASSWORD | 用户名可选;prod 密码必须显式配置,不将凭据放进连接 URL | +| REDIS_DATABASE | 0,两个应用可使用同一逻辑库 | +| REDIS_SSL_ENABLED | false;启用时使用 JVM 信任库验证服务端证书,不关闭证书验证 | +| REDIS_CONNECT_TIMEOUT / REDIS_TIMEOUT | 2s / 1s | +| REDIS_KEY_PREFIX | test 为 vibemake:test,prod 为 vibemake:prod;随后追加 api:v1: 或 admin:v1: | +| TRUSTED_PROXY_CIDRS | 空,默认不信任转发头;实际反向代理 IP/CIDR 用逗号分隔 | + +相同环境的应用重启必须沿用相同前缀;不同环境使用不同前缀和凭据范围。配置可信代理后,从连接来源开始由右向左剥离可信代理链,使用首个不可信地址限流;不信任任意客户端提交的 X-Forwarded-For。后端入口应只允许部署代理访问,代理需覆盖或正确追加转发链。不要同时在容器层无条件改写 remoteAddr,否则会绕过应用对代理来源的判断。 + +在线启动探测 SET NX PX、GET、GETDEL、计数 Lua、TTL 和 DEL;拒绝权限不足或连接异常的启动。运行期间 Redis 故障返回 503 REDIS_UNAVAILABLE,不回退本机或放行。离线导入和 bootstrap-admin-user-code 命令不执行 Redis 探测。 + +### 权限与运行配置 + +为应用配置仅能访问自己环境前缀的 Redis ACL 用户。业务命令为 GET、SET、GETDEL、DEL、TTL、INCR、PEXPIRE、PTTL、EVAL、EVALSHA;Lettuce 连接还需 AUTH/HELLO、PING、SELECT(非零逻辑库)、CLIENT SETNAME/SETINFO。按服务端 ACL 语法授予这些命令和对应 `~vibemake:prod:api:v1:*` / `~vibemake:prod:admin:v1:*` Key 范围,或为两端共用账号授权两段范围。无需 FLUSHDB、FLUSHALL、KEYS、CONFIG、ACL 或通用管理权限。集成测试的随机测试前缀额外需要 SCAN,生产应用不执行扫描。 + +Redis 只监听内网或回环地址,启用认证;跨不可信网络使用 TLS。容量监控包括 used_memory、拒绝写入、evicted_keys、连接错误和延迟。安全状态应有独立容量保障,推荐专用实例使用 noeviction 和合适的 maxmemory,避免普通缓存淘汰会话或限流计数;noeviction 内存耗尽时写入失败,应用返回 503,需容量告警。持久化按业务要求配置并验证重启恢复,不能把会话当作可随意淘汰的普通缓存。应用不会自动修改既有 Redis 全局配置。 + +### 频率与大小配置 + +固定窗口从该主体第一次调用时开始,持续 60 秒;按请求尝试计数,繁忙和失败也计入,窗口内不会因再次调用滑动延长。用户操作在业务入口限流,覆盖 AI 和 HTTP;管理员按操作管理员身份计数。各行独立,文件提交/上传以及点赞/取消点赞各自共享所在行额度。 + +| 环境变量 | 默认次数/分钟 | 主体 | +| --- | --- | --- | +| RATE_CAPTCHA_PER_MINUTE | 20 | IP | +| RATE_LOGIN_IP_PER_MINUTE | 20 | IP | +| RATE_LOGIN_ACCOUNT_PER_MINUTE | 10 | 规范化邮箱 | +| RATE_ADMIN_LOGIN_PER_MINUTE | 30 | IP,另保留失败次数限制 | +| RATE_VIBEMAKE_READ_PER_MINUTE | 120 | IP | +| RATE_FILE_READ_PER_MINUTE | 60 | IP | +| RATE_CREATE_PER_MINUTE | 5 | 用户/操作管理员 | +| RATE_FORK_PER_MINUTE | 10 | 用户/操作管理员 | +| RATE_FILE_WRITE_PER_MINUTE | 10 | 用户/操作管理员 | +| RATE_COVER_SIGN_PER_MINUTE | 30 | 用户/操作管理员 | +| RATE_URDF_SIGN_PER_MINUTE | 20 | 用户/操作管理员 | +| RATE_COMMENT_PER_MINUTE | 10 | 用户 | +| RATE_LIKE_PER_MINUTE | 60 | 用户 | + +超限为 429 RATE_LIMITED,保留 AI_RATE_LIMITED、AI_BUSY、FORK_BUSY、ADMIN_LOGIN_LIMITED 等现有代码。普通限流响应带 Retry-After(秒),其响应体 data.retryAfterSeconds 同步提供剩余等待时间。后台失败限制维持账号 5 次/IP 30 次,失败记录在最后一次失败后 15 分钟过期;成功仅清理对应账号失败次数。应用仅聚合记录同一规则的限流日志,不记录邮箱或 Token。 + +| 配置 | 默认值 | +| --- | --- | +| HTTP_JSON_MAX_BYTES | 262144,普通 JSON 256 KiB | +| HTTP_URDF_JSON_MAX_BYTES | 2097152,URDF 清单 2 MiB | +| HTTP_COMMIT_JSON_MAX_BYTES | 67108864,提交 JSON 64 MiB | +| FILE_MAX_CONCURRENT | 4,单实例文件读取/目录/历史/提交/multipart 处理名额 | +| FORK_MAX_CONCURRENT | 2,保持独立 Fork 执行名额 | + +JSON 上限为实际线上请求字节数,包含转义和结构开销;业务单文件/总内容上限继续保留。Content-Length 和 chunked 均流式核验,超限返回 413 REQUEST_TOO_LARGE。multipart 仍为单文件 10MB、请求 52MB,原有 UPLOAD_TOO_LARGE/FILE_TOO_LARGE 错误保留;URDF 直传 OSS 不占用这类 multipart 名额。文件名额不足为 429 FILE_BUSY,不排队;Fork 繁忙仍为 FORK_BUSY。 + +Gitea 原始文件有界读取,contents JSON 上限按单文件 Base64 膨胀量加 2 MiB 元信息计算,其他元数据 8 MiB,错误响应 64 KiB。GET 超限返回 502 GITEA_RESPONSE_TOO_LARGE;写入响应无法完整确认仍为 REMOTE_RESULT_UNKNOWN,持久化阻断后续仓库写入,不自动重试。 + +### 依赖安全核对(2026-10-22) + +基线升级为 Boot 3.5.16、Security 6.5.11、Framework 6.2.19、Tomcat 10.1.61,保持 Java 21;Redis/Lettuce 由 Boot BOM 管理。以下为本次针对实际使用路径的公告核对,不等同于全量依赖扫描或账号安全问题已解决。 + +| 公告 | 条件与本项目处理 | +| --- | --- | +| CVE-2026-22732 | 安全响应头在特定写出路径缺失;Security 升至 6.5.11,超过该问题最低修复版 6.5.9,验证登录、下载及错误响应缓存头 | +| CVE-2026-22735 | SSE 非结构化文本且攻击者控制发给其他用户的内容;Framework 已超过最低修复版 6.2.17,应用也使用 JSON 结构化事件 | +| CVE-2026-24880 | 特定代理放过异常 HTTP/1.1 chunk 扩展时可请求走私;Tomcat 10.1.61 含修复,代理仍应严格校验请求 | +| CVE-2026-101356 | Tomcat 10.1.55~10.1.60 的 HTTP/2 异步请求/响应复用问题;显式锁定 10.1.61,避免使用 Boot BOM 默认的 10.1.55 | +| CVE-2026-47883 | UrlHandlerFilter 使用过宽匹配模式时的开放重定向;仓库未使用该 Filter,本次记录为条件风险,后续引入该组件前重新核对修复版本 | + +依据:[Spring 响应头公告](https://spring.io/security/cve-2026-22732/)、[Spring SSE 公告](https://spring.io/security/cve-2026-22735/)、[Spring UrlHandlerFilter 公告](https://spring.io/security/cve-2026-47883/)、[Tomcat 公告](https://tomcat.apache.org/security-10.html)、[Boot 依赖版本](https://docs.spring.io/spring-boot/3.5/appendix/dependency-versions/coordinates.html)。普通用户邮箱冒名登录按本次范围保留,后续更换登录方式时单独处理。 + +生产两端必须配置同一个目标 GITEA_ORGANIZATION;prod 关闭 Swagger/OpenAPI,test 保留。AI、OSS 默认关闭并需显式启用;不增加数据库迁移。部署后验证 Redis 隔离、应用重启会话、禁用失效、限流、大小保护、Gitea 写入结果不明状态和公开 GET 行为,再开放流量。 + +### 验证记录与性能基准(2026-10-22) + +已通过真实 Redis 8.10.2 的 TTL、原子消费、原子计数、域隔离、重建连接、撤销和账号禁用验证,以及真实 MySQL 的共享锁、重入、持久化阻断和持锁连接断开测试。全部数据库验证只创建/删除随机临时库,Redis 测试只使用随机前缀,未改动既有业务表或 Redis 全局配置。 + +基准使用改造前 HEAD 的独立源码副本与当前版本,固定 JDK 21、JVM 堆 128~512 MiB、21 个项目、20 个用户、20 条评论、20 条导入来源,每次读取 20 条,预热后每场景 100 次调用,前后按顺序运行。MySQL 使用两个独立随机临时库,测试结束删除。SQL 数为服务层物理 SELECT 数,不包含 HTTP 安全过滤器的账号校验。 + +| 数据库 | 版本 | 并发 | 每请求 SQL | P95 毫秒 | 堆池峰值之和 MiB | +| --- | --- | --- | --- | --- | --- | +| H2 | 改造前 | 1 | 122 | 15.918 | 109.12 | +| H2 | 改造前 | 4 | 122 | 24.732 | 108.41 | +| H2 | 改造后 | 1 | 8 | 8.023 | 109.50 | +| H2 | 改造后 | 4 | 8 | 15.511 | 111.23 | +| MySQL | 改造前 | 1 | 122 | 2448.059 | 109.59 | +| MySQL | 改造前 | 4 | 122 | 2414.935 | 109.68 | +| MySQL | 改造后 | 1 | 8 | 173.823 | 110.11 | +| MySQL | 改造后 | 4 | 8 | 221.998 | 87.36 | + +项目 SQL 从 122 降到 8,评论列表从 23 降到 4,20 用户后台列表从 22 降到 3。MySQL 四并发 P95 从 2414.935ms 降到 221.998ms,约降低 91%。本地微基准受运行波动影响,不能将 SQL 数变化等同于所有环境的固定延迟收益。堆池峰值是各 heap memory pool 的峰值之和,并非进程 RSS;普通小请求的内存收益不稳定,本期内存保护主要针对超大正文、无界上游响应和大文件并发。 + +复测:`AI_ENABLED=false OSS_ENABLED=false mvn -pl vibemake-api -am -Dtest=QueryEfficiencyTest -Dsurefire.failIfNoSpecifiedTests=false '-DargLine=-Xms128m -Xmx512m' test`。默认使用 H2;显式设置 BENCHMARK_MYSQL_URL、BENCHMARK_MYSQL_USERNAME、BENCHMARK_MYSQL_PASSWORD 时,自动创建并最终删除 vibemake_benchmark_* 随机临时库,执行 DDL 前验证连接 catalog 必须等于本次随机库。账号需要创建和删除临时库权限,禁止将基准改为直接重置业务库。该小样本不代表正式环境容量,部署仍需结合真实项目体量验证。 diff --git a/docs/database.md b/docs/database.md index 31bcb34..036f8e0 100644 --- a/docs/database.md +++ b/docs/database.md @@ -1,10 +1,10 @@ # 数据库初始化 -业务数据库名为 `community`,只包含以下四张表。由人工执行;应用不运行迁移或自动建表。以下 SQL 面向 MySQL 8.0.13 及以上(URDF JSON 默认值使用表达式)。 +业务数据库名为 `vibemake`,只包含以下四张表。由人工执行;应用不运行迁移或自动建表。以下 SQL 面向 MySQL 8.0.13 及以上(URDF JSON 默认值使用表达式)。 ```sql -CREATE DATABASE IF NOT EXISTS community CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -USE community; +CREATE DATABASE IF NOT EXISTS vibemake CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +USE vibemake; CREATE TABLE sys_user ( id BIGINT NOT NULL AUTO_INCREMENT COMMENT '内部用户主键', @@ -52,7 +52,7 @@ CREATE TABLE project ( UNIQUE KEY uk_project_repo (gitea_owner, gitea_repo_name), UNIQUE KEY uk_project_repo_id (gitea_repo_id), KEY idx_project_owner (owner_user_id, deleted, created_at), - KEY idx_project_community (publish_status, deleted, published_at), + KEY idx_project_vibemake (publish_status, deleted, published_at), KEY idx_project_type (publish_status, deleted, project_type, published_at), CONSTRAINT fk_project_owner FOREIGN KEY (owner_user_id) REFERENCES sys_user(id), CONSTRAINT fk_project_source FOREIGN KEY (source_project_id) REFERENCES project(id) @@ -125,7 +125,7 @@ ALTER TABLE project 先升级所有在线及导入写入进程,新版本兼容新旧格式,读取不修改记录。按环境分别执行以下操作;test 根目录为 `vibemake_dev`,prod 为 `vibemake`。OSS 对象不移动,`urdf_files`、`updated_at` 不变。不要在不同环境共用同一业务数据库。 -迁移前备份数据库,并将候选记录的原值导出至备份目录。以下临时表仅属于当前数据库连接,不能代替持久备份。封面按每个受控公开基础地址分别执行一遍,包含 Bucket 标准域名、当前 CDN 基础地址和 `community.oss.legacy-public-base-urls` 中的历史地址;基础地址不含环境根目录。不使用全局 REPLACE,不转换外链、带参数/片段地址或其他环境路径。 +迁移前备份数据库,并将候选记录的原值导出至备份目录。以下临时表仅属于当前数据库连接,不能代替持久备份。封面按每个受控公开基础地址分别执行一遍,包含 Bucket 标准域名、当前 CDN 基础地址和 `vibemake.oss.legacy-public-base-urls` 中的历史地址;基础地址不含环境根目录。不使用全局 REPLACE,不转换外链、带参数/片段地址或其他环境路径。 ### 预览与准备 diff --git a/docs/community-api.md b/docs/vibemake-api.md similarity index 95% rename from docs/community-api.md rename to docs/vibemake-api.md index 4e81fb3..8927896 100644 --- a/docs/community-api.md +++ b/docs/vibemake-api.md @@ -1,6 +1,8 @@ -# Community 前端接口对接文档 +# Vibemake 前端接口对接文档 -供社区列表、项目详情、登录、我的工作区和在线文件编辑页面使用。前端通过 Community 后端完成所有业务操作;登录 Token 是平台 Token,前端不连接 Gitea、不持有 Gitea 凭据。 +供社区列表、项目详情、登录、我的工作区和在线文件编辑页面使用。前端通过 Vibemake 后端完成所有业务操作;登录 Token 是平台 Token,前端不连接 Gitea、不持有 Gitea 凭据。 + +项目模块和 Java 包名使用 `vibemake`,对外接口路径保持原有命名,包括 `/api/community/**`,前端调用无需调整。 当前支持项目、文件、目录、提交、手动发布、快照 Fork、评论和点赞,以及可配置开启的 Maker AI(聊天问答、查找、创建空项目、Fork)。项目发布后,后续提交只更新工作区,需要再次调用发布接口才更新社区代码。没有服务端草稿保存、独立工作区实体或项目类型表。 @@ -40,14 +42,14 @@ | 接口调试 | `/swagger-ui.html` | | OpenAPI | `/v3/api-docs` | -后端按环境为 `/api/**` 配置跨域白名单,配置项为 `community.cors.allowed-origins`: +后端按环境为 `/api/**` 配置跨域白名单,配置项为 `vibemake.cors.allowed-origins`: | 后端环境 | 允许的前端 Origin | | --- | --- | | test(默认) | `https://dev-vibemake.robotquan.com` | | prod | `https://vibemake.robotquan.com` | -允许 `GET、HEAD、POST、PUT、PATCH、DELETE、OPTIONS`,请求头允许 `Authorization、Content-Type、Accept`,预检缓存 3600 秒。前端继续通过 `Authorization: Bearer <平台 token>` 鉴权,无需设置 `credentials: 'include'`;后端不启用跨域 Cookie 凭据。成功及鉴权、业务错误响应均支持上述来源,并暴露 `X-Request-Id`、`Content-Disposition` 响应头。 +允许 `GET、HEAD、POST、PUT、PATCH、DELETE、OPTIONS`,请求头允许 `Authorization、Content-Type、Accept`,预检缓存 3600 秒。前端继续通过 `Authorization: Bearer <平台 token>` 鉴权,无需设置 `credentials: 'include'`;后端不启用跨域 Cookie 凭据。成功及鉴权、业务错误响应均支持上述来源,并暴露 `X-Request-Id`、`Content-Disposition`、`Retry-After` 响应头。 其他域名、HTTP 来源、非默认端口和另一环境的前端来源均不在默认白名单内。本地开发继续通过前端开发服务器代理 `/api`;部署代理需透传 `Origin`、预检请求及后端 CORS 响应头,避免重复添加跨域头。OSS 直传的跨域规则仍需单独在 Bucket 配置。 @@ -391,7 +393,7 @@ data 示例中 image 仅展示格式前缀,实际值为完整图片: } ``` -首次登录自动创建用户,邮箱统一转成小写。当前只验证邮箱格式与图片验证码,不发送邮件、不使用密码,也不验证邮箱归属。Token 有效期默认 24 小时,以 expiresIn 为准,不是 JWT,没有刷新 Token 接口;服务重启后需要重新登录。 +首次登录自动创建用户,邮箱统一转成小写。当前只验证邮箱格式与图片验证码,不发送邮件、不使用密码,也不验证邮箱归属。Token 有效期默认 24 小时,以 expiresIn 为准,不是 JWT,没有刷新 Token 接口;会话存于 Redis,应用重启后保留未过期会话;首次从本机缓存版本升级需要重新登录。 ### 当前用户和退出登录 @@ -569,11 +571,11 @@ async function replaceProjectCover(project: Project, file: File, token: string) ### 部署配置 -服务端启用 `OSS_ENABLED=true`,配置 `OSS_REGION`、`OSS_BUCKET`、`OSS_ACCESS_KEY_ID`、`OSS_ACCESS_KEY_SECRET`;地域 ID 使用 `cn-beijing` 等编码,不带 `oss-` 前缀。Endpoint 自动生成为 `https://oss-{region}.aliyuncs.com`,例如北京为 `https://oss-cn-beijing.aliyuncs.com`,无需配置 Endpoint 环境变量。特殊域名场景可显式设置 `community.oss.endpoint`,优先使用配置值,要求为公网 HTTPS 地址,不带 Bucket、路径、凭据或查询参数。`OSS_PUBLIC_BASE_URL` 可选。启用时配置缺失或不合法会停止启动。密钥不提交仓库、不返回浏览器;浏览器只收到 AccessKeyId 派生的 credential、Policy 和签名。 +服务端启用 `OSS_ENABLED=true`,配置 `OSS_REGION`、`OSS_BUCKET`、`OSS_ACCESS_KEY_ID`、`OSS_ACCESS_KEY_SECRET`;地域 ID 使用 `cn-beijing` 等编码,不带 `oss-` 前缀。Endpoint 自动生成为 `https://oss-{region}.aliyuncs.com`,例如北京为 `https://oss-cn-beijing.aliyuncs.com`,无需配置 Endpoint 环境变量。特殊域名场景可显式设置 `vibemake.oss.endpoint`,优先使用配置值,要求为公网 HTTPS 地址,不带 Bucket、路径、凭据或查询参数。`OSS_PUBLIC_BASE_URL` 可选。启用时配置缺失或不合法会停止启动。密钥不提交仓库、不返回浏览器;浏览器只收到 AccessKeyId 派生的 credential、Policy 和签名。 公开基础地址可以是 OSS 或 CDN 域名,可带基础路径;最终地址为 `{公开基础地址}/{objectKey}`,CDN 路径需正确映射到同一对象。留空时为 `https://{Bucket}.{Endpoint 主机名}/{objectKey}`。API 的 `coverUrl` 继续接收和返回完整 HTTPS URL;数据库仅对本平台当前环境资源保存 `/project-covers/...` 未编码路径,域名和环境根目录由后端配置补齐,外链原样保存。创建、PATCH、清除封面及 Fork 的调用方式不变,不允许客户端改为提交相对路径。 -历史完整平台 URL 及当前环境的 URDF key 均兼容读取,读取不自动迁移。更换域名时,在 `community.oss.legacy-public-base-urls` 配置历史公开基础地址(可带 CDN 基础路径,不含环境根目录、凭据、查询参数及片段),或通过 `OSS_LEGACY_PUBLIC_BASE_URLS` 使用英文逗号分隔。后端按域名、端口和完整路径边界匹配当前环境;带查询参数或片段的封面继续按外链保留。迁移 SQL 与回退步骤见 [资源路径迁移](database.md#资源路径历史数据迁移)。 +历史完整平台 URL 及当前环境的 URDF key 均兼容读取,读取不自动迁移。更换域名时,在 `vibemake.oss.legacy-public-base-urls` 配置历史公开基础地址(可带 CDN 基础路径,不含环境根目录、凭据、查询参数及片段),或通过 `OSS_LEGACY_PUBLIC_BASE_URLS` 使用英文逗号分隔。后端按域名、端口和完整路径边界匹配当前环境;带查询参数或片段的封面继续按外链保留。迁移 SQL 与回退步骤见 [资源路径迁移](database.md#资源路径历史数据迁移)。 OSS 控制台配置步骤: @@ -1271,7 +1273,7 @@ if (result.status !== 'CHAT') { 通过 HTTP 状态和 code 判断行为,保留 requestId 供排查。通用请求封装不要自动重试创建项目、Fork、评论或文件写入。浏览器超时、取消请求、连接中断不保证后端没有执行成功。 -写入结果待核对时,同一进程内会阻止该项目后续仓库写入或发布;仍可读取可用文件、修改项目信息、撤回和删除。CREATING 项目因仓库尚未 READY,不能读取文件。没有 repository_operation 查询接口、自动恢复接口或跨重启完整幂等保证。 +写入结果待核对时,数据库持久化的写入状态会阻止该项目后续仓库写入或发布;仍可读取可用文件、修改项目信息、撤回和删除。CREATING 项目因仓库尚未 READY,不能读取文件。没有 repository_operation 查询接口、自动恢复接口或跨重启完整幂等保证。 ## 页面调用顺序 @@ -1474,4 +1476,16 @@ export default { 本节供前端遇到写入结果不明时与后端协作使用。记录 projectCode、requestId、接口路径及操作时间,提供给后端;不要在日志或工单中记录 Token、验证码答案、邮箱或文件内容。 -后端先按 projectCode 对应的固定仓库名核对仓库、文件与提交历史。初始化未完成的项目核对后修正 repo_status 和仓库映射;确认没有远端写入仍在执行后,再重启后端解除本机待核对标记。超时不能直接视为未提交后再次写入。数据库结构见 [四表数据库说明](database.md)。 +后端先按 projectCode 对应的固定仓库名核对仓库、文件与提交历史。初始化未完成的项目核对后修正 repo_status 和仓库映射;确认没有远端写入仍在执行后,按管理端部署说明核对并恢复数据库中的写入状态;单纯重启不会解除持久化阻断。超时不能直接视为未提交后再次写入。数据库结构见 [四表数据库说明](database.md)。 + +## Redis 接入后的兼容与错误处理 + +接口路径、请求字段和正常响应字段保持兼容,仍只暴露业务编码。普通用户登录方式不变。会话已存入 Redis,应用重启保留未过期会话,首次从本机缓存版本升级需要重新登录。生产环境默认关闭 Swagger/OpenAPI;test 保留。 + +新增错误:429 RATE_LIMITED(频率超限)、429 FILE_BUSY(文件处理并发繁忙)、503 REDIS_UNAVAILABLE(安全状态服务不可用)、413 REQUEST_TOO_LARGE(JSON 请求字节超限)、502 GITEA_RESPONSE_TOO_LARGE(上游读取超限)。429 频率/文件繁忙响应提供 Retry-After 秒数,并通过 CORS 暴露;前端等待后手动重试。保留原 AI_BUSY、AI_RATE_LIMITED、FORK_BUSY、ADMIN_LOGIN_LIMITED 及文件大小错误码。 + +鉴权或普通业务请求收到 503 时保留本地 Token,提示服务暂不可用;正常 401 仍清除登录状态。用户主动退出时始终清理本地 Token;退出接口若返回 503,表示服务端撤销结果尚未确认。仓库写入遇到 REMOTE_RESULT_UNKNOWN 时先核对项目和 requestId,不自动重发。请求限流在解析大内容前执行,部分超限请求可能先返回 429。 + +Fork 每用户每分钟 10 次、URDF 批次签名 20 次、封面签名 30 次,均为独立请求尝试次数;一个 URDF 文件夹的一次批次签名算一次,不按文件数计。Fork 同时执行仍最多 2 个,文件读取/目录/历史/提交/上传合计最多 4 个。普通 JSON 256 KiB、URDF 清单 2 MiB、提交 JSON 64 MiB,原有单文件和总内容约束继续保留。全部规则和可配置变量见 [部署说明](admin-deployment.md#redis-安全与资源保护)。 + +登录和签名响应显式禁止缓存。CORS 新增暴露 Retry-After,不启用跨域 Cookie;正文、Token、邮箱及验证码答案不得写入前端日志。 diff --git a/pom.xml b/pom.xml index 211d1bd..9ada585 100644 --- a/pom.xml +++ b/pom.xml @@ -4,24 +4,25 @@ org.springframework.boot spring-boot-starter-parent - 3.5.7 + 3.5.16 com.linkerbot - community + vibemake 0.0.1-SNAPSHOT pom - community-common - community-bean - community-service - community-security - community-api - community-import - community-adminapi + vibemake-common + vibemake-bean + vibemake-service + vibemake-security + vibemake-api + vibemake-import + vibemake-adminapi 21 + 10.1.61 3.5.11 2.8.14 UTF-8 diff --git a/scripts/import-github-projects.sh b/scripts/import-github-projects.sh index 381a85f..e872cb9 100644 --- a/scripts/import-github-projects.sh +++ b/scripts/import-github-projects.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash set -euo pipefail -COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -if [[ -f "$COMMUNITY_ROOT/.env" ]]; then +VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then set -a - source "$COMMUNITY_ROOT/.env" + source "$VIBEMAKE_ROOT/.env" set +a fi -cd "$COMMUNITY_ROOT" -mvn -q -pl community-import -am -DskipTests package -exec java -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 -jar community-import/target/community-import-0.0.1-SNAPSHOT.jar "$@" +cd "$VIBEMAKE_ROOT" +mvn -q -pl vibemake-import -am -DskipTests package +exec java -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 -jar vibemake-import/target/vibemake-import-0.0.1-SNAPSHOT.jar "$@" diff --git a/scripts/migrate-gitea-org.py b/scripts/migrate-gitea-org.py index f3fbd8c..2e3fdac 100644 --- a/scripts/migrate-gitea-org.py +++ b/scripts/migrate-gitea-org.py @@ -421,7 +421,7 @@ def main() -> int: parser = argparse.ArgumentParser(description=__doc__) parser.add_argument("--source-url", required=True, help="测试 Gitea 基础地址,不含 /api/v1") parser.add_argument("--target-url", required=True, help="生产 Gitea 基础地址,不含 /api/v1") - parser.add_argument("--source-org", default="community") + parser.add_argument("--source-org", default="vibemake") parser.add_argument("--target-org", default="vibemake") parser.add_argument("--state-dir", type=Path, default=Path("logs/gitea-org-migration")) mode = parser.add_mutually_exclusive_group() diff --git a/scripts/migrate-project-covers.sh b/scripts/migrate-project-covers.sh index ed61f27..ac61703 100644 --- a/scripts/migrate-project-covers.sh +++ b/scripts/migrate-project-covers.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash set -euo pipefail -COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -if [[ -f "$COMMUNITY_ROOT/.env" ]]; then +VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then set -a - source "$COMMUNITY_ROOT/.env" + source "$VIBEMAKE_ROOT/.env" set +a fi -cd "$COMMUNITY_ROOT" -mvn -q -pl community-import -am -DskipTests package +cd "$VIBEMAKE_ROOT" +mvn -q -pl vibemake-import -am -DskipTests package exec java -Djava.awt.headless=true -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 \ -Dlogging.level.root=WARN -Dlogging.level.org.springframework.jdbc=INFO \ -Dlogging.level.org.apache.http=WARN -Ddebug=false \ - -jar community-import/target/community-import-0.0.1-SNAPSHOT.jar covers "$@" + -jar vibemake-import/target/vibemake-import-0.0.1-SNAPSHOT.jar covers "$@" diff --git a/scripts/run-admin-local.sh b/scripts/run-admin-local.sh index 0d61683..2b3bdff 100755 --- a/scripts/run-admin-local.sh +++ b/scripts/run-admin-local.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash set -euo pipefail -COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -if [[ -f "$COMMUNITY_ROOT/.env" ]]; then +VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then set -a - source "$COMMUNITY_ROOT/.env" + source "$VIBEMAKE_ROOT/.env" set +a fi export SERVER_PORT="${ADMIN_SERVER_PORT:-8994}" export SPRING_PROFILES_ACTIVE="${SPRING_PROFILES_ACTIVE:-test}" -cd "$COMMUNITY_ROOT" -mvn -q -pl community-adminapi -am -DskipTests package -exec java -Djava.awt.headless=true -jar community-adminapi/target/community-adminapi-0.0.1-SNAPSHOT.jar "$@" +cd "$VIBEMAKE_ROOT" +mvn -q -pl vibemake-adminapi -am -DskipTests package +exec java -Djava.awt.headless=true -jar vibemake-adminapi/target/vibemake-adminapi-0.0.1-SNAPSHOT.jar "$@" diff --git a/scripts/run-local.sh b/scripts/run-local.sh index e8a148d..a2a726d 100644 --- a/scripts/run-local.sh +++ b/scripts/run-local.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash set -euo pipefail -COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -if [[ -f "$COMMUNITY_ROOT/.env" ]]; then +VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then set -a - source "$COMMUNITY_ROOT/.env" + source "$VIBEMAKE_ROOT/.env" set +a fi export SPRING_PROFILES_ACTIVE="${SPRING_PROFILES_ACTIVE:-test}" -cd "$COMMUNITY_ROOT" +cd "$VIBEMAKE_ROOT" mvn -q -DskipTests package -exec java -Djava.awt.headless=true -jar community-api/target/community-api-0.0.1-SNAPSHOT.jar "$@" +exec java -Djava.awt.headless=true -jar vibemake-api/target/vibemake-api-0.0.1-SNAPSHOT.jar "$@" diff --git a/scripts/test-admin-mysql.sh b/scripts/test-admin-mysql.sh index f3208b4..6b2e283 100755 --- a/scripts/test-admin-mysql.sh +++ b/scripts/test-admin-mysql.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash set -euo pipefail -COMMUNITY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -if [[ -f "$COMMUNITY_ROOT/.env" ]]; then +VIBEMAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +if [[ -f "$VIBEMAKE_ROOT/.env" ]]; then set -a - source "$COMMUNITY_ROOT/.env" + source "$VIBEMAKE_ROOT/.env" set +a fi export ADMIN_MYSQL_TEST_URL="${ADMIN_MYSQL_TEST_URL:-${DB_URL:-}}" @@ -14,6 +14,6 @@ if [[ "$ADMIN_MYSQL_TEST_URL" != jdbc:mysql:* || -z "$ADMIN_MYSQL_TEST_USERNAME" exit 1 fi export AI_ENABLED=false OSS_ENABLED=false -cd "$COMMUNITY_ROOT" -# 只创建和删除随机 community_admin_verify_* 临时库,不修改已有数据库;账号需有创建临时库的权限。 -mvn -q -pl community-adminapi -am -Dtest=ProjectLocksMySqlTest -Dsurefire.failIfNoSpecifiedTests=false test +cd "$VIBEMAKE_ROOT" +# 只创建和删除随机 vibemake_admin_verify_* 临时库,不修改已有数据库;账号需有创建临时库的权限。 +mvn -q -pl vibemake-adminapi -am -Dtest=ProjectLocksMySqlTest -Dsurefire.failIfNoSpecifiedTests=false test diff --git a/scripts/test-ai.py b/scripts/test-ai.py index 9579eda..13f3e87 100644 --- a/scripts/test-ai.py +++ b/scripts/test-ai.py @@ -25,9 +25,9 @@ if not environment.get("ARK_API_KEY", "").strip(): endpoint = environment.get("ARK_ENDPOINT", "https://ark.cn-beijing.volces.com/api/v3/responses") if urlparse(endpoint).scheme != "https" or urlparse(endpoint).hostname != "ark.cn-beijing.volces.com": sys.exit("真实联调脚本仅允许北京区域官方方舟 HTTPS 地址,请核对 ARK_ENDPOINT。") -environment["COMMUNITY_ARK_LIVE_TEST"] = "true" +environment["VIBEMAKE_ARK_LIVE_TEST"] = "true" environment["AI_ENABLED"] = "true" sys.exit(subprocess.run([ - "mvn", "-q", "-pl", "community-api", "-am", "test", + "mvn", "-q", "-pl", "vibemake-api", "-am", "test", "-Dtest=AiSearchLiveTest", "-Dsurefire.failIfNoSpecifiedTests=false", ], cwd=root, env=environment).returncode) diff --git a/scripts/test-gitea.py b/scripts/test-gitea.py index dc24730..636b8f9 100644 --- a/scripts/test-gitea.py +++ b/scripts/test-gitea.py @@ -18,7 +18,7 @@ if config.exists(): environment[key] = parsed[0] if not environment.get("GITEA_TOKEN"): raise SystemExit("请先配置 GITEA_TOKEN 和 GITEA_ORGANIZATION") -environment["COMMUNITY_LIVE_GITEA"] = "true" +environment["VIBEMAKE_LIVE_GITEA"] = "true" # 本脚本只验证仓库协议;OSS/AI 有独立测试,避免本机其他服务配置阻止启动。 environment["AI_ENABLED"] = "false" environment["OSS_ENABLED"] = "false" diff --git a/scripts/test-redis.sh b/scripts/test-redis.sh new file mode 100755 index 0000000..ae7c923 --- /dev/null +++ b/scripts/test-redis.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")/.." +if [[ -z "${REDIS_TEST_HOST:-}" ]]; then + printf '%s\n' '请通过 REDIS_TEST_HOST/PORT/USERNAME/PASSWORD/DATABASE/SSL_ENABLED 配置独立测试 Redis,不自动加载 .env。' >&2 + exit 2 +fi +AI_ENABLED=false OSS_ENABLED=false mvn -B -pl vibemake-api -am \ + -Dtest=RedisLiveTest -Dsurefire.failIfNoSpecifiedTests=false test diff --git a/scripts/tests/test_gitea_org_migration.py b/scripts/tests/test_gitea_org_migration.py index 9eb2152..2447d13 100644 --- a/scripts/tests/test_gitea_org_migration.py +++ b/scripts/tests/test_gitea_org_migration.py @@ -27,7 +27,7 @@ FIRST = "p_aaaaaaaaaaaa" SECOND = "p_bbbbbbbbbbbb" -def repository(name, repo_id, owner="community", empty=False): +def repository(name, repo_id, owner="vibemake-test", empty=False): return {"id": repo_id, "name": name, "owner": {"login": owner}, "private": True, "mirror": False, "empty": empty, "default_branch": "main", "branches": {} if empty else {"main": SHA, "dev": OTHER_SHA}, @@ -39,7 +39,7 @@ class FakeApi(migration.ApiClient): def __init__(self, source=None): self.source = source - self.org = "vibemake" if source else "community" + self.org = "vibemake" if source else "vibemake-test" super().__init__("https://target.example" if source else "https://source.example", TARGET_TOKEN if source else SOURCE_TOKEN) self.repositories = {} if source else { @@ -130,7 +130,7 @@ class MigrationTest(unittest.TestCase): def run_migration(self, execute=False, limit=None, selected=None): output = io.StringIO() with self.store.locked(), redirect_stdout(output): - code = migration.migrate(self.source, self.target, "community", "vibemake", + code = migration.migrate(self.source, self.target, "vibemake-test", "vibemake", self.store, execute, selected or [], limit, 1800) self.assertNotIn(SOURCE_TOKEN, output.getvalue()) self.assertNotIn(TARGET_TOKEN, output.getvalue()) @@ -154,7 +154,7 @@ class MigrationTest(unittest.TestCase): self.assertEqual(self.mappings(), []) self.assertTrue(all(method == "GET" for method, _ in self.source.requests)) self.assertTrue(all(method == "GET" for method, _ in self.target.requests)) - self.assertIn(("GET", "/orgs/community/repos?page=3&limit=50"), self.source.requests) + self.assertIn(("GET", "/orgs/vibemake-test/repos?page=3&limit=50"), self.source.requests) def test_stale_empty_metadata_still_copies_and_verifies_real_git_references(self): self.source.repositories[FIRST]["empty"] = True @@ -171,7 +171,7 @@ class MigrationTest(unittest.TestCase): body = self.target.posts[0] self.assertEqual(body["repo_owner"], "vibemake") self.assertEqual(body["repo_name"], FIRST) - self.assertEqual(body["clone_addr"], "https://source.example/community/" + FIRST + ".git") + self.assertEqual(body["clone_addr"], "https://source.example/vibemake-test/" + FIRST + ".git") self.assertEqual(body["auth_username"], "service") self.assertEqual(body["auth_password"], SOURCE_TOKEN) self.assertTrue(body["lfs"]) @@ -179,7 +179,7 @@ class MigrationTest(unittest.TestCase): self.assertFalse(body["mirror"]) for option in ("issues", "labels", "milestones", "pull_requests", "releases", "wiki"): self.assertFalse(body[option]) - self.assertEqual(self.source.repositories[FIRST]["owner"]["login"], "community") + self.assertEqual(self.source.repositories[FIRST]["owner"]["login"], "vibemake-test") mapping = self.mappings()[0] self.assertEqual(mapping["source_repo_id"], 101) self.assertEqual(mapping["target_repo_id"], 1001) diff --git a/community-api/pom.xml b/vibemake-adminapi/pom.xml similarity index 74% rename from community-api/pom.xml rename to vibemake-adminapi/pom.xml index 6f96f6f..ca67639 100644 --- a/community-api/pom.xml +++ b/vibemake-adminapi/pom.xml @@ -3,14 +3,21 @@ 4.0.0 com.linkerbot - community + vibemake 0.0.1-SNAPSHOT - community-api + vibemake-adminapi com.linkerbot - community-security + vibemake-common + ${project.version} + test-jar + test + + + com.linkerbot + vibemake-security ${project.version} diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/AdminApplication.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/AdminApplication.java similarity index 71% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/AdminApplication.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/AdminApplication.java index 6c43ddf..b699cb1 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/AdminApplication.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/AdminApplication.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.adminapi; +package com.linkerbot.vibemake.adminapi; -import com.linkerbot.community.security.TokenService; +import com.linkerbot.vibemake.security.TokenService; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -10,13 +10,13 @@ import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling -@MapperScan("com.linkerbot.community.service.mapper") +@MapperScan("com.linkerbot.vibemake.service.mapper") @Import(TokenService.class) @SpringBootApplication( scanBasePackages = { - "com.linkerbot.community.adminapi", - "com.linkerbot.community.service", - "com.linkerbot.community.common" + "com.linkerbot.vibemake.adminapi", + "com.linkerbot.vibemake.service", + "com.linkerbot.vibemake.common" }, exclude = UserDetailsServiceAutoConfiguration.class) public class AdminApplication { diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminBootstrap.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminBootstrap.java similarity index 92% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminBootstrap.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminBootstrap.java index 516ec65..eafa8e5 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminBootstrap.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminBootstrap.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.adminapi.config; +package com.linkerbot.vibemake.adminapi.config; -import com.linkerbot.community.adminapi.security.AdminAuthService; +import com.linkerbot.vibemake.adminapi.security.AdminAuthService; import lombok.RequiredArgsConstructor; diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminOpenApiConfiguration.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminOpenApiConfiguration.java similarity index 86% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminOpenApiConfiguration.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminOpenApiConfiguration.java index de0794d..42c310e 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminOpenApiConfiguration.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminOpenApiConfiguration.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.adminapi.config; +package com.linkerbot.vibemake.adminapi.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -12,7 +12,7 @@ public class AdminOpenApiConfiguration { @Bean public OpenAPI adminOpenApi() { return new OpenAPI() - .info(new Info().title("Community 管理端接口").version("v1")) + .info(new Info().title("Vibemake 管理端接口").version("v1")) .components( new Components() .addSecuritySchemes( diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminSecurityConfiguration.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminSecurityConfiguration.java similarity index 86% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminSecurityConfiguration.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminSecurityConfiguration.java index 4a076c8..95ac944 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/AdminSecurityConfiguration.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/AdminSecurityConfiguration.java @@ -1,9 +1,10 @@ -package com.linkerbot.community.adminapi.config; +package com.linkerbot.vibemake.adminapi.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.adminapi.security.AdminTokenFilter; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.config.AdminProperties; +import com.linkerbot.vibemake.adminapi.security.AdminTokenFilter; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.config.AdminProperties; +import com.linkerbot.vibemake.service.state.HttpSafetyFilter; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.*; @@ -18,6 +19,15 @@ import java.util.List; @Configuration public class AdminSecurityConfiguration { + @Bean + public FilterRegistrationBean disableSafetyServletRegistration( + HttpSafetyFilter filter) { + FilterRegistrationBean registration = + new FilterRegistrationBean<>(filter); + registration.setEnabled(false); + return registration; + } + @Bean public FilterRegistrationBean disableAdminFilterRegistration( AdminTokenFilter filter) { @@ -32,13 +42,14 @@ public class AdminSecurityConfiguration { HttpSecurity http, AdminTokenFilter filter, ObjectMapper json, - AdminProperties properties) + AdminProperties properties, + HttpSafetyFilter safety) throws Exception { CorsConfiguration cors = new CorsConfiguration(); cors.setAllowedOrigins(properties.getAllowedOrigins()); cors.setAllowedMethods(List.of("GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); cors.setAllowedHeaders(List.of("Authorization", "Content-Type", "Accept")); - cors.setExposedHeaders(List.of("X-Request-Id", "Content-Disposition")); + cors.setExposedHeaders(List.of("X-Request-Id", "Content-Disposition", "Retry-After")); cors.setAllowCredentials(false); cors.setMaxAge(3600L); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); @@ -93,6 +104,7 @@ public class AdminSecurityConfiguration { "FORBIDDEN", "无后台访问权限"))); })) + .addFilterAfter(safety, org.springframework.web.filter.CorsFilter.class) .addFilterBefore(filter, UsernamePasswordAuthenticationFilter.class); return http.build(); } diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/ImportWorker.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/ImportWorker.java similarity index 94% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/ImportWorker.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/ImportWorker.java index f0beab0..591ce2b 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/ImportWorker.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/ImportWorker.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.adminapi.config; +package com.linkerbot.vibemake.adminapi.config; -import com.linkerbot.community.service.admin.AdminImportService; -import com.linkerbot.community.service.config.AdminProperties; +import com.linkerbot.vibemake.service.admin.AdminImportService; +import com.linkerbot.vibemake.service.config.AdminProperties; import jakarta.annotation.PreDestroy; diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/ProductionConfiguration.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/ProductionConfiguration.java similarity index 58% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/ProductionConfiguration.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/ProductionConfiguration.java index fb4ee03..7e2735b 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/config/ProductionConfiguration.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/config/ProductionConfiguration.java @@ -1,5 +1,6 @@ -package com.linkerbot.community.adminapi.config; +package com.linkerbot.vibemake.adminapi.config; +import org.springframework.boot.ApplicationArguments; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; @@ -9,14 +10,15 @@ import java.util.List; @Configuration(proxyBeanMethods = false) @Profile("prod") public class ProductionConfiguration { - public ProductionConfiguration(Environment environment) { + public ProductionConfiguration(Environment environment, ApplicationArguments arguments) { for (String property : List.of( "spring.datasource.url", "spring.datasource.username", "spring.datasource.password", - "community.gitea.base-url", - "community.gitea.token")) { + "vibemake.gitea.base-url", + "vibemake.gitea.token", + "vibemake.gitea.owner")) { String value; try { value = environment.getRequiredProperty(property); @@ -28,5 +30,12 @@ public class ProductionConfiguration { throw new IllegalStateException("生产环境必须配置 " + property); } } + if (!arguments.containsOption("bootstrap-admin-user-code")) { + for (String property : List.of("REDIS_HOST", "REDIS_PASSWORD")) { + String value = environment.getProperty(property); + if (value == null || value.isBlank()) + throw new IllegalStateException("生产环境必须配置 " + property); + } + } } } diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminAuthController.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminAuthController.java similarity index 77% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminAuthController.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminAuthController.java index 4a08c32..24e13cb 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminAuthController.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminAuthController.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.adminapi.controller; +package com.linkerbot.vibemake.adminapi.controller; -import com.linkerbot.community.adminapi.security.*; -import com.linkerbot.community.bean.AdminContracts.*; -import com.linkerbot.community.common.ApiResponse; +import com.linkerbot.vibemake.adminapi.security.*; +import com.linkerbot.vibemake.bean.AdminContracts.*; +import com.linkerbot.vibemake.common.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirements; @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/admin-api/auth") public class AdminAuthController { private final AdminAuthService auth; + private final com.linkerbot.vibemake.service.state.ClientAddresses addresses; @PostMapping("/login") @SecurityRequirements @@ -26,7 +27,7 @@ public class AdminAuthController { @Valid @RequestBody LoginInput input, HttpServletRequest request) { return ResponseEntity.ok() .cacheControl(CacheControl.noStore()) - .body(ApiResponse.success(auth.login(input, request.getRemoteAddr()))); + .body(ApiResponse.success(auth.login(input, addresses.resolve(request)))); } @GetMapping("/me") diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminImportController.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminImportController.java similarity index 86% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminImportController.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminImportController.java index 2128a22..ae9b852 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminImportController.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminImportController.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.adminapi.controller; +package com.linkerbot.vibemake.adminapi.controller; -import com.linkerbot.community.bean.AdminContracts.*; -import com.linkerbot.community.bean.Contracts.UrdfUploadSignature; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.admin.AdminImportService; +import com.linkerbot.vibemake.bean.AdminContracts.*; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadSignature; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.admin.AdminImportService; import jakarta.validation.Valid; diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminProjectController.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminProjectController.java similarity index 94% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminProjectController.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminProjectController.java index 6f75c95..0986787 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminProjectController.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminProjectController.java @@ -1,11 +1,11 @@ -package com.linkerbot.community.adminapi.controller; +package com.linkerbot.vibemake.adminapi.controller; -import com.linkerbot.community.bean.AdminContracts.*; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.*; -import com.linkerbot.community.service.admin.AdminManagementService; -import com.linkerbot.community.service.gitea.GiteaClient; +import com.linkerbot.vibemake.bean.AdminContracts.*; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.*; +import com.linkerbot.vibemake.service.admin.AdminManagementService; +import com.linkerbot.vibemake.service.gitea.GiteaClient; import jakarta.validation.Valid; diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminUploadController.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminUploadController.java similarity index 75% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminUploadController.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminUploadController.java index db75970..1fdb840 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminUploadController.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminUploadController.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.adminapi.controller; +package com.linkerbot.vibemake.adminapi.controller; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.common.ApiResponse; -import com.linkerbot.community.service.CoverUploadService; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.common.ApiResponse; +import com.linkerbot.vibemake.service.CoverUploadService; import jakarta.validation.Valid; diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminUserController.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminUserController.java similarity index 90% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminUserController.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminUserController.java index 33bceed..22eef71 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/controller/AdminUserController.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/controller/AdminUserController.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.adminapi.controller; +package com.linkerbot.vibemake.adminapi.controller; -import com.linkerbot.community.bean.AdminContracts.*; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.admin.AdminManagementService; +import com.linkerbot.vibemake.bean.AdminContracts.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.admin.AdminManagementService; import jakarta.validation.Valid; diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/AdminAuthService.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/AdminAuthService.java similarity index 81% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/AdminAuthService.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/AdminAuthService.java index 2adf465..bb3b64d 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/AdminAuthService.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/AdminAuthService.java @@ -1,16 +1,17 @@ -package com.linkerbot.community.adminapi.security; +package com.linkerbot.vibemake.adminapi.security; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.linkerbot.community.bean.AdminContracts.*; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.security.TokenService; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.mapper.UserMapper; -import com.linkerbot.community.service.support.ProjectSupport; +import com.linkerbot.vibemake.bean.AdminContracts.*; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.RateLimitedException; +import com.linkerbot.vibemake.common.SecurityHashes; +import com.linkerbot.vibemake.common.state.TransientStateStore; +import com.linkerbot.vibemake.security.TokenService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.mapper.UserMapper; +import com.linkerbot.vibemake.service.support.ProjectSupport; import lombok.RequiredArgsConstructor; @@ -29,14 +30,10 @@ public class AdminAuthService { private static final Logger log = LoggerFactory.getLogger(AdminAuthService.class); private final UserMapper users; private final TokenService tokens; - private final CommunityProperties properties; + private final VibemakeProperties properties; private final BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(12); private final String dummyHash = encoder.encode("invalid-admin-password"); - private final Cache failures = - Caffeine.newBuilder() - .maximumSize(10000) - .expireAfterWrite(Duration.ofMinutes(15)) - .build(); + private final TransientStateStore failures; public LoginView login(LoginInput input, String remoteAddress) { String email = input.email().trim().toLowerCase(Locale.ROOT); @@ -57,7 +54,7 @@ public class AdminAuthService { log.warn("后台登录失败 code=ADMIN_LOGIN_FAILED"); throw new BusinessException(401, "ADMIN_LOGIN_FAILED", "账号或密码错误"); } - failures.invalidate("account:" + email); + failures.remove(failureKey("account:" + email)); log.info("后台登录 userCode={}", user.getUserCode()); return new LoginView( tokens.issue(user.getId(), user.getSessionVersion()), @@ -67,13 +64,20 @@ public class AdminAuthService { } private void checkLimit(String key, int limit) { - Integer count = failures.getIfPresent(key); - if (count != null && count >= limit) - throw new BusinessException(429, "ADMIN_LOGIN_LIMITED", "尝试次数过多,请15分钟后重试"); + String stored = failures.get(failureKey(key)); + if (stored != null && Long.parseLong(stored) >= limit) + throw new RateLimitedException( + "ADMIN_LOGIN_LIMITED", + "尝试次数过多,请稍后重试", + failures.remainingSeconds(failureKey(key))); } private void failure(String key) { - failures.asMap().compute(key, (ignored, count) -> count == null ? 1 : count + 1); + failures.increment(failureKey(key), Duration.ofMinutes(15), true); + } + + private String failureKey(String key) { + return "admin-failure:" + SecurityHashes.sha256(key); } public User authenticate(String token) { diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/AdminTokenFilter.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/AdminTokenFilter.java similarity index 94% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/AdminTokenFilter.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/AdminTokenFilter.java index c672175..2f1b64f 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/AdminTokenFilter.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/AdminTokenFilter.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.adminapi.security; +package com.linkerbot.vibemake.adminapi.security; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.support.ProjectActors; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.support.ProjectActors; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/CurrentAdmin.java b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/CurrentAdmin.java similarity index 76% rename from community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/CurrentAdmin.java rename to vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/CurrentAdmin.java index be545ee..dbb81e6 100644 --- a/community-adminapi/src/main/java/com/linkerbot/community/adminapi/security/CurrentAdmin.java +++ b/vibemake-adminapi/src/main/java/com/linkerbot/vibemake/adminapi/security/CurrentAdmin.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.adminapi.security; +package com.linkerbot.vibemake.adminapi.security; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.BusinessException; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.BusinessException; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/vibemake-adminapi/src/main/resources/application-prod.yml b/vibemake-adminapi/src/main/resources/application-prod.yml new file mode 100644 index 0000000..1083e94 --- /dev/null +++ b/vibemake-adminapi/src/main/resources/application-prod.yml @@ -0,0 +1,39 @@ +spring: + data: + redis: + # bootstrap 命令不连接 Redis;正常 prod 启动由 ProductionConfiguration 要求显式配置。 + host: ${REDIS_HOST:localhost} + password: ${REDIS_PASSWORD:} + datasource: + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + pool-name: VibemakeAdminHikariCP + minimum-idle: 1 + maximum-pool-size: 20 + connection-timeout: 5000 + +vibemake: + redis: + key-prefix: ${REDIS_KEY_PREFIX:vibemake:prod} + cors: + allowed-origins: + - https://vibemake.robotquan.com + oss: + root-directory: vibemake + gitea: + base-url: ${GITEA_BASE_URL} + owner: ${GITEA_ORGANIZATION} + token: ${GITEA_TOKEN} + +logging: + level: + com.linkerbot.vibemake: INFO + +springdoc: + api-docs: + enabled: false + swagger-ui: + enabled: false diff --git a/community-adminapi/src/main/resources/application-test.yml b/vibemake-adminapi/src/main/resources/application-test.yml similarity index 63% rename from community-adminapi/src/main/resources/application-test.yml rename to vibemake-adminapi/src/main/resources/application-test.yml index c058fa8..0f0d33a 100644 --- a/community-adminapi/src/main/resources/application-test.yml +++ b/vibemake-adminapi/src/main/resources/application-test.yml @@ -1,16 +1,16 @@ spring: datasource: - url: ${DB_URL:jdbc:mysql://localhost:3306/community?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai} + url: ${DB_URL:jdbc:mysql://localhost:3306/vibemake?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai} username: ${DB_USERNAME:root} password: ${DB_PASSWORD:} driver-class-name: com.mysql.cj.jdbc.Driver hikari: - pool-name: CommunityAdminHikariCP + pool-name: VibemakeAdminHikariCP minimum-idle: 1 maximum-pool-size: 10 connection-timeout: 5000 -community: +vibemake: cors: allowed-origins: - https://dev-vibemake.robotquan.com @@ -18,9 +18,9 @@ community: root-directory: vibemake_dev gitea: base-url: ${GITEA_BASE_URL:http://localhost:3000} - owner: ${GITEA_ORGANIZATION:community} + owner: ${GITEA_ORGANIZATION:vibemake} token: ${GITEA_TOKEN:} logging: level: - com.linkerbot.community: DEBUG + com.linkerbot.vibemake: DEBUG diff --git a/community-adminapi/src/main/resources/application.yml b/vibemake-adminapi/src/main/resources/application.yml similarity index 60% rename from community-adminapi/src/main/resources/application.yml rename to vibemake-adminapi/src/main/resources/application.yml index a9b56f2..6128729 100644 --- a/community-adminapi/src/main/resources/application.yml +++ b/vibemake-adminapi/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: ${ADMIN_SERVER_PORT:8994} spring: application: - name: community-adminapi + name: vibemake-adminapi profiles: default: test sql: @@ -14,12 +14,49 @@ spring: max-request-size: 52MB jackson: time-zone: UTC + data: + redis: + host: ${REDIS_HOST:localhost} + port: ${REDIS_PORT:6379} + username: ${REDIS_USERNAME:} + password: ${REDIS_PASSWORD:} + database: ${REDIS_DATABASE:0} + connect-timeout: ${REDIS_CONNECT_TIMEOUT:2s} + timeout: ${REDIS_TIMEOUT:1s} + client-name: ${spring.application.name} + ssl: + enabled: ${REDIS_SSL_ENABLED:false} + repositories: + enabled: false main: banner-mode: off mybatis-plus: configuration: map-underscore-to-camel-case: true -community: +vibemake: + redis: + key-prefix: ${REDIS_KEY_PREFIX:vibemake:test} + application: admin + limits: + trusted-proxies: ${TRUSTED_PROXY_CIDRS:} + json-bytes: ${HTTP_JSON_MAX_BYTES:262144} + urdf-json-bytes: ${HTTP_URDF_JSON_MAX_BYTES:2097152} + commit-json-bytes: ${HTTP_COMMIT_JSON_MAX_BYTES:67108864} + file-concurrent: ${FILE_MAX_CONCURRENT:4} + per-minute: + captcha: ${RATE_CAPTCHA_PER_MINUTE:20} + login-ip: ${RATE_LOGIN_IP_PER_MINUTE:20} + login-account: ${RATE_LOGIN_ACCOUNT_PER_MINUTE:10} + admin-login: ${RATE_ADMIN_LOGIN_PER_MINUTE:30} + vibemake-read: ${RATE_VIBEMAKE_READ_PER_MINUTE:120} + file-read: ${RATE_FILE_READ_PER_MINUTE:60} + create: ${RATE_CREATE_PER_MINUTE:5} + fork: ${RATE_FORK_PER_MINUTE:10} + file-write: ${RATE_FILE_WRITE_PER_MINUTE:10} + cover-sign: ${RATE_COVER_SIGN_PER_MINUTE:30} + urdf-sign: ${RATE_URDF_SIGN_PER_MINUTE:20} + comment: ${RATE_COMMENT_PER_MINUTE:10} + like: ${RATE_LIKE_PER_MINUTE:60} admin: allowed-origins: ${ADMIN_ALLOWED_ORIGINS:} github-token: ${GITHUB_TOKEN:} @@ -39,7 +76,7 @@ community: max-total-bytes: ${URDF_MAX_TOTAL_BYTES:209715200} max-files: ${URDF_MAX_FILES:500} ai: - enabled: false + enabled: true api-key: ${ARK_API_KEY:} model: ${ARK_MODEL:doubao-seed-2-1-lite-260915} endpoint: ${ARK_ENDPOINT:https://ark.cn-beijing.volces.com/api/v3/responses} @@ -67,7 +104,7 @@ community: timeout: ${FORK_TIMEOUT:5m} max-concurrent: ${FORK_MAX_CONCURRENT:2} max-temporary-bytes: ${FORK_MAX_TEMPORARY_BYTES:5368709120} - temporary-directory: ${FORK_TEMPORARY_DIRECTORY:${java.io.tmpdir}/community-fork} + temporary-directory: ${FORK_TEMPORARY_DIRECTORY:${java.io.tmpdir}/vibemake-fork} springdoc: swagger-ui: path: /swagger-ui.html @@ -77,7 +114,7 @@ logging: level: root: INFO # 测试环境开启项目 DEBUG 时,仍不输出 SQL 参数或完整请求内容。 - com.linkerbot.community.service.mapper: INFO + com.linkerbot.vibemake.service.mapper: INFO org.springframework.web: INFO # 管理端有独立的跨域配置,不复用社区前端来源。 diff --git a/community-adminapi/src/test/java/com/linkerbot/community/adminapi/AdminWorkflowTest.java b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/AdminWorkflowTest.java similarity index 77% rename from community-adminapi/src/test/java/com/linkerbot/community/adminapi/AdminWorkflowTest.java rename to vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/AdminWorkflowTest.java index fae542a..98cb99a 100644 --- a/community-adminapi/src/test/java/com/linkerbot/community/adminapi/AdminWorkflowTest.java +++ b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/AdminWorkflowTest.java @@ -1,20 +1,20 @@ -package com.linkerbot.community.adminapi; +package com.linkerbot.vibemake.adminapi; import static org.assertj.core.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import com.fasterxml.jackson.databind.*; -import com.linkerbot.community.adminapi.security.AdminAuthService; -import com.linkerbot.community.bean.entity.*; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.security.TokenService; -import com.linkerbot.community.service.*; -import com.linkerbot.community.service.admin.AdminImportService; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.mapper.*; -import com.linkerbot.community.service.migration.GitHubSourceChecks; -import com.linkerbot.community.service.oss.OssObjectStore; -import com.linkerbot.community.service.support.*; +import com.linkerbot.vibemake.adminapi.security.AdminAuthService; +import com.linkerbot.vibemake.bean.entity.*; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.security.TokenService; +import com.linkerbot.vibemake.service.*; +import com.linkerbot.vibemake.service.admin.AdminImportService; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.mapper.*; +import com.linkerbot.vibemake.service.migration.GitHubSourceChecks; +import com.linkerbot.vibemake.service.oss.OssObjectStore; +import com.linkerbot.vibemake.service.support.*; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; @@ -38,8 +38,8 @@ import java.util.regex.*; "spring.datasource.username=sa", "spring.datasource.password=", "spring.datasource.driver-class-name=org.h2.Driver", - "community.admin.worker-enabled=false", - "community.oss.enabled=false", + "vibemake.admin.worker-enabled=false", + "vibemake.oss.enabled=false", "logging.level.root=WARN" }) @ActiveProfiles("test") @@ -89,6 +89,7 @@ class AdminWorkflowTest { @Autowired AdminAuthService auth; @Autowired AdminImportService imports; @Autowired TokenService tokens; + @Autowired com.linkerbot.vibemake.common.state.TransientStateStore securityState; @Autowired ObjectMapper json; @Autowired FakeGiteaClient gitea; @Autowired ProjectService projectService; @@ -197,9 +198,14 @@ class AdminWorkflowTest { private JsonNode importUrdfSignature() throws Exception { return request( - signed(body(post("/admin-api/project-imports/urdf/signature"), - Map.of("repositoryUrl", "https://github.com/example/robot", - "files", urdfFiles()))), + signed( + body( + post("/admin-api/project-imports/urdf/signature"), + Map.of( + "repositoryUrl", + "https://github.com/example/robot", + "files", + urdfFiles()))), 200) .path("data"); } @@ -216,8 +222,12 @@ class AdminWorkflowTest { return Map.of( "repositoryUrl", "https://github.com/example/robot", "project", metadata(), - "urdf", Map.of("batchCode", signature.path("batchCode").asText(), - "files", urdfFiles())); + "urdf", + Map.of( + "batchCode", + signature.path("batchCode").asText(), + "files", + urdfFiles())); } @Test @@ -226,19 +236,34 @@ class AdminWorkflowTest { JsonNode signature = importUrdfSignature(); assertThat(signature.path("mainRelativePath").asText()).isEqualTo("urdf/机械臂.URDF"); assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project", Long.class)).isZero(); - assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project_import_task", Long.class)).isZero(); + assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project_import_task", Long.class)) + .isZero(); storeUrdfFiles(signature); - String cover = request( - signed(body(post("/admin-api/uploads/project-covers/signature"), - Map.of("contentType", "image/png", "fileSize", 100))), 200) - .path("data").path("coverUrl").asText(); + String cover = + request( + signed( + body( + post("/admin-api/uploads/project-covers/signature"), + Map.of( + "contentType", + "image/png", + "fileSize", + 100))), + 200) + .path("data") + .path("coverUrl") + .asText(); Map project = new HashMap<>(metadata()); project.put("coverUrl", cover); Map input = new HashMap<>(importWithUrdf(signature)); input.put("project", project); - JsonNode task = request(signed(body(post("/admin-api/project-imports"), input)), 202).path("data"); + JsonNode task = + request(signed(body(post("/admin-api/project-imports"), input)), 202).path("data"); String code = task.path("projectCode").asText(); - JsonNode pending = request(signed(get("/admin-api/projects/" + code)), 200).path("data").path("project"); + JsonNode pending = + request(signed(get("/admin-api/projects/" + code)), 200) + .path("data") + .path("project"); assertThat(pending.path("repoStatus").asText()).isEqualTo("CREATING"); assertThat(pending.path("coverUrl").asText()).isEqualTo(cover); assertThat(pending.path("urdfMainUrl").asText()) @@ -246,7 +271,10 @@ class AdminWorkflowTest { .endsWith("urdf/%E6%9C%BA%E6%A2%B0%E8%87%82.URDF"); assertThat(pending.path("publishStatus").asText()).isEqualTo("UNPUBLISHED"); imports.run(task.path("taskCode").asText()); - JsonNode ready = request(signed(get("/admin-api/projects/" + code)), 200).path("data").path("project"); + JsonNode ready = + request(signed(get("/admin-api/projects/" + code)), 200) + .path("data") + .path("project"); assertThat(ready.path("repoStatus").asText()).isEqualTo("READY"); assertThat(ready.path("urdfMainUrl")).isEqualTo(pending.path("urdfMainUrl")); assertThat(ready.path("coverUrl").asText()).isEqualTo(cover); @@ -257,43 +285,89 @@ class AdminWorkflowTest { void migrationRejectsIncompleteOrMismatchedUrdfBeforeCreatingProjectAndTask() throws Exception { enableOss(); JsonNode signature = importUrdfSignature(); - JsonNode missing = request(signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), 400); + JsonNode missing = + request( + signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), + 400); assertThat(missing.path("code").asText()).isEqualTo("URDF_FILE_MISSING"); storeUrdfFiles(signature); String mainKey = signature.path("files").get(0).path("objectKey").asText(); ossObjects.objects.put(mainKey, new OssObjectStore.Metadata(13, "test-etag")); - JsonNode mismatch = request(signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), 400); + JsonNode mismatch = + request( + signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), + 400); assertThat(mismatch.path("code").asText()).isEqualTo("URDF_FILE_SIZE_MISMATCH"); assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project", Long.class)).isZero(); - assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project_import_task", Long.class)).isZero(); + assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project_import_task", Long.class)) + .isZero(); storeUrdfFiles(signature); SOURCES.incrementAndGet(); // 同一个批次不能被另一个 GitHub 仓库借用。 - JsonNode otherSource = request(signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), 400); + JsonNode otherSource = + request( + signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), + 400); assertThat(otherSource.path("code").asText()).isEqualTo("URDF_FILE_MISSING"); assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project", Long.class)).isZero(); } @Test void importUrdfRequiresAdminValidManifestAndNewSource() throws Exception { - Map input = Map.of("repositoryUrl", "https://github.com/example/robot", "files", urdfFiles()); + Map input = + Map.of("repositoryUrl", "https://github.com/example/robot", "files", urdfFiles()); request(body(post("/admin-api/project-imports/urdf/signature"), input), 401); String ordinaryToken = tokens.issue(ordinary.getId(), ordinary.getSessionVersion()); - request(body(post("/admin-api/project-imports/urdf/signature"), input) - .header("Authorization", "Bearer " + ordinaryToken), 403); + request( + body(post("/admin-api/project-imports/urdf/signature"), input) + .header("Authorization", "Bearer " + ordinaryToken), + 403); request(signed(body(post("/admin-api/project-imports/urdf/signature"), input)), 503); enableOss(); - request(signed(body(post("/admin-api/project-imports/urdf/signature"), - Map.of("repositoryUrl", "https://127.0.0.1/private", "files", urdfFiles()))), 400); - JsonNode invalid = request(signed(body(post("/admin-api/project-imports/urdf/signature"), - Map.of("repositoryUrl", "https://github.com/example/robot", - "files", List.of(Map.of("relativePath", "../robot.urdf", "sizeBytes", 12))))), 400); + request( + signed( + body( + post("/admin-api/project-imports/urdf/signature"), + Map.of( + "repositoryUrl", + "https://127.0.0.1/private", + "files", + urdfFiles()))), + 400); + JsonNode invalid = + request( + signed( + body( + post("/admin-api/project-imports/urdf/signature"), + Map.of( + "repositoryUrl", + "https://github.com/example/robot", + "files", + List.of( + Map.of( + "relativePath", + "../robot.urdf", + "sizeBytes", + 12))))), + 400); assertThat(invalid.path("code").asText()).isEqualTo("BAD_REQUEST"); - request(signed(body(post("/admin-api/project-imports"), - Map.of("repositoryUrl", "https://github.com/example/robot", "project", metadata(), - "urdf", Map.of("batchCode", "invalid", "files", urdfFiles())))), 400); + request( + signed( + body( + post("/admin-api/project-imports"), + Map.of( + "repositoryUrl", + "https://github.com/example/robot", + "project", + metadata(), + "urdf", + Map.of("batchCode", "invalid", "files", urdfFiles())))), + 400); JsonNode task = createImport(); - JsonNode duplicate = request(signed(body(post("/admin-api/project-imports/urdf/signature"), input)), 409); + JsonNode duplicate = + request( + signed(body(post("/admin-api/project-imports/urdf/signature"), input)), + 409); assertThat(duplicate.path("code").asText()).isEqualTo("DUPLICATE_SOURCE"); assertThat(duplicate.path("data").path("projectCode")).isEqualTo(task.path("projectCode")); } @@ -303,10 +377,13 @@ class AdminWorkflowTest { enableOss(); JsonNode signature = importUrdfSignature(); storeUrdfFiles(signature); - jdbc.execute("ALTER TABLE project_import_task ADD CONSTRAINT simulate_task_failure CHECK (status <> 'QUEUED')"); + jdbc.execute( + "ALTER TABLE project_import_task ADD CONSTRAINT simulate_task_failure CHECK (status" + + " <> 'QUEUED')"); request(signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), 500); assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project", Long.class)).isZero(); - assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project_import_task", Long.class)).isZero(); + assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project_import_task", Long.class)) + .isZero(); assertThat(gitea.migrations).isZero(); jdbc.execute("ALTER TABLE project_import_task DROP CONSTRAINT simulate_task_failure"); request(signed(body(post("/admin-api/project-imports"), importWithUrdf(signature))), 202); @@ -326,8 +403,11 @@ class AdminWorkflowTest { assertThat(me.has("id")).isFalse(); assertThat(me.has("passwordHash")).isFalse(); TokenService anotherProcess = - new TokenService(new com.linkerbot.community.service.config.CommunityProperties()); - assertThat(anotherProcess.resolve(token)).isNull(); + new TokenService( + new com.linkerbot.vibemake.service.config.VibemakeProperties(), + securityState, + new com.fasterxml.jackson.databind.ObjectMapper()); + assertThat(anotherProcess.resolve(token)).isEqualTo(admin.getId()); request(signed(post("/admin-api/auth/logout")), 200); request(signed(get("/admin-api/auth/me")), 401); } @@ -559,8 +639,12 @@ class AdminWorkflowTest { .asText()) .isEqualTo("REVIEW"); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 409); - assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200) - .path("data").path("canRetry").asBoolean()).isFalse(); + assertThat( + request(signed(get("/admin-api/project-imports/" + code)), 200) + .path("data") + .path("canRetry") + .asBoolean()) + .isFalse(); imports.run(code); assertThat(gitea.migrations).isEqualTo(1); assertThat(gitea.deletions).isZero(); @@ -575,29 +659,40 @@ class AdminWorkflowTest { Map project = new HashMap<>(metadata()); project.put("coverUrl", "https://images.example.com/cover.png"); input.put("project", project); - JsonNode initial = request(signed(body(post("/admin-api/project-imports"), input)), 202).path("data"); + JsonNode initial = + request(signed(body(post("/admin-api/project-imports"), input)), 202).path("data"); String taskCode = initial.path("taskCode").asText(); String projectCode = initial.path("projectCode").asText(); gitea.migrationRejected = true; imports.run(taskCode); - JsonNode failed = request(signed(get("/admin-api/project-imports/" + taskCode)), 200).path("data"); + JsonNode failed = + request(signed(get("/admin-api/project-imports/" + taskCode)), 200).path("data"); assertThat(failed.path("status").asText()).isEqualTo("FAILED"); assertThat(failed.path("errorCode").asText()).isEqualTo("GITEA_MIGRATION_REJECTED"); assertThat(failed.path("canRetry").asBoolean()).isTrue(); - JsonNode before = request(signed(get("/admin-api/projects/" + projectCode)), 200).path("data").path("project"); - JsonNode queued = request(signed(post("/admin-api/project-imports/" + taskCode + "/retry")), 202).path("data"); + JsonNode before = + request(signed(get("/admin-api/projects/" + projectCode)), 200) + .path("data") + .path("project"); + JsonNode queued = + request(signed(post("/admin-api/project-imports/" + taskCode + "/retry")), 202) + .path("data"); assertThat(queued.path("phase").asText()).isEqualTo("CLEANING"); assertThat(queued.path("canRetry").asBoolean()).isFalse(); request(signed(post("/admin-api/project-imports/" + taskCode + "/retry")), 409); assertThat(gitea.deletions).isZero(); // HTTP 接口只排队,由后台持锁清理。 gitea.migrationRejected = false; imports.run(taskCode); - JsonNode done = request(signed(get("/admin-api/project-imports/" + taskCode)), 200).path("data"); + JsonNode done = + request(signed(get("/admin-api/project-imports/" + taskCode)), 200).path("data"); assertThat(done.path("status").asText()).isEqualTo("SUCCEEDED"); assertThat(done.path("projectCode").asText()).isEqualTo(projectCode); assertThat(gitea.migrations).isEqualTo(2); assertThat(gitea.deletions).isEqualTo(1); - JsonNode after = request(signed(get("/admin-api/projects/" + projectCode)), 200).path("data").path("project"); + JsonNode after = + request(signed(get("/admin-api/projects/" + projectCode)), 200) + .path("data") + .path("project"); assertThat(after.path("coverUrl")).isEqualTo(before.path("coverUrl")); assertThat(after.path("urdfMainUrl")).isEqualTo(before.path("urdfMainUrl")); assertThat(after.path("publishStatus").asText()).isEqualTo("UNPUBLISHED"); @@ -609,13 +704,21 @@ class AdminWorkflowTest { void legacyRejectedMigrationWithNoRemoteRepositoryCanRetry() throws Exception { JsonNode task = createImport(); String code = task.path("taskCode").asText(); - jdbc.update("UPDATE project_import_task SET status='REVIEW',phase='MIGRATING'," - + "error_code='GITEA_MIGRATION_REJECTED' WHERE task_code=?", code); - jdbc.update("UPDATE project SET repo_write_status='REVIEW' WHERE project_code=?", task.path("projectCode").asText()); + jdbc.update( + "UPDATE project_import_task SET status='REVIEW',phase='MIGRATING'," + + "error_code='GITEA_MIGRATION_REJECTED' WHERE task_code=?", + code); + jdbc.update( + "UPDATE project SET repo_write_status='REVIEW' WHERE project_code=?", + task.path("projectCode").asText()); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200) - .path("data").path("status").asText()).isEqualTo("SUCCEEDED"); + assertThat( + request(signed(get("/admin-api/project-imports/" + code)), 200) + .path("data") + .path("status") + .asText()) + .isEqualTo("SUCCEEDED"); assertThat(gitea.deletions).isZero(); assertThat(gitea.migrations).isEqualTo(1); } @@ -630,7 +733,8 @@ class AdminWorkflowTest { gitea.migrationDescriptions.put(repoName, "manually-created repository"); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - JsonNode blocked = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); + JsonNode blocked = + request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); assertThat(blocked.path("status").asText()).isEqualTo("REVIEW"); assertThat(blocked.path("errorCode").asText()).isEqualTo("CLEANUP_REPOSITORY_UNSAFE"); assertThat(blocked.path("canRetry").asBoolean()).isTrue(); @@ -653,12 +757,16 @@ class AdminWorkflowTest { gitea.migrationRejected = true; imports.run(code); gitea.migrationRejected = false; - gitea.migrate("https://github.com/example/robot.git", name, java.time.Duration.ofSeconds(1), - "community-import:" + code); + gitea.migrate( + "https://github.com/example/robot.git", + name, + java.time.Duration.ofSeconds(1), + "vibemake-import:" + code); int before = gitea.migrations; request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - JsonNode blocked = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); + JsonNode blocked = + request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); assertThat(blocked.path("errorCode").asText()).isEqualTo("CLEANUP_REPOSITORY_REPLACED"); assertThat(blocked.path("canRetry").asBoolean()).isTrue(); assertThat(gitea.deletions).isZero(); @@ -675,16 +783,22 @@ class AdminWorkflowTest { gitea.migrationDescriptions.remove(repoName); // 旧任务的残留仓库没有任务标识。 request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200) - .path("data").path("errorCode").asText()).isEqualTo("CLEANUP_REPOSITORY_UNSAFE"); + assertThat( + request(signed(get("/admin-api/project-imports/" + code)), 200) + .path("data") + .path("errorCode") + .asText()) + .isEqualTo("CLEANUP_REPOSITORY_UNSAFE"); gitea.deleteRepository(gitea.inspect(repoName).repository()); // 模拟管理员手工删除。 - JsonNode refreshed = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); + JsonNode refreshed = + request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); assertThat(refreshed.path("canRetry").asBoolean()).isTrue(); assertThat(refreshed.path("status").asText()).isEqualTo("REVIEW"); gitea.migrationRejected = false; request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - JsonNode done = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); + JsonNode done = + request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); assertThat(done.path("status").asText()).isEqualTo("SUCCEEDED"); assertThat(done.path("projectCode")).isEqualTo(task.path("projectCode")); assertThat(gitea.deletions).isEqualTo(1); // 后台没有额外删除任何仓库。 @@ -699,17 +813,28 @@ class AdminWorkflowTest { gitea.migrationRejected = true; imports.run(code); gitea.migrationRejected = false; - gitea.migrate("https://github.com/example/robot.git", name, java.time.Duration.ofSeconds(1), - "community-import:" + code); + gitea.migrate( + "https://github.com/example/robot.git", + name, + java.time.Duration.ofSeconds(1), + "vibemake-import:" + code); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200) - .path("data").path("errorCode").asText()).isEqualTo("CLEANUP_REPOSITORY_REPLACED"); + assertThat( + request(signed(get("/admin-api/project-imports/" + code)), 200) + .path("data") + .path("errorCode") + .asText()) + .isEqualTo("CLEANUP_REPOSITORY_REPLACED"); gitea.deleteRepository(gitea.inspect(name).repository()); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200) - .path("data").path("status").asText()).isEqualTo("SUCCEEDED"); + assertThat( + request(signed(get("/admin-api/project-imports/" + code)), 200) + .path("data") + .path("status") + .asText()) + .isEqualTo("SUCCEEDED"); assertThat(gitea.deletions).isEqualTo(1); assertThat(gitea.migrations).isEqualTo(3); } @@ -724,15 +849,20 @@ class AdminWorkflowTest { gitea.timeoutNextDelete = true; request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - JsonNode unknown = request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); + JsonNode unknown = + request(signed(get("/admin-api/project-imports/" + code)), 200).path("data"); assertThat(unknown.path("status").asText()).isEqualTo("REVIEW"); assertThat(unknown.path("phase").asText()).isEqualTo("CLEANING"); assertThat(unknown.path("canRetry").asBoolean()).isTrue(); assertThat(gitea.migrations).isEqualTo(1); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200) - .path("data").path("status").asText()).isEqualTo("SUCCEEDED"); + assertThat( + request(signed(get("/admin-api/project-imports/" + code)), 200) + .path("data") + .path("status") + .asText()) + .isEqualTo("SUCCEEDED"); assertThat(gitea.deletions).isEqualTo(1); assertThat(gitea.migrations).isEqualTo(2); } @@ -744,20 +874,33 @@ class AdminWorkflowTest { gitea.migrationRejected = true; imports.run(code); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); - jdbc.execute("ALTER TABLE project_import_task ADD CONSTRAINT simulate_cleanup_failure CHECK (phase <> 'PRECHECK')"); + jdbc.execute( + "ALTER TABLE project_import_task ADD CONSTRAINT simulate_cleanup_failure CHECK" + + " (phase <> 'PRECHECK')"); gitea.migrationRejected = false; imports.run(code); assertThat(gitea.deletions).isEqualTo(1); assertThat(gitea.migrations).isEqualTo(1); - assertThat(jdbc.queryForObject("SELECT gitea_repo_id FROM project WHERE project_code=?", Long.class, - task.path("projectCode").asText())).isNotNull(); + assertThat( + jdbc.queryForObject( + "SELECT gitea_repo_id FROM project WHERE project_code=?", + Long.class, + task.path("projectCode").asText())) + .isNotNull(); jdbc.execute("ALTER TABLE project_import_task DROP CONSTRAINT simulate_cleanup_failure"); - jdbc.update("UPDATE project_import_task SET status='RUNNING',phase='CLEANING' WHERE task_code=?", code); + jdbc.update( + "UPDATE project_import_task SET status='RUNNING',phase='CLEANING' WHERE" + + " task_code=?", + code); imports.recover(); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); imports.run(code); - assertThat(request(signed(get("/admin-api/project-imports/" + code)), 200) - .path("data").path("status").asText()).isEqualTo("SUCCEEDED"); + assertThat( + request(signed(get("/admin-api/project-imports/" + code)), 200) + .path("data") + .path("status") + .asText()) + .isEqualTo("SUCCEEDED"); assertThat(gitea.deletions).isEqualTo(1); assertThat(gitea.migrations).isEqualTo(2); } @@ -776,11 +919,11 @@ class AdminWorkflowTest { Project>() .eq(Project::getProjectCode, task.path("projectCode").asText())); gitea.createBranch( - new com.linkerbot.community.service.gitea.GiteaClient.Repository( - 1, "community", project.getGiteaRepoName()), + new com.linkerbot.vibemake.service.gitea.GiteaClient.Repository( + 1, "vibemake", project.getGiteaRepoName()), "main", ""); - com.linkerbot.community.service.gitea.GiteaClient.RemoteRepository remote = + com.linkerbot.vibemake.service.gitea.GiteaClient.RemoteRepository remote = gitea.inspect(project.getGiteaRepoName()); gitea.defaultBranch(remote.repository(), "main"); request(signed(post("/admin-api/project-imports/" + code + "/retry")), 202); @@ -878,7 +1021,7 @@ class AdminWorkflowTest { JsonNode task = createImport(); String code = task.path("taskCode").asText(); String projectCode = task.path("projectCode").asText(); - com.linkerbot.community.service.gitea.GiteaClient.RemoteRepository receipt = + com.linkerbot.vibemake.service.gitea.GiteaClient.RemoteRepository receipt = gitea.migrate( "https://github.com/example/robot.git", "p_" + projectCode, diff --git a/community-adminapi/src/test/java/com/linkerbot/community/adminapi/FakeGiteaClient.java b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/FakeGiteaClient.java similarity index 97% rename from community-adminapi/src/test/java/com/linkerbot/community/adminapi/FakeGiteaClient.java rename to vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/FakeGiteaClient.java index 91b9b63..8bfd3f8 100644 --- a/community-adminapi/src/test/java/com/linkerbot/community/adminapi/FakeGiteaClient.java +++ b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/FakeGiteaClient.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.adminapi; +package com.linkerbot.vibemake.adminapi; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.common.PageResponse; -import com.linkerbot.community.service.gitea.*; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.common.PageResponse; +import com.linkerbot.vibemake.service.gitea.*; import java.security.MessageDigest; import java.util.*; @@ -82,7 +82,7 @@ final class FakeGiteaClient implements GiteaClient { throw new GiteaFailure(502, "GITEA_ERROR", "服务拒绝请求", false); } RepoData data = new RepoData(); - data.repository = new Repository(sequence.incrementAndGet(), "community", name); + data.repository = new Repository(sequence.incrementAndGet(), "vibemake", name); repositories.put(data.repository.id(), data); if (initialize) commit( @@ -194,7 +194,7 @@ final class FakeGiteaClient implements GiteaClient { Repository repository = createRepository(name, true); RemoteRepository remote = new RemoteRepository( - repository.id(), "community", name, true, false, false, source, "master"); + repository.id(), "vibemake", name, true, false, false, source, "master"); migrated.put(name, remote); migrationDescriptions.put(name, description); if (migrationTimeout) throw new GiteaFailure(504, "REMOTE_RESULT_UNKNOWN", "迁移结果不明", true); diff --git a/community-adminapi/src/test/java/com/linkerbot/community/adminapi/FakeOssObjectStore.java b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/FakeOssObjectStore.java similarity index 83% rename from community-adminapi/src/test/java/com/linkerbot/community/adminapi/FakeOssObjectStore.java rename to vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/FakeOssObjectStore.java index 7c1c044..e37cd88 100644 --- a/community-adminapi/src/test/java/com/linkerbot/community/adminapi/FakeOssObjectStore.java +++ b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/FakeOssObjectStore.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.adminapi; +package com.linkerbot.vibemake.adminapi; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.oss.OssObjectStore; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.oss.OssObjectStore; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/ProductionConfigurationTest.java b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/ProductionConfigurationTest.java new file mode 100644 index 0000000..7a1eac0 --- /dev/null +++ b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/ProductionConfigurationTest.java @@ -0,0 +1,52 @@ +package com.linkerbot.vibemake.adminapi; + +import static org.assertj.core.api.Assertions.*; + +import com.linkerbot.vibemake.adminapi.config.ProductionConfiguration; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.DefaultApplicationArguments; +import org.springframework.mock.env.MockEnvironment; + +class ProductionConfigurationTest { + private MockEnvironment configuredBusiness() { + return new MockEnvironment() + .withProperty("spring.datasource.url", "jdbc:mysql://localhost/test") + .withProperty("spring.datasource.username", "fixture") + .withProperty("spring.datasource.password", "do-not-log-this") + .withProperty("vibemake.gitea.base-url", "https://example.invalid") + .withProperty("vibemake.gitea.token", "do-not-log-this") + .withProperty("vibemake.gitea.owner", "fixture"); + } + + @Test + void bootstrapDoesNotRequireRedisConfiguration() { + assertThatCode( + () -> + new ProductionConfiguration( + configuredBusiness(), + new DefaultApplicationArguments( + "--bootstrap-admin-user-code=111111111111"))) + .doesNotThrowAnyException(); + } + + @Test + void normalProductionRequiresExplicitCredentialsWithoutLeakingValues() { + MockEnvironment environment = configuredBusiness(); + assertThatThrownBy( + () -> + new ProductionConfiguration( + environment, new DefaultApplicationArguments())) + .isInstanceOf(IllegalStateException.class) + .hasMessageContaining("REDIS_HOST") + .hasMessageNotContaining("do-not-log-this"); + environment + .withProperty("REDIS_HOST", "localhost") + .withProperty("REDIS_PASSWORD", "fixture"); + assertThatCode( + () -> + new ProductionConfiguration( + environment, new DefaultApplicationArguments())) + .doesNotThrowAnyException(); + } +} diff --git a/community-adminapi/src/test/java/com/linkerbot/community/adminapi/ProjectLocksMySqlTest.java b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/ProjectLocksMySqlTest.java similarity index 96% rename from community-adminapi/src/test/java/com/linkerbot/community/adminapi/ProjectLocksMySqlTest.java rename to vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/ProjectLocksMySqlTest.java index 16bae12..99667f1 100644 --- a/community-adminapi/src/test/java/com/linkerbot/community/adminapi/ProjectLocksMySqlTest.java +++ b/vibemake-adminapi/src/test/java/com/linkerbot/vibemake/adminapi/ProjectLocksMySqlTest.java @@ -1,11 +1,11 @@ -package com.linkerbot.community.adminapi; +package com.linkerbot.vibemake.adminapi; import static org.assertj.core.api.Assertions.*; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.mapper.ProjectMapper; -import com.linkerbot.community.service.support.ProjectLocks; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.mapper.ProjectMapper; +import com.linkerbot.vibemake.service.support.ProjectLocks; import com.zaxxer.hikari.*; import org.apache.ibatis.session.SqlSessionFactory; @@ -28,7 +28,7 @@ class ProjectLocksMySqlTest { String url = System.getenv("ADMIN_MYSQL_TEST_URL"); String username = System.getenv("ADMIN_MYSQL_TEST_USERNAME"); String password = System.getenv("ADMIN_MYSQL_TEST_PASSWORD"); - String database = "community_admin_verify_" + UUID.randomUUID().toString().replace("-", ""); + String database = "vibemake_admin_verify_" + UUID.randomUUID().toString().replace("-", ""); try (Connection bootstrap = DriverManager.getConnection(url, username, password == null ? "" : password)) { assertThat(bootstrap.getMetaData().getDatabaseProductName()).isEqualTo("MySQL"); @@ -66,7 +66,7 @@ class ProjectLocksMySqlTest { "INSERT INTO" + " project(project_code,owner_user_id,name,description,project_type,gitea_owner,gitea_repo_name,created_at,updated_at)" + " SELECT" - + " '222222222222',id,'verify','','GENERAL','community','p_222222222222',UTC_TIMESTAMP(3),UTC_TIMESTAMP(3)" + + " '222222222222',id,'verify','','GENERAL','vibemake','p_222222222222',UTC_TIMESTAMP(3),UTC_TIMESTAMP(3)" + " FROM sys_user WHERE user_code='111111111111'"); MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean(); factory.setDataSource(source); @@ -161,7 +161,7 @@ class ProjectLocksMySqlTest { "SELECT" + " IS_USED_LOCK(?)", Long.class, - "community:" + "vibemake:" + namespace + ":222222222222"); jdbc.execute( diff --git a/community-adminapi/pom.xml b/vibemake-api/pom.xml similarity index 74% rename from community-adminapi/pom.xml rename to vibemake-api/pom.xml index 41811a7..5089ea7 100644 --- a/community-adminapi/pom.xml +++ b/vibemake-api/pom.xml @@ -3,14 +3,21 @@ 4.0.0 com.linkerbot - community + vibemake 0.0.1-SNAPSHOT - community-adminapi + vibemake-api com.linkerbot - community-security + vibemake-common + ${project.version} + test-jar + test + + + com.linkerbot + vibemake-security ${project.version} diff --git a/community-api/src/main/java/com/linkerbot/community/api/CommunityApplication.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/VibemakeApplication.java similarity index 52% rename from community-api/src/main/java/com/linkerbot/community/api/CommunityApplication.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/VibemakeApplication.java index c59902a..17614ea 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/CommunityApplication.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/VibemakeApplication.java @@ -1,17 +1,17 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration; -@MapperScan("com.linkerbot.community.service.mapper") +@MapperScan("com.linkerbot.vibemake.service.mapper") @SpringBootApplication( - scanBasePackages = {"com.linkerbot.community.api", "com.linkerbot.community.service", - "com.linkerbot.community.common", "com.linkerbot.community.security"}, + scanBasePackages = {"com.linkerbot.vibemake.api", "com.linkerbot.vibemake.service", + "com.linkerbot.vibemake.common", "com.linkerbot.vibemake.security"}, exclude = UserDetailsServiceAutoConfiguration.class) -public class CommunityApplication { +public class VibemakeApplication { public static void main(String[] args) { - SpringApplication.run(CommunityApplication.class, args); + SpringApplication.run(VibemakeApplication.class, args); } } diff --git a/community-api/src/main/java/com/linkerbot/community/api/config/OpenApiConfiguration.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/config/OpenApiConfiguration.java similarity index 92% rename from community-api/src/main/java/com/linkerbot/community/api/config/OpenApiConfiguration.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/config/OpenApiConfiguration.java index 96b85c6..8d89183 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/config/OpenApiConfiguration.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/config/OpenApiConfiguration.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api.config; +package com.linkerbot.vibemake.api.config; import io.swagger.v3.oas.models.*; import io.swagger.v3.oas.models.info.Info; @@ -13,7 +13,7 @@ public class OpenApiConfiguration { return new OpenAPI() .info( new Info() - .title("Community 首期接口") + .title("Vibemake 首期接口") .version("v1") .description( "四表社区后端。登录仅邮箱和图片验证码,无法验证邮箱归属。Gitea" diff --git a/community-api/src/main/java/com/linkerbot/community/api/config/ProductionConfiguration.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/config/ProductionConfiguration.java similarity index 80% rename from community-api/src/main/java/com/linkerbot/community/api/config/ProductionConfiguration.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/config/ProductionConfiguration.java index 0f23c47..877b330 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/config/ProductionConfiguration.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/config/ProductionConfiguration.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api.config; +package com.linkerbot.vibemake.api.config; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -15,8 +15,11 @@ public class ProductionConfiguration { "spring.datasource.url", "spring.datasource.username", "spring.datasource.password", - "community.gitea.base-url", - "community.gitea.token")) { + "vibemake.gitea.base-url", + "vibemake.gitea.token", + "vibemake.gitea.owner", + "REDIS_HOST", + "REDIS_PASSWORD")) { String value; try { value = environment.getRequiredProperty(property); diff --git a/community-api/src/main/java/com/linkerbot/community/api/controller/AiSearchController.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/AiSearchController.java similarity index 83% rename from community-api/src/main/java/com/linkerbot/community/api/controller/AiSearchController.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/AiSearchController.java index 31eb1b1..e8d5438 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/controller/AiSearchController.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/AiSearchController.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.api.controller; +package com.linkerbot.vibemake.api.controller; -import com.linkerbot.community.bean.ai.AiContracts.ChatRequest; -import com.linkerbot.community.security.CurrentUser; -import com.linkerbot.community.service.AiSearchService; +import com.linkerbot.vibemake.bean.ai.AiContracts.ChatRequest; +import com.linkerbot.vibemake.security.CurrentUser; +import com.linkerbot.vibemake.service.AiSearchService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; diff --git a/community-api/src/main/java/com/linkerbot/community/api/controller/AuthController.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/AuthController.java similarity index 75% rename from community-api/src/main/java/com/linkerbot/community/api/controller/AuthController.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/AuthController.java index c921678..1f0c6dd 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/controller/AuthController.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/AuthController.java @@ -1,11 +1,12 @@ -package com.linkerbot.community.api.controller; +package com.linkerbot.vibemake.api.controller; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.ApiResponse; -import com.linkerbot.community.security.*; -import com.linkerbot.community.service.UserService; -import com.linkerbot.community.service.config.CommunityProperties; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.ApiResponse; +import com.linkerbot.vibemake.security.*; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.state.RateLimits; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirements; @@ -17,6 +18,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.Locale; + @RestController @RequiredArgsConstructor @Tag(name = "登录与用户") @@ -24,7 +27,8 @@ public class AuthController { private final CaptchaService captcha; private final TokenService tokens; private final UserService users; - private final CommunityProperties config; + private final VibemakeProperties config; + private final RateLimits limits; @GetMapping("/api/auth/captcha") @Operation(summary = "获取一次性图片验证码") @@ -37,6 +41,7 @@ public class AuthController { @Operation(summary = "邮箱和图片验证码登录,首次自动创建用户") @SecurityRequirements public ApiResponse login(@Valid @RequestBody LoginRequest input) { + limits.request("login-account", input.email().trim().toLowerCase(Locale.ROOT)); captcha.verify(input.captchaCode(), input.captchaAnswer()); User user = users.login(input.email()); return ApiResponse.success( diff --git a/community-api/src/main/java/com/linkerbot/community/api/controller/UploadController.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/UploadController.java similarity index 72% rename from community-api/src/main/java/com/linkerbot/community/api/controller/UploadController.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/UploadController.java index 53f8e28..6e6481b 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/controller/UploadController.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/UploadController.java @@ -1,10 +1,10 @@ -package com.linkerbot.community.api.controller; +package com.linkerbot.vibemake.api.controller; -import com.linkerbot.community.bean.Contracts.CoverUploadInput; -import com.linkerbot.community.bean.Contracts.CoverUploadSignature; -import com.linkerbot.community.common.ApiResponse; -import com.linkerbot.community.security.CurrentUser; -import com.linkerbot.community.service.CoverUploadService; +import com.linkerbot.vibemake.bean.Contracts.CoverUploadInput; +import com.linkerbot.vibemake.bean.Contracts.CoverUploadSignature; +import com.linkerbot.vibemake.common.ApiResponse; +import com.linkerbot.vibemake.security.CurrentUser; +import com.linkerbot.vibemake.service.CoverUploadService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/community-api/src/main/java/com/linkerbot/community/api/controller/UrdfController.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/UrdfController.java similarity index 81% rename from community-api/src/main/java/com/linkerbot/community/api/controller/UrdfController.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/UrdfController.java index d2c2704..304e59c 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/controller/UrdfController.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/UrdfController.java @@ -1,12 +1,12 @@ -package com.linkerbot.community.api.controller; +package com.linkerbot.vibemake.api.controller; -import com.linkerbot.community.bean.Contracts.ProjectView; -import com.linkerbot.community.bean.Contracts.UrdfConfirmInput; -import com.linkerbot.community.bean.Contracts.UrdfUploadInput; -import com.linkerbot.community.bean.Contracts.UrdfUploadSignature; -import com.linkerbot.community.common.ApiResponse; -import com.linkerbot.community.security.CurrentUser; -import com.linkerbot.community.service.UrdfService; +import com.linkerbot.vibemake.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.Contracts.UrdfConfirmInput; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadInput; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadSignature; +import com.linkerbot.vibemake.common.ApiResponse; +import com.linkerbot.vibemake.security.CurrentUser; +import com.linkerbot.vibemake.service.UrdfService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/community-api/src/main/java/com/linkerbot/community/api/controller/CommunityController.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/VibemakeController.java similarity index 90% rename from community-api/src/main/java/com/linkerbot/community/api/controller/CommunityController.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/VibemakeController.java index 17d0f28..718061b 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/controller/CommunityController.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/VibemakeController.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.api.controller; +package com.linkerbot.vibemake.api.controller; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.common.*; -import com.linkerbot.community.security.CurrentUser; -import com.linkerbot.community.service.*; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.security.CurrentUser; +import com.linkerbot.vibemake.service.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirements; @@ -21,7 +21,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @Tag(name = "社区") -public class CommunityController { +public class VibemakeController { private final ProjectService projects; private final FileService files; private final InteractionService interactions; @@ -61,7 +61,7 @@ public class CommunityController { @RequestParam(defaultValue = "") String path, @RequestParam(required = false) String commitSha) { rejectRef(commitSha); - return ApiResponse.success(files.communityTree(projectCode, path)); + return ApiResponse.success(files.vibemakeTree(projectCode, path)); } @GetMapping("/api/community/projects/{projectCode}/files") @@ -74,9 +74,9 @@ public class CommunityController { @RequestParam(required = false) String commitSha) { rejectRef(commitSha); return download - ? WorkspaceController.download(files.communityFile(projectCode, path)) + ? WorkspaceController.download(files.vibemakeFile(projectCode, path)) : ResponseEntity.ok( - ApiResponse.success(files.communityFileView(projectCode, path))); + ApiResponse.success(files.vibemakeFileView(projectCode, path))); } private void rejectRef(String sha) { diff --git a/community-api/src/main/java/com/linkerbot/community/api/controller/WorkspaceController.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/WorkspaceController.java similarity index 95% rename from community-api/src/main/java/com/linkerbot/community/api/controller/WorkspaceController.java rename to vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/WorkspaceController.java index 908020b..7c1d0a3 100644 --- a/community-api/src/main/java/com/linkerbot/community/api/controller/WorkspaceController.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/WorkspaceController.java @@ -1,10 +1,10 @@ -package com.linkerbot.community.api.controller; +package com.linkerbot.vibemake.api.controller; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.common.*; -import com.linkerbot.community.security.CurrentUser; -import com.linkerbot.community.service.*; -import com.linkerbot.community.service.gitea.GiteaClient; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.security.CurrentUser; +import com.linkerbot.vibemake.service.*; +import com.linkerbot.vibemake.service.gitea.GiteaClient; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/community-api/src/main/resources/application-prod.yml b/vibemake-api/src/main/resources/application-prod.yml similarity index 57% rename from community-api/src/main/resources/application-prod.yml rename to vibemake-api/src/main/resources/application-prod.yml index b402050..3029026 100644 --- a/community-api/src/main/resources/application-prod.yml +++ b/vibemake-api/src/main/resources/application-prod.yml @@ -1,16 +1,22 @@ spring: + data: + redis: + host: ${REDIS_HOST} + password: ${REDIS_PASSWORD} datasource: url: ${DB_URL} username: ${DB_USERNAME} password: ${DB_PASSWORD} driver-class-name: com.mysql.cj.jdbc.Driver hikari: - pool-name: CommunityHikariCP + pool-name: VibemakeHikariCP minimum-idle: 1 maximum-pool-size: 20 connection-timeout: 5000 -community: +vibemake: + redis: + key-prefix: ${REDIS_KEY_PREFIX:vibemake:prod} cors: allowed-origins: - https://vibemake.robotquan.com @@ -18,9 +24,15 @@ community: root-directory: vibemake gitea: base-url: ${GITEA_BASE_URL} - owner: ${GITEA_ORGANIZATION:community} + owner: ${GITEA_ORGANIZATION} token: ${GITEA_TOKEN} logging: level: - com.linkerbot.community: INFO + com.linkerbot.vibemake: INFO + +springdoc: + api-docs: + enabled: false + swagger-ui: + enabled: false diff --git a/community-api/src/main/resources/application-test.yml b/vibemake-api/src/main/resources/application-test.yml similarity index 70% rename from community-api/src/main/resources/application-test.yml rename to vibemake-api/src/main/resources/application-test.yml index a47ea18..b9c318a 100644 --- a/community-api/src/main/resources/application-test.yml +++ b/vibemake-api/src/main/resources/application-test.yml @@ -1,16 +1,16 @@ spring: datasource: - url: ${DB_URL:jdbc:mysql://localhost:3306/community?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai} + url: ${DB_URL:jdbc:mysql://localhost:3306/vibemake?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai} username: ${DB_USERNAME:root} password: ${DB_PASSWORD:} driver-class-name: com.mysql.cj.jdbc.Driver hikari: - pool-name: CommunityHikariCP + pool-name: VibemakeHikariCP minimum-idle: 1 maximum-pool-size: 10 connection-timeout: 5000 -community: +vibemake: cors: allowed-origins: - https://dev-vibemake.robotquan.com @@ -23,4 +23,4 @@ community: logging: level: - com.linkerbot.community: DEBUG + com.linkerbot.vibemake: DEBUG diff --git a/community-api/src/main/resources/application.yml b/vibemake-api/src/main/resources/application.yml similarity index 57% rename from community-api/src/main/resources/application.yml rename to vibemake-api/src/main/resources/application.yml index b650a8d..c958f82 100644 --- a/community-api/src/main/resources/application.yml +++ b/vibemake-api/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: ${SERVER_PORT:${PORT:8993}} spring: application: - name: community-api + name: vibemake-api profiles: default: test sql: @@ -14,12 +14,49 @@ spring: max-request-size: 52MB jackson: time-zone: UTC + data: + redis: + host: ${REDIS_HOST:localhost} + port: ${REDIS_PORT:6379} + username: ${REDIS_USERNAME:} + password: ${REDIS_PASSWORD:} + database: ${REDIS_DATABASE:0} + connect-timeout: ${REDIS_CONNECT_TIMEOUT:2s} + timeout: ${REDIS_TIMEOUT:1s} + client-name: ${spring.application.name} + ssl: + enabled: ${REDIS_SSL_ENABLED:false} + repositories: + enabled: false main: banner-mode: off mybatis-plus: configuration: map-underscore-to-camel-case: true -community: +vibemake: + redis: + key-prefix: ${REDIS_KEY_PREFIX:vibemake:test} + application: api + limits: + trusted-proxies: ${TRUSTED_PROXY_CIDRS:} + json-bytes: ${HTTP_JSON_MAX_BYTES:262144} + urdf-json-bytes: ${HTTP_URDF_JSON_MAX_BYTES:2097152} + commit-json-bytes: ${HTTP_COMMIT_JSON_MAX_BYTES:67108864} + file-concurrent: ${FILE_MAX_CONCURRENT:4} + per-minute: + captcha: ${RATE_CAPTCHA_PER_MINUTE:20} + login-ip: ${RATE_LOGIN_IP_PER_MINUTE:20} + login-account: ${RATE_LOGIN_ACCOUNT_PER_MINUTE:10} + admin-login: ${RATE_ADMIN_LOGIN_PER_MINUTE:30} + vibemake-read: ${RATE_VIBEMAKE_READ_PER_MINUTE:120} + file-read: ${RATE_FILE_READ_PER_MINUTE:60} + create: ${RATE_CREATE_PER_MINUTE:5} + fork: ${RATE_FORK_PER_MINUTE:10} + file-write: ${RATE_FILE_WRITE_PER_MINUTE:10} + cover-sign: ${RATE_COVER_SIGN_PER_MINUTE:30} + urdf-sign: ${RATE_URDF_SIGN_PER_MINUTE:20} + comment: ${RATE_COMMENT_PER_MINUTE:10} + like: ${RATE_LIKE_PER_MINUTE:60} oss: enabled: ${OSS_ENABLED:true} region: ${OSS_REGION:cn-beijing} @@ -61,7 +98,7 @@ community: timeout: ${FORK_TIMEOUT:5m} max-concurrent: ${FORK_MAX_CONCURRENT:2} max-temporary-bytes: ${FORK_MAX_TEMPORARY_BYTES:5368709120} - temporary-directory: ${FORK_TEMPORARY_DIRECTORY:${java.io.tmpdir}/community-fork} + temporary-directory: ${FORK_TEMPORARY_DIRECTORY:${java.io.tmpdir}/vibemake-fork} springdoc: swagger-ui: path: /swagger-ui.html @@ -71,5 +108,5 @@ logging: level: root: INFO # 测试环境开启项目 DEBUG 时,仍不输出 SQL 参数或完整请求内容。 - com.linkerbot.community.service.mapper: INFO + com.linkerbot.vibemake.service.mapper: INFO org.springframework.web: INFO diff --git a/community-api/src/test/java/com/linkerbot/community/api/AiSearchLiveTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/AiSearchLiveTest.java similarity index 92% rename from community-api/src/test/java/com/linkerbot/community/api/AiSearchLiveTest.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/AiSearchLiveTest.java index fbcd408..b02aa5e 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/AiSearchLiveTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/AiSearchLiveTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import static org.assertj.core.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; @@ -6,12 +6,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.Codes; -import com.linkerbot.community.security.TokenService; -import com.linkerbot.community.service.UserService; -import com.linkerbot.community.service.mapper.ProjectMapper; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.Codes; +import com.linkerbot.vibemake.security.TokenService; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.mapper.ProjectMapper; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.util.*; @@ -27,13 +27,13 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.*; /** 显式启用后只向方舟发送公开示例资料,不访问真实数据库和 Gitea。 */ -@EnabledIfEnvironmentVariable(named = "COMMUNITY_ARK_LIVE_TEST", matches = "true") +@EnabledIfEnvironmentVariable(named = "VIBEMAKE_ARK_LIVE_TEST", matches = "true") @SpringBootTest(properties = { "spring.datasource.url=jdbc:h2:mem:ai-live;MODE=MySQL;DB_CLOSE_DELAY=-1", "spring.datasource.username=sa", "spring.datasource.password=", - "spring.datasource.driver-class-name=org.h2.Driver", "community.ai.enabled=true", - "community.ai.requests-per-minute=120", "community.oss.enabled=false", - "logging.level.root=INFO", "logging.level.com.linkerbot.community=INFO", "debug=false" + "spring.datasource.driver-class-name=org.h2.Driver", "vibemake.ai.enabled=true", + "vibemake.ai.requests-per-minute=120", "vibemake.oss.enabled=false", + "logging.level.root=INFO", "logging.level.com.linkerbot.vibemake=INFO", "debug=false" }) @ActiveProfiles("test") @AutoConfigureMockMvc(print = MockMvcPrint.NONE) diff --git a/community-api/src/test/java/com/linkerbot/community/api/AiSearchTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/AiSearchTest.java similarity index 97% rename from community-api/src/test/java/com/linkerbot/community/api/AiSearchTest.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/AiSearchTest.java index f47f8c7..268d5ca 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/AiSearchTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/AiSearchTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import static org.assertj.core.api.Assertions.*; import static org.awaitility.Awaitility.await; @@ -8,24 +8,24 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.linkerbot.community.bean.Contracts.ProjectInput; -import com.linkerbot.community.bean.Contracts.ProjectView; -import com.linkerbot.community.bean.ai.AiContracts.ChatRequest; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.common.Codes; -import com.linkerbot.community.common.ProjectCodes; -import com.linkerbot.community.security.TokenService; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.ai.AiModelClient; -import com.linkerbot.community.service.ai.AiProjectAssistant; -import com.linkerbot.community.service.config.AiProperties; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.config.ForkProperties; -import com.linkerbot.community.service.gitea.GiteaClient.Change; -import com.linkerbot.community.service.mapper.ProjectMapper; -import com.linkerbot.community.service.mapper.UserMapper; +import com.linkerbot.vibemake.bean.Contracts.ProjectInput; +import com.linkerbot.vibemake.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.ai.AiContracts.ChatRequest; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.Codes; +import com.linkerbot.vibemake.common.ProjectCodes; +import com.linkerbot.vibemake.security.TokenService; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.ai.AiModelClient; +import com.linkerbot.vibemake.service.ai.AiProjectAssistant; +import com.linkerbot.vibemake.service.config.AiProperties; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.config.ForkProperties; +import com.linkerbot.vibemake.service.gitea.GiteaClient.Change; +import com.linkerbot.vibemake.service.mapper.ProjectMapper; +import com.linkerbot.vibemake.service.mapper.UserMapper; import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncListener; import java.io.IOException; @@ -52,9 +52,9 @@ import org.springframework.test.web.servlet.*; "spring.datasource.url=jdbc:h2:mem:ai;MODE=MySQL;DB_CLOSE_DELAY=-1", "spring.datasource.username=sa", "spring.datasource.password=", "spring.datasource.driver-class-name=org.h2.Driver", - "community.ai.enabled=true", "community.ai.api-key=local-test-placeholder", - "community.ai.max-concurrent=2", "community.ai.search-timeout=4s", - "community.ai.heartbeat-interval=100ms", "logging.level.org.springframework=WARN", + "vibemake.ai.enabled=true", "vibemake.ai.api-key=local-test-placeholder", + "vibemake.ai.max-concurrent=2", "vibemake.ai.search-timeout=4s", + "vibemake.ai.heartbeat-interval=100ms", "logging.level.org.springframework=WARN", "logging.level.root=INFO", "debug=false" }) @ActiveProfiles("test") @@ -126,7 +126,7 @@ class AiSearchTest { project.setName(name); project.setDescription(description); project.setProjectType(type); - project.setGiteaOwner("community"); + project.setGiteaOwner("vibemake"); project.setGiteaRepoName("p_" + project.getProjectCode()); project.setRepoStatus("READY"); project.setPublishStatus("PUBLISHED"); diff --git a/community-api/src/test/java/com/linkerbot/community/api/CorsProfileTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CorsProfileTest.java similarity index 90% rename from community-api/src/test/java/com/linkerbot/community/api/CorsProfileTest.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/CorsProfileTest.java index 28580bb..ac0c9b2 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/CorsProfileTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CorsProfileTest.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import static org.assertj.core.api.Assertions.assertThat; -import com.linkerbot.community.security.CorsProperties; -import com.linkerbot.community.security.SecurityConfiguration; +import com.linkerbot.vibemake.security.CorsProperties; +import com.linkerbot.vibemake.security.SecurityConfiguration; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; @@ -32,7 +32,7 @@ class CorsProfileTest { environment.getPropertySources().addFirst(source); } CorsProperties properties = Binder.get(environment) - .bind("community.cors", Bindable.of(CorsProperties.class)).get(); + .bind("vibemake.cors", Bindable.of(CorsProperties.class)).get(); assertThat(properties.getAllowedOrigins()).containsExactly(allowedOrigin); UrlBasedCorsConfigurationSource source = diff --git a/community-api/src/test/java/com/linkerbot/community/api/CorsTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CorsTest.java similarity index 98% rename from community-api/src/test/java/com/linkerbot/community/api/CorsTest.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/CorsTest.java index 3944dfd..0171c82 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/CorsTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CorsTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; @@ -22,8 +22,8 @@ import org.springframework.test.web.servlet.MockMvc; "spring.datasource.username=sa", "spring.datasource.password=", "spring.datasource.driver-class-name=org.h2.Driver", - "community.ai.enabled=false", - "community.oss.enabled=false", + "vibemake.ai.enabled=false", + "vibemake.oss.enabled=false", "logging.level.org.springframework=WARN" }) @ActiveProfiles("test") diff --git a/community-api/src/test/java/com/linkerbot/community/api/FakeGitSnapshotCopier.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeGitSnapshotCopier.java similarity index 80% rename from community-api/src/test/java/com/linkerbot/community/api/FakeGitSnapshotCopier.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeGitSnapshotCopier.java index 14f0263..4c6bcd3 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/FakeGitSnapshotCopier.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeGitSnapshotCopier.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.fork.ForkDeadline; -import com.linkerbot.community.service.fork.GitSnapshotCopier; -import com.linkerbot.community.service.gitea.GiteaClient; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.fork.ForkDeadline; +import com.linkerbot.vibemake.service.fork.GitSnapshotCopier; +import com.linkerbot.vibemake.service.gitea.GiteaClient; import java.util.List; import java.util.Map; @@ -29,7 +29,7 @@ final class FakeGitSnapshotCopier implements GitSnapshotCopier { deadline.beginWrite(); List changes = files.entrySet().stream() .map(file -> new GiteaClient.Change("create", file.getKey(), null, file.getValue())).toList(); - String commit = gitea.commit(target, changes, "Fork community snapshot", authorName, authorCode).commitSha(); + String commit = gitea.commit(target, changes, "Fork vibemake snapshot", authorName, authorCode).commitSha(); deadline.confirmWrite(); return commit; } diff --git a/community-api/src/test/java/com/linkerbot/community/api/FakeGiteaClient.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeGiteaClient.java similarity index 96% rename from community-api/src/test/java/com/linkerbot/community/api/FakeGiteaClient.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeGiteaClient.java index d16bbb6..fad70d7 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/FakeGiteaClient.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeGiteaClient.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.common.PageResponse; -import com.linkerbot.community.service.gitea.*; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.common.PageResponse; +import com.linkerbot.vibemake.service.gitea.*; import java.security.MessageDigest; import java.util.*; @@ -61,7 +61,7 @@ final class FakeGiteaClient implements GiteaClient { throw new GiteaFailure(502, "GITEA_ERROR", "服务拒绝请求", false); } RepoData data = new RepoData(); - data.repository = new Repository(sequence.incrementAndGet(), "community", name); + data.repository = new Repository(sequence.incrementAndGet(), "vibemake", name); repositories.put(data.repository.id(), data); if (initialize) commit( diff --git a/community-api/src/test/java/com/linkerbot/community/api/FakeOssObjectStore.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeOssObjectStore.java similarity index 90% rename from community-api/src/test/java/com/linkerbot/community/api/FakeOssObjectStore.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeOssObjectStore.java index b2bb739..65bb6f3 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/FakeOssObjectStore.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/FakeOssObjectStore.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.oss.OssObjectStore; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.oss.OssObjectStore; import java.util.Arrays; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/community-api/src/test/java/com/linkerbot/community/api/GiteaLiveTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/GiteaLiveTest.java similarity index 60% rename from community-api/src/test/java/com/linkerbot/community/api/GiteaLiveTest.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/GiteaLiveTest.java index 353ca49..83147f5 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/GiteaLiveTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/GiteaLiveTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import static org.assertj.core.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; @@ -6,11 +6,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.security.CaptchaService; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.fork.ForkDeadline; -import com.linkerbot.community.service.fork.GitCommandRunner; -import com.linkerbot.community.service.gitea.GiteaClient; +import com.linkerbot.vibemake.security.CaptchaService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.fork.ForkDeadline; +import com.linkerbot.vibemake.service.fork.GitCommandRunner; +import com.linkerbot.vibemake.service.gitea.GiteaClient; import org.junit.jupiter.api.*; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @@ -29,11 +29,11 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde import java.net.URI; import java.net.http.*; -import java.time.Duration; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.security.MessageDigest; +import java.time.Duration; import java.util.*; @SpringBootTest( @@ -42,22 +42,24 @@ import java.util.*; "spring.datasource.username=sa", "spring.datasource.password=", "spring.datasource.driver-class-name=org.h2.Driver", - "community.ai.enabled=false", - "community.oss.enabled=false", + "vibemake.ai.enabled=false", + "vibemake.oss.enabled=false", "logging.level.root=INFO", "logging.level.org.springframework=WARN" }) @ActiveProfiles("test") @AutoConfigureMockMvc(print = MockMvcPrint.NONE) @Import(GiteaLiveTest.Config.class) -@EnabledIfEnvironmentVariable(named = "COMMUNITY_LIVE_GITEA", matches = "true") +@EnabledIfEnvironmentVariable(named = "VIBEMAKE_LIVE_GITEA", matches = "true") class GiteaLiveTest { @TestConfiguration static class Config { @Bean @Primary - CaptchaService liveCaptcha(CommunityProperties properties) { - return new CaptchaService(properties) { + CaptchaService liveCaptcha( + VibemakeProperties properties, + com.linkerbot.vibemake.common.state.TransientStateStore state) { + return new CaptchaService(properties, state) { @Override protected String generateAnswer() { return "ABCDE"; @@ -69,7 +71,7 @@ class GiteaLiveTest { @Autowired MockMvc mvc; @Autowired ObjectMapper json; @Autowired JdbcTemplate jdbc; - @Autowired CommunityProperties config; + @Autowired VibemakeProperties config; @Autowired GitCommandRunner nativeGit; @Autowired GiteaClient remote; @TempDir Path gitFixtures; @@ -142,17 +144,36 @@ class GiteaLiveTest { } @Test - void realSnapshotForkPreservesLargeCadGitlinksSymlinksAndLfsWithoutUnpublishedHistory() throws Exception { + void realSnapshotForkPreservesLargeCadGitlinksSymlinksAndLfsWithoutUnpublishedHistory() + throws Exception { String owner = login("live-snapshot-owner@example.invalid"); String other = login("live-snapshot-fork@example.invalid"); - String source = perform(body(auth(post("/api/workspace/projects"), owner), - Map.of("name", "HyperDog OpenFish 类型快照联调", "projectType", "GENERAL")), 200).path("projectCode").asText(); - String original = perform(auth(get("/api/workspace/projects/" + source + "/tree"), owner), 200).path("commitSha").asText(); + String source = + perform( + body( + auth(post("/api/workspace/projects"), owner), + Map.of( + "name", + "HyperDog OpenFish 类型快照联调", + "projectType", + "GENERAL")), + 200) + .path("projectCode") + .asText(); + String original = + perform(auth(get("/api/workspace/projects/" + source + "/tree"), owner), 200) + .path("commitSha") + .asText(); Path staging = Files.createDirectory(gitFixtures.resolve("fixture.git")); String base = config.getGitea().getBaseUrl().replaceAll("/+$", ""); String url = base + "/" + config.getGitea().getOwner() + "/p_" + source + ".git"; - String basic = Base64.getEncoder().encodeToString((remote.authenticatedUsername() + ":" + config.getGitea().getToken()) - .getBytes(StandardCharsets.UTF_8)); + String basic = + Base64.getEncoder() + .encodeToString( + (remote.authenticatedUsername() + + ":" + + config.getGitea().getToken()) + .getBytes(StandardCharsets.UTF_8)); Map settings = new LinkedHashMap<>(); settings.put("http." + base + "/.extraHeader", "Authorization: Basic " + basic); settings.put("lfs.url", url + "/info/lfs"); @@ -162,18 +183,40 @@ class GiteaLiveTest { fixtureGit(staging, settings, "remote", "add", "origin", url); fixtureGit(staging, settings, "fetch", "--quiet", "origin", "refs/heads/main"); fixtureGit(staging, settings, "read-tree", original); - String ordinary = fixtureBlob(staging, settings, "published".getBytes(StandardCharsets.UTF_8)); + String ordinary = + fixtureBlob(staging, settings, "published".getBytes(StandardCharsets.UTF_8)); String cad = fixtureBlob(staging, settings, new byte[13 * 1024 * 1024]); String link = fixtureBlob(staging, settings, "README.md".getBytes(StandardCharsets.UTF_8)); byte[] lfsBytes = new byte[256 * 1024]; new Random(42).nextBytes(lfsBytes); - String oid = HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(lfsBytes)); - Path object = staging.resolve("lfs/objects/" + oid.substring(0, 2) + "/" + oid.substring(2, 4) + "/" + oid); + String oid = + HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(lfsBytes)); + Path object = + staging.resolve( + "lfs/objects/" + + oid.substring(0, 2) + + "/" + + oid.substring(2, 4) + + "/" + + oid); Files.createDirectories(object.getParent()); Files.write(object, lfsBytes); - String pointer = fixtureBlob(staging, settings, ("version https://git-lfs.github.com/spec/v1\noid sha256:" + oid - + "\nsize " + lfsBytes.length + "\n").getBytes(StandardCharsets.UTF_8)); - String attributes = fixtureBlob(staging, settings, "model.bin filter=lfs diff=lfs merge=lfs -text\n".getBytes(StandardCharsets.UTF_8)); + String pointer = + fixtureBlob( + staging, + settings, + ("version https://git-lfs.github.com/spec/v1\noid sha256:" + + oid + + "\nsize " + + lfsBytes.length + + "\n") + .getBytes(StandardCharsets.UTF_8)); + String attributes = + fixtureBlob( + staging, + settings, + "model.bin filter=lfs diff=lfs merge=lfs -text\n" + .getBytes(StandardCharsets.UTF_8)); Map files = new LinkedHashMap<>(); files.put("README.md", "100644," + ordinary); files.put("说明/示例.txt", "100644," + ordinary); @@ -182,76 +225,193 @@ class GiteaLiveTest { files.put("readme-link", "120000," + link); files.put("model.bin", "100644," + pointer); files.put(".gitattributes", "100644," + attributes); - for (String path : List.of("uros/drive_base", "uros/micro-ROS-Agent", "uros/micro_ros_msgs", "uros_pkg/src/micro_ros_setup")) + for (String path : + List.of( + "uros/drive_base", + "uros/micro-ROS-Agent", + "uros/micro_ros_msgs", + "uros_pkg/src/micro_ros_setup")) files.put(path, "160000," + "a".repeat(40)); for (Map.Entry file : files.entrySet()) { String[] modeAndHash = file.getValue().split(","); - fixtureGit(staging, settings, "update-index", "--add", "--cacheinfo", modeAndHash[0], modeAndHash[1], file.getKey()); + fixtureGit( + staging, + settings, + "update-index", + "--add", + "--cacheinfo", + modeAndHash[0], + modeAndHash[1], + file.getKey()); } String tree = fixtureGit(staging, settings, "write-tree"); - String publication = fixtureGit(staging, settings, "commit-tree", tree, "-p", original, "-m", "Special Git/LFS fixture"); + String publication = + fixtureGit( + staging, + settings, + "commit-tree", + tree, + "-p", + original, + "-m", + "Special Git/LFS fixture"); fixtureGit(staging, settings, "update-ref", "refs/heads/fixture", publication); fixtureGit(staging, settings, "lfs", "push", "--all", "origin", "refs/heads/fixture"); - fixtureGit(staging, settings, "push", "--quiet", "origin", publication + ":refs/heads/main"); - perform(body(auth(put("/api/workspace/projects/" + source + "/publication"), owner), Map.of("commitSha", publication)), 200); - perform(body(auth(post("/api/workspace/projects/" + source + "/commits"), owner), Map.of( - "expectedCommitSha", publication, "message", "unpublished change", "changes", List.of(Map.of( - "action", "UPDATE_FILE", "path", "README.md", "content", "private unpublished")))), 200); + fixtureGit( + staging, settings, "push", "--quiet", "origin", publication + ":refs/heads/main"); + perform( + body( + auth(put("/api/workspace/projects/" + source + "/publication"), owner), + Map.of("commitSha", publication)), + 200); + perform( + body( + auth(post("/api/workspace/projects/" + source + "/commits"), owner), + Map.of( + "expectedCommitSha", + publication, + "message", + "unpublished change", + "changes", + List.of( + Map.of( + "action", + "UPDATE_FILE", + "path", + "README.md", + "content", + "private unpublished")))), + 200); Set copies = new HashSet<>(); for (String token : List.of(owner, other)) { - JsonNode fork = perform(body(auth(post("/api/community/projects/" + source + "/forks"), token), - Map.of("name", "快照联调副本", "publishedCommitSha", publication)), 200); + JsonNode fork = + perform( + body( + auth( + post("/api/community/projects/" + source + "/forks"), + token), + Map.of("name", "快照联调副本", "publishedCommitSha", publication)), + 200); String code = fork.path("projectCode").asText(); assertThat(copies.add(code)).isTrue(); assertThat(fork.path("repoStatus").asText()).isEqualTo("READY"); assertThat(fork.path("sourceCommitSha").asText()).isEqualTo(publication); - GiteaClient.Repository repository = new GiteaClient.Repository(0, config.getGitea().getOwner(), "p_" + code); + GiteaClient.Repository repository = + new GiteaClient.Repository(0, config.getGitea().getOwner(), "p_" + code); JsonNode metadata = readRepository("p_" + code, ""); - assertThat(metadata.path("empty").asBoolean()).as("Gitea metadata empty; defaultBranch=%s", metadata.path("default_branch").asText()).isFalse(); - String head = readRepository("p_" + code, "/branches/main").path("commit").path("id").asText(); + assertThat(metadata.path("empty").asBoolean()) + .as( + "Gitea metadata empty; defaultBranch=%s", + metadata.path("default_branch").asText()) + .isFalse(); + String head = + readRepository("p_" + code, "/branches/main") + .path("commit") + .path("id") + .asText(); JsonNode commit = readRepository("p_" + code, "/git/commits/" + head); assertThat(commit.path("parents").isArray()).isTrue(); assertThat(commit.path("parents").isEmpty()).isTrue(); String copyRemote = "copy" + copies.size(); - fixtureGit(staging, settings, "remote", "add", copyRemote, base + "/" + config.getGitea().getOwner() + "/p_" + code + ".git"); - fixtureGit(staging, settings, "fetch", "--quiet", "--no-tags", copyRemote, "refs/heads/main"); - assertThat(fixtureGit(staging, settings, "rev-parse", head + "^{tree}")).isEqualTo(tree); + fixtureGit( + staging, + settings, + "remote", + "add", + copyRemote, + base + "/" + config.getGitea().getOwner() + "/p_" + code + ".git"); + fixtureGit( + staging, + settings, + "fetch", + "--quiet", + "--no-tags", + copyRemote, + "refs/heads/main"); + assertThat(fixtureGit(staging, settings, "rev-parse", head + "^{tree}")) + .isEqualTo(tree); assertThat(remote.history(repository, 1, 20).total()).isEqualTo(1); - JsonNode entries = readRepository("p_" + code, "/git/trees/" + head + "?recursive=true"); - assertThat(entries.path("tree").findValuesAsText("mode")).contains("100755", "120000", "160000"); - assertThat(perform(auth(get("/api/workspace/projects/" + code + "/files").param("path", "README.md"), token), 200) - .path("content").asText()).isEqualTo("published"); - mvc.perform(auth(get("/api/workspace/projects/" + code + "/files") - .param("path", "SOLIDWORKS_FILES/Assembly_#1.SLDASM").param("download", "true"), token)).andExpect(status().is(413)); + JsonNode entries = + readRepository("p_" + code, "/git/trees/" + head + "?recursive=true"); + assertThat(entries.path("tree").findValuesAsText("mode")) + .contains("100755", "120000", "160000"); + assertThat( + perform( + auth( + get("/api/workspace/projects/" + + code + + "/files") + .param("path", "README.md"), + token), + 200) + .path("content") + .asText()) + .isEqualTo("published"); + mvc.perform( + auth( + get("/api/workspace/projects/" + code + "/files") + .param("path", "SOLIDWORKS_FILES/Assembly_#1.SLDASM") + .param("download", "true"), + token)) + .andExpect(status().is(413)); } } private String fixtureGit(Path staging, Map settings, String... args) { - GitCommandRunner.Result result = nativeGit.run(staging, new ForkDeadline(Duration.ofMinutes(2)), "live-fixture", settings, - Map.of("GIT_AUTHOR_NAME", "Fixture", "GIT_AUTHOR_EMAIL", "fixture@users.community.invalid", - "GIT_COMMITTER_NAME", "Fixture", "GIT_COMMITTER_EMAIL", "fixture@users.community.invalid"), args); + GitCommandRunner.Result result = + nativeGit.run( + staging, + new ForkDeadline(Duration.ofMinutes(2)), + "live-fixture", + settings, + Map.of( + "GIT_AUTHOR_NAME", + "Fixture", + "GIT_AUTHOR_EMAIL", + "fixture@users.vibemake.invalid", + "GIT_COMMITTER_NAME", + "Fixture", + "GIT_COMMITTER_EMAIL", + "fixture@users.vibemake.invalid"), + args); assertThat(result.exitCode()).as("live Git fixture command completed").isZero(); return result.output(); } - private String fixtureBlob(Path staging, Map settings, byte[] bytes) throws Exception { + private String fixtureBlob(Path staging, Map settings, byte[] bytes) + throws Exception { Path input = Files.createTempFile(gitFixtures, "blob-", ".bin"); Files.write(input, bytes); return fixtureGit(staging, settings, "hash-object", "-w", input.toString()); } private JsonNode readRepository(String repository, String suffix) throws Exception { - String url = config.getGitea().getBaseUrl().replaceAll("/+$", "") + "/api/v1/repos/" - + config.getGitea().getOwner() + "/" + repository + suffix; - HttpRequest request = HttpRequest.newBuilder(URI.create(url)).timeout(Duration.ofSeconds(30)) - .header("Authorization", "token " + config.getGitea().getToken()).GET().build(); - HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofByteArray()); + String url = + config.getGitea().getBaseUrl().replaceAll("/+$", "") + + "/api/v1/repos/" + + config.getGitea().getOwner() + + "/" + + repository + + suffix; + HttpRequest request = + HttpRequest.newBuilder(URI.create(url)) + .timeout(Duration.ofSeconds(30)) + .header("Authorization", "token " + config.getGitea().getToken()) + .GET() + .build(); + HttpResponse response = + HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofByteArray()); if (response.statusCode() != 200) { - String diagnostic = new String(response.body(), StandardCharsets.UTF_8) - .replace(config.getGitea().getToken(), "[redacted]") - .replaceAll("(?im)(Authorization|Cookie|Set-Cookie):[^\\r\\n]*", "$1: [redacted]"); + String diagnostic = + new String(response.body(), StandardCharsets.UTF_8) + .replace(config.getGitea().getToken(), "[redacted]") + .replaceAll( + "(?im)(Authorization|Cookie|Set-Cookie):[^\\r\\n]*", + "$1: [redacted]"); if (diagnostic.length() > 18000) diagnostic = diagnostic.substring(0, 18000); - assertThat(response.statusCode()).withFailMessage("Fixture Gitea response: %s", diagnostic).isEqualTo(200); + assertThat(response.statusCode()) + .withFailMessage("Fixture Gitea response: %s", diagnostic) + .isEqualTo(200); } assertThat(response.statusCode()).isEqualTo(200); return json.readTree(response.body()); @@ -357,8 +517,13 @@ class GiteaLiveTest { c.path("commitSha").asText())), 200); String copy = fork.path("projectCode").asText(); - readRepository("p_" + copy, "/contents/%E6%BA%90%E7%A0%81/hello%20world.txt?ref=" - + readRepository("p_" + copy, "/branches/main").path("commit").path("id").asText()); + readRepository( + "p_" + copy, + "/contents/%E6%BA%90%E7%A0%81/hello%20world.txt?ref=" + + readRepository("p_" + copy, "/branches/main") + .path("commit") + .path("id") + .asText()); assertThat( perform( auth( diff --git a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/HttpSafetyTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/HttpSafetyTest.java new file mode 100644 index 0000000..f882946 --- /dev/null +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/HttpSafetyTest.java @@ -0,0 +1,91 @@ +package com.linkerbot.vibemake.api; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.state.TransientStateStore; + +import org.junit.jupiter.api.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.*; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Import; +import org.springframework.http.MediaType; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; +import org.springframework.test.web.servlet.MockMvc; + +@SpringBootTest( + properties = { + "spring.datasource.url=jdbc:h2:mem:http-safety;MODE=MySQL;DB_CLOSE_DELAY=-1", + "spring.datasource.username=sa", + "spring.datasource.password=", + "spring.datasource.driver-class-name=org.h2.Driver", + "vibemake.ai.enabled=false", + "vibemake.oss.enabled=false", + "vibemake.limits.enabled=true", + "vibemake.limits.per-minute.captcha=1", + "vibemake.limits.json-bytes=64", + "logging.level.root=WARN" + }) +@ActiveProfiles("test") +@AutoConfigureMockMvc(print = MockMvcPrint.NONE) +@Import(WorkflowTest.Config.class) +class HttpSafetyTest { + private static final String ORIGIN = "https://dev-vibemake.robotquan.com"; + @Autowired MockMvc mvc; + @MockitoSpyBean TransientStateStore state; + + @AfterEach + void resetSpy() { + reset(state); + } + + @Test + void corsAndRetryAfterSurviveLimitErrorsAndPreflightDoesNotCount() throws Exception { + mvc.perform( + options("/api/auth/captcha") + .header("Origin", ORIGIN) + .header("Access-Control-Request-Method", "GET")) + .andExpect(status().isOk()); + mvc.perform(get("/api/auth/captcha").header("Origin", ORIGIN)) + .andExpect(status().isOk()) + .andExpect(header().string("Cache-Control", "no-store")); + mvc.perform(get("/api/auth/captcha").header("Origin", ORIGIN)) + .andExpect(status().isTooManyRequests()) + .andExpect(jsonPath("$.code").value("RATE_LIMITED")) + .andExpect(header().exists("Retry-After")) + .andExpect(header().string("Access-Control-Allow-Origin", ORIGIN)) + .andExpect(header().exists("X-Request-Id")); + } + + @Test + void redisFailureInAuthenticationReturns503WithCorsAndRequestId() throws Exception { + doThrow(new BusinessException(503, "REDIS_UNAVAILABLE", "安全状态服务不可用")) + .when(state) + .get(anyString()); + mvc.perform( + get("/api/users/me") + .header("Origin", ORIGIN) + .header("Authorization", "Bearer " + "a".repeat(43))) + .andExpect(status().isServiceUnavailable()) + .andExpect(jsonPath("$.code").value("REDIS_UNAVAILABLE")) + .andExpect(header().string("Access-Control-Allow-Origin", ORIGIN)) + .andExpect(header().exists("X-Request-Id")); + } + + @Test + void jsonSizeFailuresRemain413WithJsonAndCors() throws Exception { + mvc.perform( + post("/api/auth/login") + .header("Origin", ORIGIN) + .contentType(MediaType.APPLICATION_JSON) + .content("{\"email\":\"" + "x".repeat(100) + "\"}")) + .andExpect(status().isPayloadTooLarge()) + .andExpect(jsonPath("$.code").value("REQUEST_TOO_LARGE")) + .andExpect(header().string("Access-Control-Allow-Origin", ORIGIN)); + } +} diff --git a/community-api/src/test/java/com/linkerbot/community/api/OssProfileTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/OssProfileTest.java similarity index 74% rename from community-api/src/test/java/com/linkerbot/community/api/OssProfileTest.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/OssProfileTest.java index f86ec5e..654b67b 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/OssProfileTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/OssProfileTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import static org.assertj.core.api.Assertions.*; @@ -12,8 +12,8 @@ class OssProfileTest { void environmentProfilesKeepCoverDirectoriesSeparate() throws IOException { YamlPropertySourceLoader loader = new YamlPropertySourceLoader(); assertThat(loader.load("test", new ClassPathResource("application-test.yml")).getFirst() - .getProperty("community.oss.root-directory")).isEqualTo("vibemake_dev"); + .getProperty("vibemake.oss.root-directory")).isEqualTo("vibemake_dev"); assertThat(loader.load("prod", new ClassPathResource("application-prod.yml")).getFirst() - .getProperty("community.oss.root-directory")).isEqualTo("vibemake"); + .getProperty("vibemake.oss.root-directory")).isEqualTo("vibemake"); } } diff --git a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/QueryEfficiencyTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/QueryEfficiencyTest.java new file mode 100644 index 0000000..8e1f2ff --- /dev/null +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/QueryEfficiencyTest.java @@ -0,0 +1,290 @@ +package com.linkerbot.vibemake.api; + +import static org.assertj.core.api.Assertions.*; + +import com.linkerbot.vibemake.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.PageResponse; +import com.linkerbot.vibemake.service.*; +import com.linkerbot.vibemake.service.admin.AdminManagementService; +import com.linkerbot.vibemake.service.support.ProjectActors; + +import org.apache.ibatis.executor.statement.StatementHandler; +import org.apache.ibatis.plugin.*; +import org.junit.jupiter.api.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.*; +import org.springframework.context.annotation.*; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; + +import java.lang.management.*; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; + +@SpringBootTest( + properties = { + "spring.datasource.url=jdbc:h2:mem:query-efficiency;MODE=MySQL;DB_CLOSE_DELAY=-1", + "spring.datasource.username=sa", + "spring.datasource.password=", + "spring.datasource.driver-class-name=org.h2.Driver", + "vibemake.ai.enabled=false", + "vibemake.oss.enabled=false", + "logging.level.root=WARN" + }) +@ActiveProfiles("test") +@Import({WorkflowTest.Config.class, QueryEfficiencyTest.Config.class}) +class QueryEfficiencyTest { + private static final String MYSQL_URL = System.getenv("BENCHMARK_MYSQL_URL"); + private static final String DATABASE = + "vibemake_benchmark_" + UUID.randomUUID().toString().replace("-", ""); + private static boolean databaseCreated; + + @DynamicPropertySource + static void isolatedMysql(DynamicPropertyRegistry registry) throws Exception { + if (MYSQL_URL == null || MYSQL_URL.isBlank()) return; + if (!MYSQL_URL.startsWith("jdbc:mysql:")) + throw new IllegalArgumentException("基准测试只接受 MySQL URL"); + try (java.sql.Connection connection = bootstrapConnection(); + java.sql.Statement statement = connection.createStatement()) { + if (!"MySQL".equals(connection.getMetaData().getDatabaseProductName())) + throw new IllegalStateException("需要 MySQL"); + statement.execute( + "CREATE DATABASE " + + DATABASE + + " CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"); + databaseCreated = true; + } + String plain = MYSQL_URL.split("\\?", 2)[0]; + String isolated = + plain.substring(0, plain.lastIndexOf('/') + 1) + + DATABASE + + (MYSQL_URL.contains("?") ? "?" + MYSQL_URL.split("\\?", 2)[1] : ""); + registry.add("spring.datasource.url", () -> isolated); + registry.add("spring.datasource.username", () -> System.getenv("BENCHMARK_MYSQL_USERNAME")); + registry.add( + "spring.datasource.password", + () -> System.getenv().getOrDefault("BENCHMARK_MYSQL_PASSWORD", "")); + registry.add("spring.datasource.driver-class-name", () -> "com.mysql.cj.jdbc.Driver"); + } + + private static java.sql.Connection bootstrapConnection() throws java.sql.SQLException { + return java.sql.DriverManager.getConnection( + MYSQL_URL, + System.getenv("BENCHMARK_MYSQL_USERNAME"), + System.getenv().getOrDefault("BENCHMARK_MYSQL_PASSWORD", "")); + } + + @AfterAll + static void removeOnlyIsolatedDatabase() throws Exception { + if (!databaseCreated) return; + try (java.sql.Connection connection = bootstrapConnection(); + java.sql.Statement statement = connection.createStatement()) { + statement.execute("DROP DATABASE " + DATABASE); + } + } + + private void resetSchema() throws Exception { + if (!databaseCreated) { + SchemaSupport.reset(jdbc); + return; + } + // 连接目标必须是本次创建的随机临时库,禁止对外部配置指定的业务库执行 DDL。 + try (java.sql.Connection connection = + java.util.Objects.requireNonNull(jdbc.getDataSource()).getConnection()) { + assertThat(connection.getCatalog()).isEqualTo(DATABASE); + } + for (String table : + List.of( + "project_import_task", + "project_like", + "project_comment", + "project", + "sys_user")) jdbc.execute("DROP TABLE IF EXISTS " + table); + java.nio.file.Path docs = java.nio.file.Path.of("../docs"); + if (!java.nio.file.Files.exists(docs)) docs = java.nio.file.Path.of("docs"); + for (String name : List.of("database.md", "admin-database.md")) { + java.util.regex.Matcher tables = + java.util.regex.Pattern.compile("CREATE TABLE [\\s\\S]*?;") + .matcher(java.nio.file.Files.readString(docs.resolve(name))); + while (tables.find()) jdbc.execute(tables.group()); + } + } + + @TestConfiguration + static class Config { + @Bean + SqlCounter sqlCounter() { + return new SqlCounter(); + } + } + + @Intercepts( + @Signature( + type = StatementHandler.class, + method = "prepare", + args = {java.sql.Connection.class, Integer.class})) + static class SqlCounter implements Interceptor { + final AtomicInteger count = new AtomicInteger(); + + @Override + public Object intercept(Invocation invocation) throws Throwable { + if (((StatementHandler) invocation.getTarget()) + .getBoundSql() + .getSql() + .stripLeading() + .toUpperCase(Locale.ROOT) + .startsWith("SELECT")) count.incrementAndGet(); + return invocation.proceed(); + } + } + + @Autowired SqlCounter sql; + @Autowired JdbcTemplate jdbc; + @Autowired ProjectService projects; + @Autowired UserService users; + @Autowired InteractionService interactions; + @Autowired AdminManagementService management; + private User owner; + + @BeforeEach + void seed() throws Exception { + resetSchema(); + owner = users.login("efficiency@example.invalid"); + for (int index = 1; index <= 21; index++) { + String code = String.format("%012d", index); + jdbc.update( + "INSERT INTO" + + " project(project_code,owner_user_id,name,description,project_type,gitea_owner,gitea_repo_name,gitea_repo_id,repo_status,publish_status,published_commit_sha,published_at,source_project_id,created_at,updated_at)" + + " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP,CURRENT_TIMESTAMP)", + code, + owner.getId(), + "项目" + index, + "性能验证", + "GENERAL", + "vibemake", + "p_" + code, + (long) index, + "READY", + "PUBLISHED", + "a".repeat(40), + java.sql.Timestamp.valueOf("2026-01-01 00:00:00"), + index == 1 ? null : 1L); + if (index > 1) { + jdbc.update( + "INSERT INTO project_like(project_id,user_id,created_at)" + + " VALUES(?,?,CURRENT_TIMESTAMP)", + index, + owner.getId()); + jdbc.update( + "INSERT INTO" + + " project_import_task(task_code,project_code,operator_user_code,source_repository_id,source_repository_url,source_default_branch,status,phase,warnings_json,created_at,updated_at)" + + " VALUES(?,?,?,?,?,?,?,?,'[]',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP)", + String.format("%032d", index), + code, + owner.getUserCode(), + (long) index, + "https://github.com/example/r" + index, + "main", + "SUCCEEDED", + "READY"); + } + } + for (int index = 1; index <= 20; index++) + jdbc.update( + "INSERT INTO" + + " project_comment(comment_code,project_id,user_id,content,deleted,created_at,updated_at)" + + " VALUES(?,2,?,?,0,CURRENT_TIMESTAMP,CURRENT_TIMESTAMP)", + String.format("%032d", index), + owner.getId(), + "评论" + index); + for (int index = 1; index <= 19; index++) + users.login("efficiency-" + index + "@example.invalid"); + sql.count.set(0); + } + + @Test + void batchesKeepResponsesAndBoundQueryCounts() { + PageResponse result = projects.list(null, null, null, 1, 20, owner.getId()); + int projectQueries = sql.count.getAndSet(0); + assertThat(result.items()).hasSize(20); + assertThat(result.items()) + .allSatisfy( + view -> { + assertThat(view.owner().userCode()).isEqualTo(owner.getUserCode()); + assertThat(view.likeCount()).isEqualTo(1); + assertThat(view.liked()).isTrue(); + assertThat(view.sourceProjectCode()).isEqualTo("000000000001"); + assertThat(view.sourceRepositoryUrl()) + .startsWith("https://github.com/example/"); + }); + assertThat(interactions.list("000000000002", 1, 20).items()).hasSize(20); + int commentQueries = sql.count.getAndSet(0); + try (ProjectActors.Scope scope = + ProjectActors.enter(new ProjectActors.AdminActor(owner.getUserCode(), "管理员"))) { + assertThat(management.users(1, 20, null, null, null, null, null).items()) + .hasSize(20) + .anySatisfy( + view -> { + assertThat(view.userCode()).isEqualTo(owner.getUserCode()); + assertThat(view.projectCount()).isEqualTo(21); + }); + } + int userQueries = sql.count.getAndSet(0); + System.out.printf( + "QUERY_COUNTS projects=%d comments=%d users=%d%n", + projectQueries, commentQueries, userQueries); + if (!Boolean.getBoolean("vibemake.benchmark.baseline")) { + assertThat(projectQueries).isLessThanOrEqualTo(8); + assertThat(commentQueries).isLessThanOrEqualTo(4); + assertThat(userQueries).isLessThanOrEqualTo(3); + } + } + + @Test + void repeatableListBenchmark() throws Exception { + for (int i = 0; i < 15; i++) projects.list(null, null, null, 1, 20, owner.getId()); + benchmark(1); + benchmark(4); + } + + private void benchmark(int concurrency) throws Exception { + System.gc(); + Thread.sleep(100); + for (MemoryPoolMXBean pool : ManagementFactory.getMemoryPoolMXBeans()) + if (pool.getType() == MemoryType.HEAP) pool.resetPeakUsage(); + long[] samples = new long[100]; + sql.count.set(0); + try (java.util.concurrent.ExecutorService pool = + java.util.concurrent.Executors.newFixedThreadPool(concurrency)) { + List> tasks = new ArrayList<>(); + for (int i = 0; i < samples.length; i++) { + int sample = i; + tasks.add( + pool.submit( + () -> { + long start = System.nanoTime(); + projects.list(null, null, null, 1, 20, owner.getId()); + samples[sample] = System.nanoTime() - start; + })); + } + for (java.util.concurrent.Future task : tasks) task.get(); + } + Arrays.sort(samples); + long heapPoolPeaks = + ManagementFactory.getMemoryPoolMXBeans().stream() + .filter(pool -> pool.getType() == MemoryType.HEAP) + .mapToLong(pool -> pool.getPeakUsage().getUsed()) + .sum(); + System.out.printf( + Locale.ROOT, + "LIST_BENCHMARK samples=100 concurrency=%d sqlPerRequest=%d p95Ms=%.3f" + + " heapPoolPeakBytes=%d%n", + concurrency, + sql.count.get() / samples.length, + samples[94] / 1_000_000.0, + heapPoolPeaks); + } +} diff --git a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/RedisLiveTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/RedisLiveTest.java new file mode 100644 index 0000000..4682eb3 --- /dev/null +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/RedisLiveTest.java @@ -0,0 +1,179 @@ +package com.linkerbot.vibemake.api; + +import static org.assertj.core.api.Assertions.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.SecurityHashes; +import com.linkerbot.vibemake.common.state.TransientStateStore; +import com.linkerbot.vibemake.security.CaptchaService; +import com.linkerbot.vibemake.security.TokenService; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.config.RedisStateProperties; +import com.linkerbot.vibemake.service.state.RedisStateStore; + +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.*; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Import; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.*; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.servlet.MockMvc; + +import java.time.Duration; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +@SpringBootTest( + properties = { + "vibemake.redis.real-test=true", + "vibemake.limits.enabled=false", + "vibemake.admin.worker-enabled=false", + "spring.datasource.url=jdbc:h2:mem:redis-live;MODE=MySQL;DB_CLOSE_DELAY=-1", + "spring.datasource.username=sa", + "spring.datasource.password=", + "spring.datasource.driver-class-name=org.h2.Driver", + "spring.data.redis.host=${REDIS_TEST_HOST}", + "spring.data.redis.port=${REDIS_TEST_PORT:6379}", + "spring.data.redis.username=${REDIS_TEST_USERNAME:}", + "spring.data.redis.password=${REDIS_TEST_PASSWORD:}", + "spring.data.redis.database=${REDIS_TEST_DATABASE:0}", + "spring.data.redis.ssl.enabled=${REDIS_TEST_SSL_ENABLED:false}", + "vibemake.redis.key-prefix=vibemake:test:redis-live-${random.uuid}", + "logging.level.org.springframework=WARN" + }) +@ActiveProfiles("test") +@AutoConfigureMockMvc(print = MockMvcPrint.NONE) +@Import(WorkflowTest.Config.class) +@EnabledIfEnvironmentVariable(named = "REDIS_TEST_HOST", matches = ".+") +class RedisLiveTest { + @Autowired TransientStateStore state; + @Autowired StringRedisTemplate redis; + @Autowired RedisStateProperties namespace; + @Autowired VibemakeProperties properties; + @Autowired ObjectMapper json; + @Autowired TokenService tokens; + @Autowired CaptchaService captcha; + @Autowired UserService users; + @Autowired JdbcTemplate jdbc; + @Autowired MockMvc mvc; + + @BeforeEach + void schema() throws Exception { + SchemaSupport.reset(jdbc); + } + + @AfterEach + void cleanOnlyThisTestNamespace() { + assertThat(namespace.getKeyPrefix()).startsWith("vibemake:test:redis-live-"); + try (Cursor cursor = + redis.scan( + ScanOptions.scanOptions() + .match(namespace.prefix() + "*") + .count(100) + .build())) { + while (cursor.hasNext()) redis.delete(cursor.next()); + } + } + + @Test + void ttlAtomicConsumptionIsolationAndReconnection() throws Exception { + assertThat(state).isInstanceOf(RedisStateStore.class); + state.verify(); + assertThat(state.putIfAbsent("ttl", "once", Duration.ofMillis(80))).isTrue(); + assertThat(state.putIfAbsent("ttl", "other", Duration.ofMinutes(1))).isFalse(); + Thread.sleep(120); + assertThat(state.get("ttl")).isNull(); + state.putIfAbsent("consume", "only", Duration.ofMinutes(1)); + AtomicInteger accepted = new AtomicInteger(); + try (ExecutorService pool = Executors.newVirtualThreadPerTaskExecutor()) { + for (int i = 0; i < 30; i++) + pool.submit( + () -> { + if ("only".equals(state.consume("consume"))) accepted.incrementAndGet(); + }); + } + assertThat(accepted.get()).isEqualTo(1); + AtomicInteger maximum = new AtomicInteger(); + try (ExecutorService pool = Executors.newVirtualThreadPerTaskExecutor()) { + for (int i = 0; i < 40; i++) + pool.submit( + () -> + maximum.accumulateAndGet( + (int) + state.increment( + "counter", + Duration.ofSeconds(30), + false) + .count(), + Math::max)); + } + assertThat(maximum.get()).isEqualTo(40); + RedisStateProperties other = new RedisStateProperties(); + other.setKeyPrefix(namespace.getKeyPrefix()); + other.setApplication("admin"); + assertThat(new RedisStateStore(redis, other).get("counter")).isNull(); + RedisStandaloneConfiguration configuration = + new RedisStandaloneConfiguration( + System.getenv("REDIS_TEST_HOST"), + Integer.parseInt(System.getenv().getOrDefault("REDIS_TEST_PORT", "6379"))); + configuration.setUsername(System.getenv("REDIS_TEST_USERNAME")); + configuration.setPassword(System.getenv().getOrDefault("REDIS_TEST_PASSWORD", "")); + configuration.setDatabase( + Integer.parseInt(System.getenv().getOrDefault("REDIS_TEST_DATABASE", "0"))); + org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration + .LettuceClientConfigurationBuilder + client = + org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration + .builder() + .commandTimeout(Duration.ofSeconds(1)); + if (Boolean.parseBoolean(System.getenv("REDIS_TEST_SSL_ENABLED"))) client.useSsl(); + LettuceConnectionFactory factory = + new LettuceConnectionFactory(configuration, client.build()); + try { + factory.afterPropertiesSet(); + factory.start(); + StringRedisTemplate replacement = new StringRedisTemplate(factory); + assertThat(new RedisStateStore(replacement, namespace).get("counter")).isEqualTo("40"); + } finally { + factory.destroy(); + } + } + + @Test + void sessionsCaptchaRevocationAndDisabledUsersUseRealRedis() throws Exception { + User user = users.login("redis-test@example.invalid"); + String token = tokens.issue(user.getId(), user.getSessionVersion()); + assertThat(redis.hasKey(namespace.prefix() + "session:" + token)).isFalse(); + assertThat(redis.hasKey(namespace.prefix() + "session:" + SecurityHashes.sha256(token))) + .isTrue(); + TokenService replacement = + new TokenService(properties, new RedisStateStore(redis, namespace), json); + assertThat(replacement.resolve(token)).isEqualTo(user.getId()); + mvc.perform(get("/api/users/me").header("Authorization", "Bearer " + token)) + .andExpect(status().isOk()); + String code = captcha.issue().captchaCode(); + captcha.verify(code, "ABCDE"); + assertThatThrownBy(() -> captcha.verify(code, "ABCDE")) + .isInstanceOf(com.linkerbot.vibemake.common.BusinessException.class); + jdbc.update( + "UPDATE sys_user SET status='DISABLED', session_version=session_version+1 WHERE" + + " id=?", + user.getId()); + mvc.perform(get("/api/users/me").header("Authorization", "Bearer " + token)) + .andExpect(status().isUnauthorized()); + jdbc.update("UPDATE sys_user SET status='ACTIVE' WHERE id=?", user.getId()); + mvc.perform(get("/api/users/me").header("Authorization", "Bearer " + token)) + .andExpect(status().isUnauthorized()); + replacement.revoke(token); + assertThat(tokens.resolve(token)).isNull(); + } +} diff --git a/community-api/src/test/java/com/linkerbot/community/api/ResourcePathMigrationTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/ResourcePathMigrationTest.java similarity index 98% rename from community-api/src/test/java/com/linkerbot/community/api/ResourcePathMigrationTest.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/ResourcePathMigrationTest.java index b688eba..0a7c7e1 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/ResourcePathMigrationTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/ResourcePathMigrationTest.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import static org.assertj.core.api.Assertions.*; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; diff --git a/community-api/src/test/java/com/linkerbot/community/api/SchemaSupport.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/SchemaSupport.java similarity index 97% rename from community-api/src/test/java/com/linkerbot/community/api/SchemaSupport.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/SchemaSupport.java index 46d15b9..9227855 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/SchemaSupport.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/SchemaSupport.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/community-api/src/test/java/com/linkerbot/community/api/WorkflowTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/WorkflowTest.java similarity index 59% rename from community-api/src/test/java/com/linkerbot/community/api/WorkflowTest.java rename to vibemake-api/src/test/java/com/linkerbot/vibemake/api/WorkflowTest.java index fe93c4b..012e854 100644 --- a/community-api/src/test/java/com/linkerbot/community/api/WorkflowTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/WorkflowTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.api; +package com.linkerbot.vibemake.api; import static org.assertj.core.api.Assertions.*; import static org.hamcrest.Matchers.containsString; @@ -7,11 +7,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.security.CaptchaService; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.config.UrdfProperties; -import com.linkerbot.community.common.BusinessException; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.security.CaptchaService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.config.UrdfProperties; import org.junit.jupiter.api.*; import org.junit.jupiter.params.ParameterizedTest; @@ -46,11 +46,17 @@ import java.util.concurrent.*; class WorkflowTest { @TestConfiguration static class Config { - @Bean @Primary FakeGitSnapshotCopier fakeSnapshots(FakeGiteaClient gitea) { return new FakeGitSnapshotCopier(gitea); } + @Bean + @Primary + FakeGitSnapshotCopier fakeSnapshots(FakeGiteaClient gitea) { + return new FakeGitSnapshotCopier(gitea); + } @Bean @Primary - FakeOssObjectStore fakeOss() { return new FakeOssObjectStore(); } + FakeOssObjectStore fakeOss() { + return new FakeOssObjectStore(); + } @Bean @Primary @@ -60,8 +66,10 @@ class WorkflowTest { @Bean @Primary - CaptchaService fixedCaptcha(CommunityProperties properties) { - return new CaptchaService(properties) { + CaptchaService fixedCaptcha( + VibemakeProperties properties, + com.linkerbot.vibemake.common.state.TransientStateStore state) { + return new CaptchaService(properties, state) { @Override protected String generateAnswer() { return "ABCDE"; @@ -195,28 +203,50 @@ class WorkflowTest { @Test void crossOriginLoginDownloadsAndBusinessErrorsKeepCorsHeaders() throws Exception { String origin = "https://dev-vibemake.robotquan.com"; - String captchaCode = perform(get("/api/auth/captcha").header("Origin", origin), 200) - .path("data").path("captchaCode").asText(); - MvcResult loginResult = mvc.perform(body(post("/api/auth/login").header("Origin", origin), - Map.of("email", "cors-owner@example.invalid", "captchaCode", captchaCode, - "captchaAnswer", "ABCDE"))) - .andExpect(status().isOk()) - .andExpect(header().string("Access-Control-Allow-Origin", origin)) - .andExpect(jsonPath("$.code").value("OK")) - .andReturn(); - String owner = json.readTree(loginResult.getResponse().getContentAsString()) - .path("data").path("token").asText(); + String captchaCode = + perform(get("/api/auth/captcha").header("Origin", origin), 200) + .path("data") + .path("captchaCode") + .asText(); + MvcResult loginResult = + mvc.perform( + body( + post("/api/auth/login").header("Origin", origin), + Map.of( + "email", + "cors-owner@example.invalid", + "captchaCode", + captchaCode, + "captchaAnswer", + "ABCDE"))) + .andExpect(status().isOk()) + .andExpect(header().string("Access-Control-Allow-Origin", origin)) + .andExpect(jsonPath("$.code").value("OK")) + .andReturn(); + String owner = + json.readTree(loginResult.getResponse().getContentAsString()) + .path("data") + .path("token") + .asText(); String code = create(owner, "跨域下载项目"); - mvc.perform(auth(get("/api/workspace/projects/" + code + "/files"), owner) - .header("Origin", origin) - .param("path", "README.md").param("download", "true")) + mvc.perform( + auth(get("/api/workspace/projects/" + code + "/files"), owner) + .header("Origin", origin) + .param("path", "README.md") + .param("download", "true")) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_OCTET_STREAM)) .andExpect(header().string("Content-Disposition", containsString("attachment"))) .andExpect(header().string("Access-Control-Allow-Origin", origin)) - .andExpect(header().string("Access-Control-Expose-Headers", containsString("Content-Disposition"))) - .andExpect(header().string("Access-Control-Expose-Headers", containsString("X-Request-Id"))); + .andExpect( + header().string( + "Access-Control-Expose-Headers", + containsString("Content-Disposition"))) + .andExpect( + header().string( + "Access-Control-Expose-Headers", + containsString("X-Request-Id"))); String other = login("cors-other@example.invalid"); mvc.perform(auth(get("/api/workspace/projects/" + code), other).header("Origin", origin)) @@ -224,24 +254,38 @@ class WorkflowTest { .andExpect(jsonPath("$.code").value("NOT_FOUND")) .andExpect(header().string("Access-Control-Allow-Origin", origin)); - mvc.perform(auth(get("/api/workspace/projects/missing-project"), owner).header("Origin", origin)) + mvc.perform( + auth(get("/api/workspace/projects/missing-project"), owner) + .header("Origin", origin)) .andExpect(status().isNotFound()) .andExpect(jsonPath("$.code").value("NOT_FOUND")) .andExpect(header().string("Access-Control-Allow-Origin", origin)); - jdbc.update("UPDATE sys_user SET status = 'DISABLED' WHERE email = ?", "cors-other@example.invalid"); - String disabledCaptchaCode = perform(get("/api/auth/captcha").header("Origin", origin), 200) - .path("data").path("captchaCode").asText(); - mvc.perform(body(post("/api/auth/login").header("Origin", origin), - Map.of("email", "cors-other@example.invalid", "captchaCode", disabledCaptchaCode, - "captchaAnswer", "ABCDE"))) + jdbc.update( + "UPDATE sys_user SET status = 'DISABLED' WHERE email = ?", + "cors-other@example.invalid"); + String disabledCaptchaCode = + perform(get("/api/auth/captcha").header("Origin", origin), 200) + .path("data") + .path("captchaCode") + .asText(); + mvc.perform( + body( + post("/api/auth/login").header("Origin", origin), + Map.of( + "email", + "cors-other@example.invalid", + "captchaCode", + disabledCaptchaCode, + "captchaAnswer", + "ABCDE"))) .andExpect(status().isForbidden()) .andExpect(jsonPath("$.code").value("ACCOUNT_DISABLED")) .andExpect(header().string("Access-Control-Allow-Origin", origin)); } @Test - void roboticArmTypeSupportsDiscoveryCreationEditingAndCommunityFiltering() throws Exception { + void roboticArmTypeSupportsDiscoveryCreationEditingAndVibemakeFiltering() throws Exception { JsonNode types = perform(get("/api/project-types"), 200).path("data"); assertThat(types.findValuesAsText("code")).contains("ROBOTIC_ARM"); for (JsonNode type : types) { @@ -249,22 +293,40 @@ class WorkflowTest { assertThat(type.path("name").asText()).isEqualTo("机械臂"); } String owner = login("arm-owner@example.com"); - JsonNode arm = perform(body(auth(post("/api/workspace/projects"), owner), - Map.of("name", "机械臂项目", "projectType", "ROBOTIC_ARM")), 200).path("data"); + JsonNode arm = + perform( + body( + auth(post("/api/workspace/projects"), owner), + Map.of("name", "机械臂项目", "projectType", "ROBOTIC_ARM")), + 200) + .path("data"); String armCode = arm.path("projectCode").asText(); assertThat(arm.path("projectType").asText()).isEqualTo("ROBOTIC_ARM"); publish(owner, armCode, head(owner, armCode)); String generalCode = create(owner, "待分类项目"); publish(owner, generalCode, head(owner, generalCode)); - JsonNode filtered = perform(get("/api/community/projects").param("type", "ROBOTIC_ARM"), 200) - .path("data").path("items"); + JsonNode filtered = + perform(get("/api/community/projects").param("type", "ROBOTIC_ARM"), 200) + .path("data") + .path("items"); assertThat(filtered.size()).isEqualTo(1); assertThat(filtered.get(0).path("projectCode").asText()).isEqualTo(armCode); - JsonNode edited = perform(body(auth(patch("/api/workspace/projects/" + generalCode), owner), - Map.of("name", "已分类项目", "projectType", "ROBOTIC_ARM")), 200).path("data"); + JsonNode edited = + perform( + body( + auth( + patch("/api/workspace/projects/" + generalCode), + owner), + Map.of("name", "已分类项目", "projectType", "ROBOTIC_ARM")), + 200) + .path("data"); assertThat(edited.path("projectType").asText()).isEqualTo("ROBOTIC_ARM"); - assertThat(perform(get("/api/community/projects").param("type", "ROBOTIC_ARM"), 200) - .path("data").path("items").size()).isEqualTo(2); + assertThat( + perform(get("/api/community/projects").param("type", "ROBOTIC_ARM"), 200) + .path("data") + .path("items") + .size()) + .isEqualTo(2); } @Test @@ -272,18 +334,53 @@ class WorkflowTest { String owner = login("short-owner@example.com"); String code = create(owner, "旧项目"); assertThat(code).matches("[0-9abcdefghjkmnpqrstvwxyz]{12}"); - assertThat(jdbc.queryForObject("SELECT project_code FROM project WHERE project_code = ?", String.class, code)).isEqualTo(code); + assertThat( + jdbc.queryForObject( + "SELECT project_code FROM project WHERE project_code = ?", + String.class, + code)) + .isEqualTo(code); String legacy = "abcdef0123456789abcdef0123456789"; - jdbc.update("UPDATE project SET project_code = ?, gitea_repo_name = ? WHERE project_code = ?", legacy, "p_" + legacy, code); + jdbc.update( + "UPDATE project SET project_code = ?, gitea_repo_name = ? WHERE project_code = ?", + legacy, + "p_" + legacy, + code); String sha = head(owner, legacy); publish(owner, legacy, sha); - assertThat(perform(get("/api/community/projects/" + legacy), 200).path("data").path("projectCode").asText()).isEqualTo(legacy); - JsonNode copy = perform(body(auth(post("/api/community/projects/" + legacy + "/forks"), owner), - Map.of("name", "新 Fork", "publishedCommitSha", sha)), 200).path("data"); + assertThat( + perform(get("/api/community/projects/" + legacy), 200) + .path("data") + .path("projectCode") + .asText()) + .isEqualTo(legacy); + JsonNode copy = + perform( + body( + auth( + post( + "/api/community/projects/" + + legacy + + "/forks"), + owner), + Map.of("name", "新 Fork", "publishedCommitSha", sha)), + 200) + .path("data"); assertThat(copy.path("projectCode").asText()).matches("[0-9abcdefghjkmnpqrstvwxyz]{12}"); assertThat(copy.path("sourceProjectCode").asText()).isEqualTo(legacy); perform(auth(put("/api/community/projects/" + legacy + "/like"), owner), 200); - JsonNode comment = perform(body(auth(post("/api/community/projects/" + legacy + "/comments"), owner), Map.of("content", "兼容测试")), 200).path("data"); + JsonNode comment = + perform( + body( + auth( + post( + "/api/community/projects/" + + legacy + + "/comments"), + owner), + Map.of("content", "兼容测试")), + 200) + .path("data"); assertThat(comment.path("commentCode").asText()).hasSize(32); assertThat(copy.path("owner").path("userCode").asText()).hasSize(12); } @@ -294,105 +391,244 @@ class WorkflowTest { String other = login("cover-other@example.com"); String first = "https://images.example.com/first.png"; String next = "https://external.example.com/second.webp?version=2"; - Map input = new LinkedHashMap<>(Map.of( - "name", "封面项目", "description", "项目说明", "projectType", "GENERAL", "coverUrl", " " + first + " ")); - JsonNode created = perform(body(auth(post("/api/workspace/projects"), owner), input), 200).path("data"); + Map input = + new LinkedHashMap<>( + Map.of( + "name", + "封面项目", + "description", + "项目说明", + "projectType", + "GENERAL", + "coverUrl", + " " + first + " ")); + JsonNode created = + perform(body(auth(post("/api/workspace/projects"), owner), input), 200) + .path("data"); String code = created.path("projectCode").asText(); String path = "/api/workspace/projects/" + code; assertThat(created.path("coverUrl").asText()).isEqualTo(first); - assertThat(perform(auth(get(path), owner), 200).path("data").path("coverUrl").asText()).isEqualTo(first); - assertThat(perform(auth(get("/api/workspace/projects"), owner), 200) - .path("data").path("items").get(0).path("coverUrl").asText()).isEqualTo(first); + assertThat(perform(auth(get(path), owner), 200).path("data").path("coverUrl").asText()) + .isEqualTo(first); + assertThat( + perform(auth(get("/api/workspace/projects"), owner), 200) + .path("data") + .path("items") + .get(0) + .path("coverUrl") + .asText()) + .isEqualTo(first); String sha = head(owner, code); - assertThat(perform(body(auth(put(path + "/publication"), owner), Map.of("commitSha", sha)), 200) - .path("data").path("coverUrl").asText()).isEqualTo(first); - assertThat(perform(get("/api/community/projects"), 200).path("data").path("items").get(0) - .path("coverUrl").asText()).isEqualTo(first); + assertThat( + perform( + body( + auth(put(path + "/publication"), owner), + Map.of("commitSha", sha)), + 200) + .path("data") + .path("coverUrl") + .asText()) + .isEqualTo(first); + assertThat( + perform(get("/api/community/projects"), 200) + .path("data") + .path("items") + .get(0) + .path("coverUrl") + .asText()) + .isEqualTo(first); input.put("coverUrl", next); perform(body(auth(patch(path), other), input), 404); perform(body(auth(patch(path), owner), input), 200); - assertThat(perform(get("/api/community/projects/" + code), 200).path("data").path("coverUrl").asText()).isEqualTo(next); + assertThat( + perform(get("/api/community/projects/" + code), 200) + .path("data") + .path("coverUrl") + .asText()) + .isEqualTo(next); assertThat(head(owner, code)).isEqualTo(sha); input.remove("coverUrl"); - assertThat(perform(body(auth(patch(path), owner), input), 200).path("data").path("coverUrl").asText()).isEqualTo(next); + assertThat( + perform(body(auth(patch(path), owner), input), 200) + .path("data") + .path("coverUrl") + .asText()) + .isEqualTo(next); input.put("coverUrl", null); perform(body(auth(patch(path), owner), input), 200); - assertThat(perform(auth(get(path), owner), 200).path("data").path("coverUrl").asText()).isEqualTo(next); + assertThat(perform(auth(get(path), owner), 200).path("data").path("coverUrl").asText()) + .isEqualTo(next); - JsonNode fork = perform(body(auth(post("/api/community/projects/" + code + "/forks"), other), - Map.of("name", "封面副本", "publishedCommitSha", sha)), 200).path("data"); + JsonNode fork = + perform( + body( + auth( + post("/api/community/projects/" + code + "/forks"), + other), + Map.of("name", "封面副本", "publishedCommitSha", sha)), + 200) + .path("data"); assertThat(fork.path("coverUrl").asText()).isEqualTo(next); input.put("coverUrl", " "); - assertThat(perform(body(auth(patch(path), owner), input), 200).path("data").path("coverUrl").isNull()).isTrue(); - assertThat(jdbc.queryForObject("SELECT cover_url FROM project WHERE project_code = ?", String.class, code)).isNull(); - assertThat(perform(get("/api/community/projects/" + code), 200).path("data").path("coverUrl").isNull()).isTrue(); - assertThat(perform(auth(get("/api/workspace/projects/" + fork.path("projectCode").asText()), other), 200) - .path("data").path("coverUrl").asText()).isEqualTo(next); + assertThat( + perform(body(auth(patch(path), owner), input), 200) + .path("data") + .path("coverUrl") + .isNull()) + .isTrue(); + assertThat( + jdbc.queryForObject( + "SELECT cover_url FROM project WHERE project_code = ?", + String.class, + code)) + .isNull(); + assertThat( + perform(get("/api/community/projects/" + code), 200) + .path("data") + .path("coverUrl") + .isNull()) + .isTrue(); + assertThat( + perform( + auth( + get( + "/api/workspace/projects/" + + fork.path("projectCode") + .asText()), + other), + 200) + .path("data") + .path("coverUrl") + .asText()) + .isEqualTo(next); assertThat(head(owner, code)).isEqualTo(sha); } @Test - void optionalCoversRemainCompatibleAndInvalidUrlsAreRejectedBeforeCreatingRepositories() throws Exception { + void optionalCoversRemainCompatibleAndInvalidUrlsAreRejectedBeforeCreatingRepositories() + throws Exception { String owner = login("cover-validation@example.com"); String code = create(owner, "旧请求"); - assertThat(perform(auth(get("/api/workspace/projects/" + code), owner), 200).path("data").path("coverUrl").isNull()).isTrue(); - Map input = new LinkedHashMap<>(Map.of("name", "封面", "projectType", "GENERAL")); + assertThat( + perform(auth(get("/api/workspace/projects/" + code), owner), 200) + .path("data") + .path("coverUrl") + .isNull()) + .isTrue(); + Map input = + new LinkedHashMap<>(Map.of("name", "封面", "projectType", "GENERAL")); for (String empty : Arrays.asList(null, "", " ")) { input.put("coverUrl", empty); - assertThat(perform(body(auth(post("/api/workspace/projects"), owner), input), 200) - .path("data").path("coverUrl").isNull()).isTrue(); + assertThat( + perform(body(auth(post("/api/workspace/projects"), owner), input), 200) + .path("data") + .path("coverUrl") + .isNull()) + .isTrue(); } long before = jdbc.queryForObject("SELECT COUNT(*) FROM project", Long.class); - for (String invalid : List.of("http://images.example.com/a.png", "/a.png", "data:image/png;base64,abc", - "https://user:password@images.example.com/a.png", "https:///missing-host.png", - "https://invalid_host/a.png", "https://images.example.com:70000/a.png", - "https://images.example.com/" + "a".repeat(2048))) { + for (String invalid : + List.of( + "http://images.example.com/a.png", + "/a.png", + "data:image/png;base64,abc", + "https://user:password@images.example.com/a.png", + "https:///missing-host.png", + "https://invalid_host/a.png", + "https://images.example.com:70000/a.png", + "https://images.example.com/" + "a".repeat(2048))) { input.put("coverUrl", invalid); perform(body(auth(post("/api/workspace/projects"), owner), input), 400); perform(body(auth(patch("/api/workspace/projects/" + code), owner), input), 400); } - assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project", Long.class)).isEqualTo(before); + assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project", Long.class)) + .isEqualTo(before); String prefix = "https://images.example.com/"; String max = prefix + "a".repeat(2048 - prefix.length()); input.put("coverUrl", " " + max + " "); - assertThat(perform(body(auth(patch("/api/workspace/projects/" + code), owner), input), 200) - .path("data").path("coverUrl").asText()).isEqualTo(max); + assertThat( + perform( + body( + auth( + patch("/api/workspace/projects/" + code), + owner), + input), + 200) + .path("data") + .path("coverUrl") + .asText()) + .isEqualTo(max); } @ParameterizedTest @ValueSource(booleans = {false, true}) - void hostedCoversStoreRelativePathsAndLegacyUrlsRemainUsableByFork(boolean legacy) throws Exception { + void hostedCoversStoreRelativePathsAndLegacyUrlsRemainUsableByFork(boolean legacy) + throws Exception { enableUrdfOss(); String owner = login("hosted-cover-owner@example.com"); String other = login("hosted-cover-other@example.com"); String stored = "/project-covers/111111111111/20261019/a.png"; String uploaded = oss.uploadUrl() + "/vibemake_dev" + stored; String expected = "https://images.example.com/assets/vibemake_dev" + stored; - Map input = new LinkedHashMap<>(Map.of( - "name", "平台封面", "projectType", "GENERAL", "coverUrl", uploaded)); - JsonNode created = perform(body(auth(post("/api/workspace/projects"), owner), input), 200).path("data"); + Map input = + new LinkedHashMap<>( + Map.of("name", "平台封面", "projectType", "GENERAL", "coverUrl", uploaded)); + JsonNode created = + perform(body(auth(post("/api/workspace/projects"), owner), input), 200) + .path("data"); String code = created.path("projectCode").asText(); String endpoint = "/api/workspace/projects/" + code; assertThat(created.path("coverUrl").asText()).isEqualTo(expected); - assertThat(jdbc.queryForObject("SELECT cover_url FROM project WHERE project_code = ?", String.class, code)).isEqualTo(stored); - if (legacy) jdbc.update("UPDATE project SET cover_url = ? WHERE project_code = ?", uploaded, code); - assertThat(perform(auth(get(endpoint), owner), 200).path("data").path("coverUrl").asText()).isEqualTo(expected); - assertThat(jdbc.queryForObject("SELECT cover_url FROM project WHERE project_code = ?", String.class, code)) + assertThat( + jdbc.queryForObject( + "SELECT cover_url FROM project WHERE project_code = ?", + String.class, + code)) + .isEqualTo(stored); + if (legacy) + jdbc.update("UPDATE project SET cover_url = ? WHERE project_code = ?", uploaded, code); + assertThat(perform(auth(get(endpoint), owner), 200).path("data").path("coverUrl").asText()) + .isEqualTo(expected); + assertThat( + jdbc.queryForObject( + "SELECT cover_url FROM project WHERE project_code = ?", + String.class, + code)) .isEqualTo(legacy ? uploaded : stored); // 读取不会隐式迁移。 String sha = head(owner, code); publish(owner, code, sha); - JsonNode fork = perform(body(auth(post("/api/community/projects/" + code + "/forks"), other), - Map.of("name", "封面副本", "publishedCommitSha", sha)), 200).path("data"); + JsonNode fork = + perform( + body( + auth( + post("/api/community/projects/" + code + "/forks"), + other), + Map.of("name", "封面副本", "publishedCommitSha", sha)), + 200) + .path("data"); assertThat(fork.path("coverUrl").asText()).isEqualTo(expected); - assertThat(jdbc.queryForObject("SELECT cover_url FROM project WHERE project_code = ?", String.class, - fork.path("projectCode").asText())).isEqualTo(stored); + assertThat( + jdbc.queryForObject( + "SELECT cover_url FROM project WHERE project_code = ?", + String.class, + fork.path("projectCode").asText())) + .isEqualTo(stored); input.put("coverUrl", expected); perform(body(auth(patch(endpoint), owner), input), 200); - assertThat(jdbc.queryForObject("SELECT cover_url FROM project WHERE project_code = ?", String.class, code)).isEqualTo(stored); + assertThat( + jdbc.queryForObject( + "SELECT cover_url FROM project WHERE project_code = ?", + String.class, + code)) + .isEqualTo(stored); oss.setPublicBaseUrl("https://new-cdn.example.com/base"); - assertThat(perform(get("/api/community/projects/" + code), 200).path("data").path("coverUrl").asText()) + assertThat( + perform(get("/api/community/projects/" + code), 200) + .path("data") + .path("coverUrl") + .asText()) .isEqualTo("https://new-cdn.example.com/base/vibemake_dev" + stored); } @@ -407,24 +643,45 @@ class WorkflowTest { } private List> urdfFiles() { - return List.of(Map.of("relativePath", "urdf/机械 臂.URDF", "sizeBytes", 12), + return List.of( + Map.of("relativePath", "urdf/机械 臂.URDF", "sizeBytes", 12), Map.of("relativePath", "meshes/底盘.stl", "sizeBytes", 24), Map.of("relativePath", "textures/a #?.png", "sizeBytes", 8)); } - private JsonNode uploadUrdf(String token, String code, List> files) throws Exception { - JsonNode signature = perform(body(auth(post("/api/workspace/projects/" + code + "/urdf/signature"), token), - Map.of("files", files)), 200).path("data"); + private JsonNode uploadUrdf(String token, String code, List> files) + throws Exception { + JsonNode signature = + perform( + body( + auth( + post( + "/api/workspace/projects/" + + code + + "/urdf/signature"), + token), + Map.of("files", files)), + 200) + .path("data"); for (int index = 0; index < files.size(); index++) - ossObjects.objects.put(signature.path("files").get(index).path("objectKey").asText(), + ossObjects.objects.put( + signature.path("files").get(index).path("objectKey").asText(), new byte[((Number) files.get(index).get("sizeBytes")).intValue()]); return signature; } - private JsonNode confirmUrdf(String token, String code, JsonNode signature, - List> files, int status) throws Exception { - return perform(body(auth(put("/api/workspace/projects/" + code + "/urdf"), token), - Map.of("batchCode", signature.path("batchCode").asText(), "files", files)), status); + private JsonNode confirmUrdf( + String token, + String code, + JsonNode signature, + List> files, + int status) + throws Exception { + return perform( + body( + auth(put("/api/workspace/projects/" + code + "/urdf"), token), + Map.of("batchCode", signature.path("batchCode").asText(), "files", files)), + status); } @Test @@ -438,46 +695,95 @@ class WorkflowTest { perform(body(auth(post(endpoint + "/signature"), owner), good), 503); enableUrdfOss(); perform(body(auth(post(endpoint + "/signature"), other), good), 404); - perform(body(auth(put(endpoint), other), Map.of("batchCode", "a".repeat(32), "files", urdfFiles())), 404); + perform( + body( + auth(put(endpoint), other), + Map.of("batchCode", "a".repeat(32), "files", urdfFiles())), + 404); perform(auth(delete(endpoint), other), 404); - List>> invalidCounts = List.of(List.of(), - List.of(Map.of("relativePath", "meshes/a.stl", "sizeBytes", 1)), - List.of(Map.of("relativePath", "a.urdf", "sizeBytes", 1), - Map.of("relativePath", "models/b.URDF", "sizeBytes", 1))); + List>> invalidCounts = + List.of( + List.of(), + List.of(Map.of("relativePath", "meshes/a.stl", "sizeBytes", 1)), + List.of( + Map.of("relativePath", "a.urdf", "sizeBytes", 1), + Map.of("relativePath", "models/b.URDF", "sizeBytes", 1))); for (int index = 0; index < invalidCounts.size(); index++) { List> files = invalidCounts.get(index); - String message = index < 2 ? "文件夹中未找到 URDF 文件" - : "文件夹中存在多个 URDF 文件,请仅保留一个后重新上传"; - assertThat(perform(body(auth(post(endpoint + "/signature"), owner), Map.of("files", files)), 400) - .path("message").asText()).isEqualTo(message); - assertThat(perform(body(auth(put(endpoint), owner), - Map.of("batchCode", "a".repeat(32), "files", files)), 400) - .path("message").asText()).isEqualTo(message); + String message = index < 2 ? "文件夹中未找到 URDF 文件" : "文件夹中存在多个 URDF 文件,请仅保留一个后重新上传"; + assertThat( + perform( + body( + auth(post(endpoint + "/signature"), owner), + Map.of("files", files)), + 400) + .path("message") + .asText()) + .isEqualTo(message); + assertThat( + perform( + body( + auth(put(endpoint), owner), + Map.of( + "batchCode", + "a".repeat(32), + "files", + files)), + 400) + .path("message") + .asText()) + .isEqualTo(message); } - for (String path : List.of("../a.urdf", "/a.urdf", "a\\b.urdf", "a//b.urdf", "a/./b.urdf", - "a\u0000.urdf", "a".repeat(512) + ".urdf", "中".repeat(340) + ".urdf")) { - Map input = Map.of("files", List.of(Map.of("relativePath", path, "sizeBytes", 1))); + for (String path : + List.of( + "../a.urdf", + "/a.urdf", + "a\\b.urdf", + "a//b.urdf", + "a/./b.urdf", + "a\u0000.urdf", + "a".repeat(512) + ".urdf", + "中".repeat(340) + ".urdf")) { + Map input = + Map.of("files", List.of(Map.of("relativePath", path, "sizeBytes", 1))); perform(body(auth(post(endpoint + "/signature"), owner), input), 400); } - for (Object files : List.of( - List.of(Map.of("relativePath", "a.urdf", "sizeBytes", 1), Map.of("relativePath", "a.urdf", "sizeBytes", 1)), - List.of(Map.of("relativePath", "a.urdf", "sizeBytes", -1)), - List.of(Map.of("relativePath", "a.urdf")))) + for (Object files : + List.of( + List.of( + Map.of("relativePath", "a.urdf", "sizeBytes", 1), + Map.of("relativePath", "a.urdf", "sizeBytes", 1)), + List.of(Map.of("relativePath", "a.urdf", "sizeBytes", -1)), + List.of(Map.of("relativePath", "a.urdf")))) perform(body(auth(post(endpoint + "/signature"), owner), Map.of("files", files)), 400); - perform(body(auth(put(endpoint), owner), Map.of("batchCode", "../another", "files", urdfFiles())), 400); - perform(body(auth(post(endpoint + "/signature"), owner), Map.of("files", - List.of(Map.of("relativePath", "a.urdf", "sizeBytes", 52428801)))), 413); + perform( + body( + auth(put(endpoint), owner), + Map.of("batchCode", "../another", "files", urdfFiles())), + 400); + perform( + body( + auth(post(endpoint + "/signature"), owner), + Map.of( + "files", + List.of(Map.of("relativePath", "a.urdf", "sizeBytes", 52428801)))), + 413); urdfLimits.setMaxTotalBytes(20); perform(body(auth(post(endpoint + "/signature"), owner), good), 413); urdfLimits.setMaxTotalBytes(209715200); urdfLimits.setMaxFiles(2); perform(body(auth(post(endpoint + "/signature"), owner), good), 413); - assertThat(jdbc.queryForObject("SELECT urdf_prefix FROM project WHERE project_code = ?", String.class, code)).isEmpty(); + assertThat( + jdbc.queryForObject( + "SELECT urdf_prefix FROM project WHERE project_code = ?", + String.class, + code)) + .isEmpty(); assertThat(ossObjects.objects).isEmpty(); } @Test - void urdfUploadReplacesClearsAndUpdatesCommunityWithoutChangingRepository() throws Exception { + void urdfUploadReplacesClearsAndUpdatesVibemakeWithoutChangingRepository() throws Exception { String owner = login("urdf-owner@example.com"); String code = create(owner, "URDF 项目"); String path = "/api/workspace/projects/" + code; @@ -490,39 +796,75 @@ class WorkflowTest { List> files = urdfFiles(); JsonNode signature = uploadUrdf(owner, code, files); assertThat(signature.path("mainRelativePath").asText()).isEqualTo("urdf/机械 臂.URDF"); - assertThat(signature.path("uploadUrl").asText()).isEqualTo("https://examplebucket.oss-cn-hangzhou.aliyuncs.com"); + assertThat(signature.path("uploadUrl").asText()) + .isEqualTo("https://examplebucket.oss-cn-hangzhou.aliyuncs.com"); assertThat(signature.toString()).doesNotContain("unit-test-secret"); assertThat(signature.has("id")).isFalse(); - assertThat(perform(auth(get(path), owner), 200).path("data").path("urdfMainUrl").isNull()).isTrue(); - String expectedPrefix = "vibemake_dev/urdf/" + code + "/" + signature.path("batchCode").asText() + "/"; + assertThat(perform(auth(get(path), owner), 200).path("data").path("urdfMainUrl").isNull()) + .isTrue(); + String expectedPrefix = + "vibemake_dev/urdf/" + code + "/" + signature.path("batchCode").asText() + "/"; JsonNode bound = confirmUrdf(owner, code, signature, files, 200).path("data"); String baseUrl = "https://images.example.com/assets/" + expectedPrefix; assertThat(bound.path("urdfBaseUrl").asText()).isEqualTo(baseUrl); - assertThat(bound.path("urdfMainUrl").asText()).isEqualTo(baseUrl + "urdf/%E6%9C%BA%E6%A2%B0%20%E8%87%82.URDF"); + assertThat(bound.path("urdfMainUrl").asText()) + .isEqualTo(baseUrl + "urdf/%E6%9C%BA%E6%A2%B0%20%E8%87%82.URDF"); assertThat(bound.has("id")).isFalse(); - assertThat(jdbc.queryForObject("SELECT urdf_main_object_key FROM project WHERE project_code = ?", String.class, code)) + assertThat( + jdbc.queryForObject( + "SELECT urdf_main_object_key FROM project WHERE project_code = ?", + String.class, + code)) .isEqualTo(expectedPrefix.substring("vibemake_dev".length()) + "urdf/机械 臂.URDF"); - assertThat(jdbc.queryForObject("SELECT urdf_prefix FROM project WHERE project_code = ?", String.class, code)) + assertThat( + jdbc.queryForObject( + "SELECT urdf_prefix FROM project WHERE project_code = ?", + String.class, + code)) .isEqualTo(expectedPrefix.substring("vibemake_dev".length())); - assertThat(json.readTree(jdbc.queryForObject("SELECT urdf_files FROM project WHERE project_code = ?", String.class, code))) + assertThat( + json.readTree( + jdbc.queryForObject( + "SELECT urdf_files FROM project WHERE project_code = ?", + String.class, + code))) .isEqualTo(json.valueToTree(files)); - assertThat(perform(get("/api/community/projects/" + code), 200).path("data").path("urdfMainUrl")).isEqualTo(bound.path("urdfMainUrl")); + assertThat( + perform(get("/api/community/projects/" + code), 200) + .path("data") + .path("urdfMainUrl")) + .isEqualTo(bound.path("urdfMainUrl")); JsonNode replacement = uploadUrdf(owner, code, files); JsonNode next = confirmUrdf(owner, code, replacement, files, 200).path("data"); assertThat(next.path("urdfMainUrl")).isNotEqualTo(bound.path("urdfMainUrl")); - assertThat(perform(get("/api/community/projects/" + code), 200).path("data").path("urdfMainUrl")).isEqualTo(next.path("urdfMainUrl")); + assertThat( + perform(get("/api/community/projects/" + code), 200) + .path("data") + .path("urdfMainUrl")) + .isEqualTo(next.path("urdfMainUrl")); assertThat(head(owner, code)).isEqualTo(sha); oss.setEnabled(false); // 清除绑定无需 OSS 可用。 perform(auth(delete(path + "/urdf"), owner), 200); JsonNode cleared = perform(get("/api/community/projects/" + code), 200).path("data"); assertThat(cleared.path("urdfMainUrl").isNull()).isTrue(); assertThat(cleared.path("urdfBaseUrl").isNull()).isTrue(); - assertThat(jdbc.queryForMap("SELECT urdf_main_object_key, urdf_prefix, urdf_files FROM project WHERE project_code = ?", code)) - .containsEntry("URDF_MAIN_OBJECT_KEY", "").containsEntry("URDF_PREFIX", ""); - assertThat(jdbc.queryForObject("SELECT urdf_files FROM project WHERE project_code = ?", String.class, code)).isEqualTo("[]"); + assertThat( + jdbc.queryForMap( + "SELECT urdf_main_object_key, urdf_prefix, urdf_files FROM project" + + " WHERE project_code = ?", + code)) + .containsEntry("URDF_MAIN_OBJECT_KEY", "") + .containsEntry("URDF_PREFIX", ""); + assertThat( + jdbc.queryForObject( + "SELECT urdf_files FROM project WHERE project_code = ?", + String.class, + code)) + .isEqualTo("[]"); assertThat(ossObjects.objects).hasSize(6); JsonNode spec = perform(get("/v3/api-docs"), 200); - assertThat(spec.path("paths").has("/api/workspace/projects/{projectCode}/urdf/signature")).isTrue(); + assertThat(spec.path("paths").has("/api/workspace/projects/{projectCode}/urdf/signature")) + .isTrue(); } @Test @@ -536,23 +878,35 @@ class WorkflowTest { JsonNode next = uploadUrdf(owner, code, files); String missingKey = next.path("files").get(1).path("objectKey").asText(); ossObjects.objects.remove(missingKey); - assertThat(confirmUrdf(owner, code, next, files, 400).path("code").asText()).isEqualTo("URDF_FILE_MISSING"); + assertThat(confirmUrdf(owner, code, next, files, 400).path("code").asText()) + .isEqualTo("URDF_FILE_MISSING"); ossObjects.objects.put(missingKey, new byte[23]); - assertThat(confirmUrdf(owner, code, next, files, 400).path("code").asText()).isEqualTo("URDF_FILE_SIZE_MISMATCH"); - assertThat(confirmUrdf(owner, code, next, List.of(files.get(1)), 400).path("code").asText()).isEqualTo("URDF_MAIN_FILE_INVALID"); - assertThat(perform(auth(get("/api/workspace/projects/" + code), owner), 200).path("data").path("urdfMainUrl")) + assertThat(confirmUrdf(owner, code, next, files, 400).path("code").asText()) + .isEqualTo("URDF_FILE_SIZE_MISMATCH"); + assertThat(confirmUrdf(owner, code, next, List.of(files.get(1)), 400).path("code").asText()) + .isEqualTo("URDF_MAIN_FILE_INVALID"); + assertThat( + perform(auth(get("/api/workspace/projects/" + code), owner), 200) + .path("data") + .path("urdfMainUrl")) .isEqualTo(current.path("urdfMainUrl")); // 模拟核验期间项目被删除,落库前必须重新校验。 ossObjects.objects.put(missingKey, new byte[24]); - ossObjects.afterHead = () -> jdbc.update("UPDATE project SET deleted = 1 WHERE project_code = ?", code); + ossObjects.afterHead = + () -> jdbc.update("UPDATE project SET deleted = 1 WHERE project_code = ?", code); confirmUrdf(owner, code, next, files, 404); - assertThat(jdbc.queryForObject("SELECT urdf_prefix FROM project WHERE project_code = ?", String.class, code)) + assertThat( + jdbc.queryForObject( + "SELECT urdf_prefix FROM project WHERE project_code = ?", + String.class, + code)) .contains(first.path("batchCode").asText()); } @ParameterizedTest @ValueSource(booleans = {false, true}) - void urdfForkCopiesIndependentObjectsAndCopyFailureDoesNotReturnReady(boolean legacy) throws Exception { + void urdfForkCopiesIndependentObjectsAndCopyFailureDoesNotReturnReady(boolean legacy) + throws Exception { String owner = login("urdf-fork-source@example.com"); String other = login("urdf-fork-target@example.com"); String code = create(owner, "URDF 来源"); @@ -560,8 +914,12 @@ class WorkflowTest { List> files = urdfFiles(); JsonNode uploaded = uploadUrdf(owner, code, files); JsonNode source = confirmUrdf(owner, code, uploaded, files, 200).path("data"); - if (legacy) jdbc.update("UPDATE project SET urdf_prefix = CONCAT('vibemake_dev', urdf_prefix)," - + " urdf_main_object_key = CONCAT('vibemake_dev', urdf_main_object_key) WHERE project_code = ?", code); + if (legacy) + jdbc.update( + "UPDATE project SET urdf_prefix = CONCAT('vibemake_dev', urdf_prefix)," + + " urdf_main_object_key = CONCAT('vibemake_dev', urdf_main_object_key)" + + " WHERE project_code = ?", + code); String sha = head(owner, code); publish(owner, code, sha); String forkEndpoint = "/api/community/projects/" + code + "/forks"; @@ -569,24 +927,52 @@ class WorkflowTest { JsonNode fork = perform(body(auth(post(forkEndpoint), other), forkInput), 200).path("data"); String targetCode = fork.path("projectCode").asText(); assertThat(fork.path("repoStatus").asText()).isEqualTo("READY"); - assertThat(fork.path("urdfMainUrl").asText()).contains("/urdf/" + targetCode + "/").doesNotContain("/urdf/" + code + "/"); - String targetPrefix = jdbc.queryForObject("SELECT urdf_prefix FROM project WHERE project_code = ?", String.class, targetCode); + assertThat(fork.path("urdfMainUrl").asText()) + .contains("/urdf/" + targetCode + "/") + .doesNotContain("/urdf/" + code + "/"); + String targetPrefix = + jdbc.queryForObject( + "SELECT urdf_prefix FROM project WHERE project_code = ?", + String.class, + targetCode); assertThat(targetPrefix).startsWith("/urdf/" + targetCode + "/"); for (int index = 0; index < files.size(); index++) - assertThat(ossObjects.objects.get("vibemake_dev" + targetPrefix + files.get(index).get("relativePath"))) - .containsExactly(ossObjects.objects.get(uploaded.path("files").get(index).path("objectKey").asText())); + assertThat( + ossObjects.objects.get( + "vibemake_dev" + + targetPrefix + + files.get(index).get("relativePath"))) + .containsExactly( + ossObjects.objects.get( + uploaded.path("files").get(index).path("objectKey").asText())); confirmUrdf(owner, code, uploadUrdf(owner, code, files), files, 200); perform(auth(delete("/api/workspace/projects/" + code + "/urdf"), owner), 200); - assertThat(perform(auth(get("/api/workspace/projects/" + targetCode), other), 200).path("data").path("urdfMainUrl")) + assertThat( + perform(auth(get("/api/workspace/projects/" + targetCode), other), 200) + .path("data") + .path("urdfMainUrl")) .isEqualTo(fork.path("urdfMainUrl")); confirmUrdf(owner, code, uploaded, files, 200); ossObjects.failNextCopy = true; JsonNode failure = perform(body(auth(post(forkEndpoint), other), forkInput), 502); String failedCode = failure.path("data").path("projectCode").asText(); assertThat(failedCode).isNotEmpty(); - assertThat(jdbc.queryForObject("SELECT repo_status FROM project WHERE project_code = ?", String.class, failedCode)).isEqualTo("FAILED"); - assertThat(jdbc.queryForObject("SELECT urdf_prefix FROM project WHERE project_code = ?", String.class, failedCode)).isEmpty(); - assertThat(perform(get("/api/community/projects/" + code), 200).path("data").path("urdfMainUrl")) + assertThat( + jdbc.queryForObject( + "SELECT repo_status FROM project WHERE project_code = ?", + String.class, + failedCode)) + .isEqualTo("FAILED"); + assertThat( + jdbc.queryForObject( + "SELECT urdf_prefix FROM project WHERE project_code = ?", + String.class, + failedCode)) + .isEmpty(); + assertThat( + perform(get("/api/community/projects/" + code), 200) + .path("data") + .path("urdfMainUrl")) .isEqualTo(source.path("urdfMainUrl")); } @@ -596,7 +982,8 @@ class WorkflowTest { Map input = Map.of("contentType", "image/png", "fileSize", 123); perform(body(post(endpoint), input), 401); String token = login("upload@example.com"); - assertThat(perform(body(auth(post(endpoint), token), input), 503).path("code").asText()).isEqualTo("OSS_UNAVAILABLE"); + assertThat(perform(body(auth(post(endpoint), token), input), 503).path("code").asText()) + .isEqualTo("OSS_UNAVAILABLE"); assertThat(oss.getRootDirectory()).isEqualTo("vibemake_dev"); oss.setRegion("cn-hangzhou"); oss.setEndpoint(""); @@ -605,24 +992,45 @@ class WorkflowTest { oss.setAccessKeySecret("unit-test-secret"); oss.setPublicBaseUrl("https://images.example.com"); oss.setEnabled(true); - String userCode = perform(auth(get("/api/users/me"), token), 200).path("data").path("userCode").asText(); + String userCode = + perform(auth(get("/api/users/me"), token), 200) + .path("data") + .path("userCode") + .asText(); for (String type : List.of("image/jpeg", "image/png", "image/webp")) { - JsonNode result = perform(body(auth(post(endpoint), token), Map.of("contentType", type, "fileSize", 5242880)), 200).path("data"); - assertThat(result.path("objectKey").asText()).startsWith("vibemake_dev/project-covers/" + userCode + "/"); - assertThat(result.path("uploadUrl").asText()).isEqualTo("https://examplebucket.oss-cn-hangzhou.aliyuncs.com"); - assertThat(result.path("coverUrl").asText()).isEqualTo("https://images.example.com/" + result.path("objectKey").asText()); + JsonNode result = + perform( + body( + auth(post(endpoint), token), + Map.of("contentType", type, "fileSize", 5242880)), + 200) + .path("data"); + assertThat(result.path("objectKey").asText()) + .startsWith("vibemake_dev/project-covers/" + userCode + "/"); + assertThat(result.path("uploadUrl").asText()) + .isEqualTo("https://examplebucket.oss-cn-hangzhou.aliyuncs.com"); + assertThat(result.path("coverUrl").asText()) + .isEqualTo("https://images.example.com/" + result.path("objectKey").asText()); assertThat(result.path("formFields").path("content-type").asText()).isEqualTo(type); assertThat(result.toString()).doesNotContain("unit-test-secret"); } - for (Object invalid : List.of( - Map.of("contentType", "image/svg+xml", "fileSize", 1), - Map.of("contentType", "image/png", "fileSize", 0), - Map.of("contentType", "image/png", "fileSize", -1), - Map.of("contentType", "image/png"), Map.of("fileSize", 1))) + for (Object invalid : + List.of( + Map.of("contentType", "image/svg+xml", "fileSize", 1), + Map.of("contentType", "image/png", "fileSize", 0), + Map.of("contentType", "image/png", "fileSize", -1), + Map.of("contentType", "image/png"), + Map.of("fileSize", 1))) perform(body(auth(post(endpoint), token), invalid), 400); - JsonNode tooLarge = perform(body(auth(post(endpoint), token), Map.of("contentType", "image/png", "fileSize", 5242881)), 413); + JsonNode tooLarge = + perform( + body( + auth(post(endpoint), token), + Map.of("contentType", "image/png", "fileSize", 5242881)), + 413); assertThat(tooLarge.path("code").asText()).isEqualTo("UPLOAD_TOO_LARGE"); - mvc.perform(body(auth(post(endpoint), token), input)).andExpect(header().string("Cache-Control", "no-store")); + mvc.perform(body(auth(post(endpoint), token), input)) + .andExpect(header().string("Cache-Control", "no-store")); assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project", Long.class)).isZero(); JsonNode spec = perform(get("/v3/api-docs"), 200); assertThat(spec.path("paths").has(endpoint)).isTrue(); @@ -672,11 +1080,13 @@ class WorkflowTest { jdbc.update( "INSERT INTO sys_user (user_code, email, nickname, status, created_at, updated_at)" + " VALUES (?, ?, ?, 'ACTIVE', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)", - legacyCode, "legacy@example.com", "历史用户"); + legacyCode, + "legacy@example.com", + "历史用户"); JsonNode data = loginData("LEGACY@example.com"); assertThat(data.path("user").path("userCode").asText()).isEqualTo(legacyCode); - JsonNode me = perform(auth(get("/api/users/me"), data.path("token").asText()), 200) - .path("data"); + JsonNode me = + perform(auth(get("/api/users/me"), data.path("token").asText()), 200).path("data"); assertThat(me.path("userCode").asText()).isEqualTo(legacyCode); assertThat(me.has("id")).isFalse(); assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM sys_user", Long.class)).isEqualTo(1L); @@ -696,7 +1106,11 @@ class WorkflowTest { + " table_schema='PUBLIC'", String.class)) .containsExactlyInAnyOrder( - "SYS_USER", "PROJECT", "PROJECT_COMMENT", "PROJECT_LIKE", "PROJECT_IMPORT_TASK"); + "SYS_USER", + "PROJECT", + "PROJECT_COMMENT", + "PROJECT_LIKE", + "PROJECT_IMPORT_TASK"); } @Test @@ -706,8 +1120,12 @@ class WorkflowTest { String sha = head(token, source); publish(token, source, sha); snapshots.available = false; - JsonNode error = perform(body(auth(post("/api/community/projects/" + source + "/forks"), token), - Map.of("name", "副本", "publishedCommitSha", sha)), 503); + JsonNode error = + perform( + body( + auth(post("/api/community/projects/" + source + "/forks"), token), + Map.of("name", "副本", "publishedCommitSha", sha)), + 503); assertThat(error.path("code").asText()).isEqualTo("FORK_UNAVAILABLE"); assertThat(jdbc.queryForObject("SELECT COUNT(*) FROM project", Integer.class)).isEqualTo(1); } @@ -718,22 +1136,58 @@ class WorkflowTest { String source = create(token, "来源"); String sha = head(token, source); publish(token, source, sha); - snapshots.beforePush = () -> { throw new BusinessException(502, "FORK_COPY_FAILED", "模拟复制失败"); }; - JsonNode failed = perform(body(auth(post("/api/community/projects/" + source + "/forks"), token), - Map.of("name", "失败副本", "publishedCommitSha", sha)), 502); + snapshots.beforePush = + () -> { + throw new BusinessException(502, "FORK_COPY_FAILED", "模拟复制失败"); + }; + JsonNode failed = + perform( + body( + auth(post("/api/community/projects/" + source + "/forks"), token), + Map.of("name", "失败副本", "publishedCommitSha", sha)), + 502); String failedCode = failed.path("data").path("projectCode").asText(); assertThat(failed.path("code").asText()).isEqualTo("FORK_COPY_FAILED"); - assertThat(jdbc.queryForObject("SELECT repo_status FROM project WHERE project_code = ?", String.class, failedCode)).isEqualTo("FAILED"); - assertThat(jdbc.queryForObject("SELECT gitea_repo_id FROM project WHERE project_code = ?", Long.class, failedCode)).isPositive(); + assertThat( + jdbc.queryForObject( + "SELECT repo_status FROM project WHERE project_code = ?", + String.class, + failedCode)) + .isEqualTo("FAILED"); + assertThat( + jdbc.queryForObject( + "SELECT gitea_repo_id FROM project WHERE project_code = ?", + Long.class, + failedCode)) + .isPositive(); snapshots.beforePush = null; gitea.timeoutNextCommit = true; - JsonNode unknown = perform(body(auth(post("/api/community/projects/" + source + "/forks"), token), - Map.of("name", "待核对副本", "publishedCommitSha", sha)), 504); + JsonNode unknown = + perform( + body( + auth(post("/api/community/projects/" + source + "/forks"), token), + Map.of("name", "待核对副本", "publishedCommitSha", sha)), + 504); String unknownCode = unknown.path("data").path("projectCode").asText(); assertThat(unknown.path("code").asText()).isEqualTo("REMOTE_RESULT_UNKNOWN"); - assertThat(jdbc.queryForObject("SELECT repo_status FROM project WHERE project_code = ?", String.class, unknownCode)).isEqualTo("CREATING"); - assertThat(jdbc.queryForObject("SELECT gitea_repo_id FROM project WHERE project_code = ?", Long.class, unknownCode)).isPositive(); - assertThat(jdbc.queryForObject("SELECT repo_status FROM project WHERE project_code = ?", String.class, source)).isEqualTo("READY"); + assertThat( + jdbc.queryForObject( + "SELECT repo_status FROM project WHERE project_code = ?", + String.class, + unknownCode)) + .isEqualTo("CREATING"); + assertThat( + jdbc.queryForObject( + "SELECT gitea_repo_id FROM project WHERE project_code = ?", + Long.class, + unknownCode)) + .isPositive(); + assertThat( + jdbc.queryForObject( + "SELECT repo_status FROM project WHERE project_code = ?", + String.class, + source)) + .isEqualTo("READY"); } @Test @@ -1112,23 +1566,37 @@ class WorkflowTest { perform(auth(delete("/api/workspace/projects/" + code + "/publication"), owner), 200); perform(auth(delete("/api/workspace/projects/" + code), owner), 200); } + @Test - void disabledReenabledAndPromotedAccountsCannotReuseCommunitySessions() throws Exception { + void disabledReenabledAndPromotedAccountsCannotReuseVibemakeSessions() throws Exception { String email = "role-check@example.invalid"; JsonNode loggedIn = loginData(email); String token = loggedIn.path("token").asText(); String code = loggedIn.path("user").path("userCode").asText(); perform(auth(get("/api/users/me"), token), 200); - jdbc.update("UPDATE sys_user SET status='DISABLED', session_version=session_version+1 WHERE user_code=?", code); + jdbc.update( + "UPDATE sys_user SET status='DISABLED', session_version=session_version+1 WHERE" + + " user_code=?", + code); perform(auth(get("/api/users/me"), token), 401); - jdbc.update("UPDATE sys_user SET status='ACTIVE', session_version=session_version+1 WHERE user_code=?", code); + jdbc.update( + "UPDATE sys_user SET status='ACTIVE', session_version=session_version+1 WHERE" + + " user_code=?", + code); perform(auth(get("/api/users/me"), token), 401); String fresh = login(email); perform(auth(get("/api/users/me"), fresh), 200); - jdbc.update("UPDATE sys_user SET role='ADMIN', session_version=session_version+1 WHERE user_code=?", code); + jdbc.update( + "UPDATE sys_user SET role='ADMIN', session_version=session_version+1 WHERE" + + " user_code=?", + code); perform(auth(get("/api/users/me"), fresh), 401); - String captcha = perform(get("/api/auth/captcha"), 200).path("data").path("captchaCode").asText(); - perform(body(post("/api/auth/login"), Map.of("email",email,"captchaCode",captcha,"captchaAnswer","ABCDE")),403); + String captcha = + perform(get("/api/auth/captcha"), 200).path("data").path("captchaCode").asText(); + perform( + body( + post("/api/auth/login"), + Map.of("email", email, "captchaCode", captcha, "captchaAnswer", "ABCDE")), + 403); } - } diff --git a/community-bean/pom.xml b/vibemake-bean/pom.xml similarity index 88% rename from community-bean/pom.xml rename to vibemake-bean/pom.xml index 3bcfe1b..84ba0df 100644 --- a/community-bean/pom.xml +++ b/vibemake-bean/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.linkerbot - community + vibemake 0.0.1-SNAPSHOT - community-bean + vibemake-bean com.baomidou diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/AdminContracts.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/AdminContracts.java similarity index 90% rename from community-bean/src/main/java/com/linkerbot/community/bean/AdminContracts.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/AdminContracts.java index 9b931b9..7317f13 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/AdminContracts.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/AdminContracts.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.bean; +package com.linkerbot.vibemake.bean; -import com.linkerbot.community.bean.Contracts.ProjectInput; -import com.linkerbot.community.bean.Contracts.ProjectView; -import com.linkerbot.community.bean.Contracts.UrdfConfirmInput; -import com.linkerbot.community.bean.Contracts.UrdfFile; +import com.linkerbot.vibemake.bean.Contracts.ProjectInput; +import com.linkerbot.vibemake.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.Contracts.UrdfConfirmInput; +import com.linkerbot.vibemake.bean.Contracts.UrdfFile; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/Contracts.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/Contracts.java similarity index 99% rename from community-bean/src/main/java/com/linkerbot/community/bean/Contracts.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/Contracts.java index 03d997e..805b174 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/Contracts.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/Contracts.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.bean; +package com.linkerbot.vibemake.bean; import jakarta.validation.Valid; import jakarta.validation.constraints.*; diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/ai/AiContracts.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/ai/AiContracts.java similarity index 94% rename from community-bean/src/main/java/com/linkerbot/community/bean/ai/AiContracts.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/ai/AiContracts.java index 2813206..b938c29 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/ai/AiContracts.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/ai/AiContracts.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.bean.ai; +package com.linkerbot.vibemake.bean.ai; -import com.linkerbot.community.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.Contracts.ProjectView; import jakarta.validation.Valid; import jakarta.validation.constraints.*; import java.util.List; diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/entity/BaseEntity.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/BaseEntity.java similarity index 89% rename from community-bean/src/main/java/com/linkerbot/community/bean/entity/BaseEntity.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/BaseEntity.java index c0e976f..f01081a 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/entity/BaseEntity.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.bean.entity; +package com.linkerbot.vibemake.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/entity/Project.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/Project.java similarity index 95% rename from community-bean/src/main/java/com/linkerbot/community/bean/entity/Project.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/Project.java index da2b624..346700b 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/entity/Project.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/Project.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.bean.entity; +package com.linkerbot.vibemake.bean.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectComment.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectComment.java similarity index 88% rename from community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectComment.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectComment.java index 7acff7b..5bc7d2a 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectComment.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectComment.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.bean.entity; +package com.linkerbot.vibemake.bean.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectImportTask.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectImportTask.java similarity index 94% rename from community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectImportTask.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectImportTask.java index b04a87b..856acba 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectImportTask.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectImportTask.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.bean.entity; +package com.linkerbot.vibemake.bean.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectLike.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectLike.java similarity index 90% rename from community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectLike.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectLike.java index 68f37bd..3c0aeae 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/entity/ProjectLike.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/ProjectLike.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.bean.entity; +package com.linkerbot.vibemake.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/community-bean/src/main/java/com/linkerbot/community/bean/entity/User.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/User.java similarity index 89% rename from community-bean/src/main/java/com/linkerbot/community/bean/entity/User.java rename to vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/User.java index efc47f0..f9f438b 100644 --- a/community-bean/src/main/java/com/linkerbot/community/bean/entity/User.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/User.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.bean.entity; +package com.linkerbot.vibemake.bean.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/community-common/pom.xml b/vibemake-common/pom.xml similarity index 50% rename from community-common/pom.xml rename to vibemake-common/pom.xml index 4124d10..09b9329 100644 --- a/community-common/pom.xml +++ b/vibemake-common/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.linkerbot - community + vibemake 0.0.1-SNAPSHOT - community-common + vibemake-common org.springframework.boot @@ -17,4 +17,19 @@ spring-boot-starter-validation + + + + org.apache.maven.plugins + maven-jar-plugin + + + test-support + process-test-classes + test-jar + + + + + diff --git a/community-common/src/main/java/com/linkerbot/community/common/ApiResponse.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/ApiResponse.java similarity index 91% rename from community-common/src/main/java/com/linkerbot/community/common/ApiResponse.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/ApiResponse.java index 6cd2c4c..de8a23f 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/ApiResponse.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/ApiResponse.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; import org.slf4j.MDC; diff --git a/community-common/src/main/java/com/linkerbot/community/common/BusinessException.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/BusinessException.java similarity index 96% rename from community-common/src/main/java/com/linkerbot/community/common/BusinessException.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/BusinessException.java index 9a67d63..aa185d4 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/BusinessException.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/BusinessException.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; public class BusinessException extends RuntimeException { private final int status; diff --git a/community-common/src/main/java/com/linkerbot/community/common/Codes.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/Codes.java similarity index 81% rename from community-common/src/main/java/com/linkerbot/community/common/Codes.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/Codes.java index 96b8b49..ab1b4e3 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/Codes.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/Codes.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; import java.util.UUID; diff --git a/community-common/src/main/java/com/linkerbot/community/common/FilePaths.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/FilePaths.java similarity index 96% rename from community-common/src/main/java/com/linkerbot/community/common/FilePaths.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/FilePaths.java index 8845d06..3be8c96 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/FilePaths.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/FilePaths.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; import java.util.Locale; diff --git a/community-common/src/main/java/com/linkerbot/community/common/GlobalExceptionHandler.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/GlobalExceptionHandler.java similarity index 82% rename from community-common/src/main/java/com/linkerbot/community/common/GlobalExceptionHandler.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/GlobalExceptionHandler.java index e79c88d..7396e5b 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/GlobalExceptionHandler.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/GlobalExceptionHandler.java @@ -1,11 +1,11 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; import jakarta.validation.ConstraintViolationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.http.ResponseEntity; import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.web.HttpMediaTypeNotSupportedException; import org.springframework.web.HttpRequestMethodNotSupportedException; @@ -26,8 +26,13 @@ public class GlobalExceptionHandler { @ExceptionHandler(BusinessException.class) public ResponseEntity> business(BusinessException error) { // SSE 建流前也必须返回 JSON 错误,不受 Accept: text/event-stream 的限制。 - return ResponseEntity.status(error.status()).contentType(MediaType.APPLICATION_JSON) - .body(ApiResponse.failure(error)); + ResponseEntity.BodyBuilder response = + ResponseEntity.status(error.status()) + .contentType(MediaType.APPLICATION_JSON) + .header("Cache-Control", "no-store"); + if (error instanceof RateLimitedException limited) + response.header("Retry-After", Long.toString(limited.retryAfterSeconds())); + return response.body(ApiResponse.failure(error)); } @ExceptionHandler({ @@ -40,6 +45,8 @@ public class GlobalExceptionHandler { MissingServletRequestPartException.class }) public ResponseEntity> invalid(Exception error) { + for (Throwable cause = error; cause != null; cause = cause.getCause()) + if (cause instanceof RequestTooLargeException large) return business(large); return business(BusinessException.badRequest("请求参数不合法")); } @@ -65,7 +72,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(Exception.class) public ResponseEntity> unexpected(Exception error) { - log.error("未处理异常 type={}", error.getClass().getName()); + SafeExceptionLog.write(log, "未处理异常", error); return business(new BusinessException(500, "INTERNAL_ERROR", "服务暂时不可用,请提供 requestId 排查")); } } diff --git a/vibemake-common/src/main/java/com/linkerbot/vibemake/common/HttpFailures.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/HttpFailures.java new file mode 100644 index 0000000..71bd741 --- /dev/null +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/HttpFailures.java @@ -0,0 +1,22 @@ +package com.linkerbot.vibemake.common; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; + +public final class HttpFailures { + private HttpFailures() {} + + public static void write( + HttpServletResponse response, ObjectMapper json, BusinessException error) + throws IOException { + response.setStatus(error.status()); + response.setContentType("application/json;charset=UTF-8"); + response.setHeader("Cache-Control", "no-store"); + if (error instanceof RateLimitedException limited) + response.setHeader("Retry-After", Long.toString(limited.retryAfterSeconds())); + json.writeValue(response.getOutputStream(), ApiResponse.failure(error)); + } +} diff --git a/vibemake-common/src/main/java/com/linkerbot/vibemake/common/LimitedHttpBody.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/LimitedHttpBody.java new file mode 100644 index 0000000..a543c07 --- /dev/null +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/LimitedHttpBody.java @@ -0,0 +1,66 @@ +package com.linkerbot.vibemake.common; + +import java.io.IOException; +import java.net.http.HttpResponse; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; + +/** 在接收网络数据时终止超限响应,而非读完之后检查。 */ +public final class LimitedHttpBody implements HttpResponse.BodySubscriber { + public static final class TooLarge extends IOException {} + + private final HttpResponse.BodySubscriber delegate = + HttpResponse.BodySubscribers.ofByteArray(); + private final long maximum; + private long received; + private Flow.Subscription subscription; + private boolean stopped; + + public LimitedHttpBody(long maximum) { + this.maximum = maximum; + } + + @Override + public CompletionStage getBody() { + return delegate.getBody(); + } + + @Override + public void onSubscribe(Flow.Subscription value) { + subscription = value; + delegate.onSubscribe(value); + } + + @Override + public void onNext(List buffers) { + if (stopped) return; + for (ByteBuffer buffer : buffers) { + if (buffer.remaining() > maximum - received) { + stopped = true; + subscription.cancel(); + delegate.onError(new TooLarge()); + return; + } + received += buffer.remaining(); + } + delegate.onNext(buffers); + } + + @Override + public void onError(Throwable error) { + if (!stopped) { + stopped = true; + delegate.onError(error); + } + } + + @Override + public void onComplete() { + if (!stopped) { + stopped = true; + delegate.onComplete(); + } + } +} diff --git a/community-common/src/main/java/com/linkerbot/community/common/PageResponse.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/PageResponse.java similarity index 72% rename from community-common/src/main/java/com/linkerbot/community/common/PageResponse.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/PageResponse.java index ca7b1f4..1491d5c 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/PageResponse.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/PageResponse.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; import java.util.List; diff --git a/community-common/src/main/java/com/linkerbot/community/common/ProjectCodes.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/ProjectCodes.java similarity index 97% rename from community-common/src/main/java/com/linkerbot/community/common/ProjectCodes.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/ProjectCodes.java index 3bcbcbd..044f304 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/ProjectCodes.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/ProjectCodes.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/vibemake-common/src/main/java/com/linkerbot/vibemake/common/RateLimitedException.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/RateLimitedException.java new file mode 100644 index 0000000..784009b --- /dev/null +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/RateLimitedException.java @@ -0,0 +1,16 @@ +package com.linkerbot.vibemake.common; + +import java.util.Map; + +public class RateLimitedException extends BusinessException { + private final long retryAfterSeconds; + + public RateLimitedException(String code, String message, long retryAfterSeconds) { + super(429, code, message, Map.of("retryAfterSeconds", Math.max(1, retryAfterSeconds))); + this.retryAfterSeconds = Math.max(1, retryAfterSeconds); + } + + public long retryAfterSeconds() { + return retryAfterSeconds; + } +} diff --git a/community-common/src/main/java/com/linkerbot/community/common/RequestIdFilter.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/RequestIdFilter.java similarity index 96% rename from community-common/src/main/java/com/linkerbot/community/common/RequestIdFilter.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/RequestIdFilter.java index dddc576..9221631 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/RequestIdFilter.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/RequestIdFilter.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/vibemake-common/src/main/java/com/linkerbot/vibemake/common/RequestTooLargeException.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/RequestTooLargeException.java new file mode 100644 index 0000000..ea4048a --- /dev/null +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/RequestTooLargeException.java @@ -0,0 +1,7 @@ +package com.linkerbot.vibemake.common; + +public class RequestTooLargeException extends BusinessException { + public RequestTooLargeException() { + super(413, "REQUEST_TOO_LARGE", "请求体超过大小限制"); + } +} diff --git a/vibemake-common/src/main/java/com/linkerbot/vibemake/common/SafeExceptionLog.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/SafeExceptionLog.java new file mode 100644 index 0000000..771cb37 --- /dev/null +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/SafeExceptionLog.java @@ -0,0 +1,43 @@ +package com.linkerbot.vibemake.common; + +import org.slf4j.Logger; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.servlet.HandlerMapping; + +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Set; + +/** 仅输出类型、栈帧及 SQL 错误分类,不输出异常消息、SQL 或请求参数。 */ +public final class SafeExceptionLog { + private SafeExceptionLog() {} + + public static void write(Logger log, String operation, Throwable error) { + Object route = null; + if (RequestContextHolder.getRequestAttributes() + instanceof ServletRequestAttributes attributes) + route = + attributes + .getRequest() + .getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE); + List causes = new ArrayList<>(); + List frames = new ArrayList<>(); + Set seen = Collections.newSetFromMap(new IdentityHashMap<>()); + for (Throwable cause = error; + cause != null && seen.add(cause) && seen.size() <= 10; + cause = cause.getCause()) { + causes.add(cause.getClass().getName()); + if (cause instanceof SQLException sql) + causes.add("sqlState=" + sql.getSQLState() + ",vendorCode=" + sql.getErrorCode()); + for (StackTraceElement frame : cause.getStackTrace()) + if (frame.getClassName().startsWith("com.linkerbot.") && frames.size() < 24) + frames.add(frame); + } + log.error( + "{} route={} errorTypes={} applicationFrames={}", operation, route, causes, frames); + } +} diff --git a/vibemake-common/src/main/java/com/linkerbot/vibemake/common/SecurityHashes.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/SecurityHashes.java new file mode 100644 index 0000000..01ba231 --- /dev/null +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/SecurityHashes.java @@ -0,0 +1,21 @@ +package com.linkerbot.vibemake.common; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HexFormat; + +public final class SecurityHashes { + private SecurityHashes() {} + + public static String sha256(String value) { + try { + return HexFormat.of() + .formatHex( + MessageDigest.getInstance("SHA-256") + .digest(value.getBytes(StandardCharsets.UTF_8))); + } catch (NoSuchAlgorithmException error) { + throw new IllegalStateException("SHA-256 不可用"); + } + } +} diff --git a/community-common/src/main/java/com/linkerbot/community/common/UserCodes.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/UserCodes.java similarity index 93% rename from community-common/src/main/java/com/linkerbot/community/common/UserCodes.java rename to vibemake-common/src/main/java/com/linkerbot/vibemake/common/UserCodes.java index 93e3e69..24bbb8d 100644 --- a/community-common/src/main/java/com/linkerbot/community/common/UserCodes.java +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/UserCodes.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.common; +package com.linkerbot.vibemake.common; import java.security.SecureRandom; diff --git a/vibemake-common/src/main/java/com/linkerbot/vibemake/common/state/TransientStateStore.java b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/state/TransientStateStore.java new file mode 100644 index 0000000..b80928b --- /dev/null +++ b/vibemake-common/src/main/java/com/linkerbot/vibemake/common/state/TransientStateStore.java @@ -0,0 +1,22 @@ +package com.linkerbot.vibemake.common.state; + +import java.time.Duration; + +/** 短期安全状态;实现必须保证消费、计数和过期操作的原子性。 */ +public interface TransientStateStore { + record Window(long count, long retryAfterSeconds) {} + + boolean putIfAbsent(String key, String value, Duration ttl); + + String get(String key); + + String consume(String key); + + void remove(String key); + + long remainingSeconds(String key); + + Window increment(String key, Duration ttl, boolean refreshTtl); + + void verify(); +} diff --git a/community-common/src/main/resources/logback-spring.xml b/vibemake-common/src/main/resources/logback-spring.xml similarity index 97% rename from community-common/src/main/resources/logback-spring.xml rename to vibemake-common/src/main/resources/logback-spring.xml index 501e825..925bad8 100644 --- a/community-common/src/main/resources/logback-spring.xml +++ b/vibemake-common/src/main/resources/logback-spring.xml @@ -1,6 +1,6 @@ - + appender = new ListAppender<>(); + appender.start(); + logger.addAppender(appender); + try { + SafeExceptionLog.write( + logger, + "fixture", + new IllegalStateException( + "password=hidden-secret", + new SQLException("INSERT private_token=hidden-secret", "23000", 1062))); + assertThat(appender.list).hasSize(1); + String output = appender.list.getFirst().getFormattedMessage(); + assertThat(output) + .contains("23000", "1062", "SafeExceptionLogTest") + .doesNotContain("hidden-secret", "INSERT", "password="); + assertThat(appender.list.getFirst().getThrowableProxy()).isNull(); + } finally { + logger.detachAppender(appender); + appender.stop(); + } + } +} diff --git a/vibemake-common/src/test/java/com/linkerbot/vibemake/testing/InMemoryStateStore.java b/vibemake-common/src/test/java/com/linkerbot/vibemake/testing/InMemoryStateStore.java new file mode 100644 index 0000000..7fa4f44 --- /dev/null +++ b/vibemake-common/src/test/java/com/linkerbot/vibemake/testing/InMemoryStateStore.java @@ -0,0 +1,90 @@ +package com.linkerbot.vibemake.testing; + +import com.linkerbot.vibemake.common.state.TransientStateStore; + +import java.time.Duration; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicReference; + +/** 仅随 tests 分类制品发布,在线应用不包含该实现。 */ +public final class InMemoryStateStore implements TransientStateStore { + private record Entry(String value, long expires) {} + + private final ConcurrentHashMap entries = new ConcurrentHashMap<>(); + + private boolean live(Entry entry) { + return entry != null && entry.expires() > System.nanoTime(); + } + + @Override + public boolean putIfAbsent(String key, String value, Duration ttl) { + AtomicReference inserted = new AtomicReference<>(false); + entries.compute( + key, + (ignored, previous) -> { + if (live(previous)) return previous; + inserted.set(true); + return new Entry(value, System.nanoTime() + ttl.toNanos()); + }); + return inserted.get(); + } + + @Override + public String get(String key) { + Entry entry = + entries.computeIfPresent( + key, (ignored, previous) -> live(previous) ? previous : null); + return entry == null ? null : entry.value(); + } + + @Override + public String consume(String key) { + AtomicReference value = new AtomicReference<>(); + entries.computeIfPresent( + key, + (ignored, previous) -> { + if (live(previous)) value.set(previous.value()); + return null; + }); + return value.get(); + } + + @Override + public void remove(String key) { + entries.remove(key); + } + + @Override + public long remainingSeconds(String key) { + Entry entry = entries.get(key); + return !live(entry) + ? 0 + : Math.max(1, (entry.expires() - System.nanoTime() + 999999999) / 1000000000); + } + + @Override + public Window increment(String key, Duration ttl, boolean refreshTtl) { + Entry entry = + entries.compute( + key, + (ignored, previous) -> { + boolean exists = live(previous); + long count = exists ? Long.parseLong(previous.value()) + 1 : 1; + long expires = + exists && !refreshTtl + ? previous.expires() + : System.nanoTime() + ttl.toNanos(); + return new Entry(Long.toString(count), expires); + }); + return new Window( + Long.parseLong(entry.value()), + Math.max(1, (entry.expires() - System.nanoTime() + 999999999) / 1000000000)); + } + + @Override + public void verify() {} + + public void clear() { + entries.clear(); + } +} diff --git a/vibemake-common/src/test/java/com/linkerbot/vibemake/testing/StateContextCustomizerFactory.java b/vibemake-common/src/test/java/com/linkerbot/vibemake/testing/StateContextCustomizerFactory.java new file mode 100644 index 0000000..539064f --- /dev/null +++ b/vibemake-common/src/test/java/com/linkerbot/vibemake/testing/StateContextCustomizerFactory.java @@ -0,0 +1,46 @@ +package com.linkerbot.vibemake.testing; + +import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.test.context.*; +import org.springframework.test.context.support.TestPropertySourceUtils; + +import java.util.List; + +public final class StateContextCustomizerFactory implements ContextCustomizerFactory { + @Override + public ContextCustomizer createContextCustomizer( + Class testClass, List attributes) { + return new Customizer(); + } + + private static final class Customizer implements ContextCustomizer { + @Override + public void customizeContext( + ConfigurableApplicationContext context, MergedContextConfiguration configuration) { + if (java.util.Arrays.asList(configuration.getPropertySourceProperties()) + .contains("vibemake.redis.real-test=true")) return; + RootBeanDefinition definition = new RootBeanDefinition(InMemoryStateStore.class); + definition.setPrimary(true); + ((org.springframework.beans.factory.support.BeanDefinitionRegistry) + context.getBeanFactory()) + .registerBeanDefinition("testStateStore", definition); + boolean configured = + java.util.Arrays.stream(configuration.getPropertySourceProperties()) + .anyMatch(value -> value.startsWith("vibemake.limits.enabled=")); + if (!configured) + TestPropertySourceUtils.addInlinedPropertiesToEnvironment( + context, "vibemake.limits.enabled=false"); + } + + @Override + public boolean equals(Object other) { + return other instanceof Customizer; + } + + @Override + public int hashCode() { + return Customizer.class.hashCode(); + } + } +} diff --git a/vibemake-common/src/test/resources/META-INF/spring.factories b/vibemake-common/src/test/resources/META-INF/spring.factories new file mode 100644 index 0000000..0f6a6d7 --- /dev/null +++ b/vibemake-common/src/test/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.test.context.ContextCustomizerFactory=com.linkerbot.vibemake.testing.StateContextCustomizerFactory diff --git a/community-import/pom.xml b/vibemake-import/pom.xml similarity index 57% rename from community-import/pom.xml rename to vibemake-import/pom.xml index ea089a8..2a9295b 100644 --- a/community-import/pom.xml +++ b/vibemake-import/pom.xml @@ -1,10 +1,17 @@ 4.0.0 - com.linkerbotcommunity0.0.1-SNAPSHOT - community-import + com.linkerbotvibemake0.0.1-SNAPSHOT + vibemake-import - com.linkerbotcommunity-service${project.version} + + com.linkerbot + vibemake-common + ${project.version} + test-jar + test + + com.linkerbotvibemake-service${project.version} com.mysqlmysql-connector-jruntime com.h2databaseh2test diff --git a/community-import/src/main/java/com/linkerbot/community/importer/DatabaseConfiguration.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/DatabaseConfiguration.java similarity index 50% rename from community-import/src/main/java/com/linkerbot/community/importer/DatabaseConfiguration.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/DatabaseConfiguration.java index 35230b9..dacd9c1 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/DatabaseConfiguration.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/DatabaseConfiguration.java @@ -1,13 +1,13 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.config.MybatisConfiguration; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.oss.OssResourcePaths; -import com.linkerbot.community.service.gitea.RestGiteaClient; -import com.linkerbot.community.service.impl.ProjectServiceImpl; -import com.linkerbot.community.service.impl.UserServiceImpl; -import com.linkerbot.community.service.support.ProjectLocks; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.config.MybatisConfiguration; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.gitea.RestGiteaClient; +import com.linkerbot.vibemake.service.impl.ProjectServiceImpl; +import com.linkerbot.vibemake.service.impl.UserServiceImpl; +import com.linkerbot.vibemake.service.support.ProjectLocks; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -17,9 +17,9 @@ import org.springframework.context.annotation.Import; /** 仅加载资源路径配置,不初始化在线安全、AI 或 OSS 客户端。 */ @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration -@MapperScan("com.linkerbot.community.service.mapper") +@MapperScan("com.linkerbot.vibemake.service.mapper") @Import({ - CommunityProperties.class, + VibemakeProperties.class, MybatisConfiguration.class, RestGiteaClient.class, ProjectServiceImpl.class, diff --git a/community-import/src/main/java/com/linkerbot/community/importer/ImportApplication.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportApplication.java similarity index 93% rename from community-import/src/main/java/com/linkerbot/community/importer/ImportApplication.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportApplication.java index 18f3bea..e81157f 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/ImportApplication.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportApplication.java @@ -1,18 +1,18 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import static com.linkerbot.community.importer.ImportModels.*; +import static com.linkerbot.vibemake.importer.ImportModels.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.common.ProjectCodes; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.oss.OssResourcePaths; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.gitea.*; -import com.linkerbot.community.service.mapper.ProjectMapper; -import com.linkerbot.community.service.mapper.UserMapper; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.ProjectCodes; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.gitea.*; +import com.linkerbot.vibemake.service.mapper.ProjectMapper; +import com.linkerbot.vibemake.service.mapper.UserMapper; import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -92,7 +92,7 @@ public final class ImportApplication { public static void main(String[] args) { if (args.length > 0 && "covers".equals(args[0])) { - int status = com.linkerbot.community.importer.cover.CoverMigrationApplication.runCli( + int status = com.linkerbot.vibemake.importer.cover.CoverMigrationApplication.runCli( Arrays.copyOfRange(args, 1, args.length)); if (status != 0) System.exit(status); return; @@ -136,7 +136,7 @@ public final class ImportApplication { store.report(); return 0; } - CommunityProperties config = environmentConfig(); + VibemakeProperties config = environmentConfig(); if (store.manifest.giteaBaseUrl != null && (!store.manifest.giteaBaseUrl.equals(config.getGitea().getBaseUrl()) || !store.manifest.giteaOrganization.equals( @@ -230,11 +230,11 @@ public final class ImportApplication { context.getBean(ProjectMapper.class), context.getBean(ProjectService.class), context.getBean(GiteaClient.class), - context.getBean(CommunityProperties.class), + context.getBean(VibemakeProperties.class), context.getBean(OssResourcePaths.class), store, owner, - options.migrationTimeout()).locks(context.getBean(com.linkerbot.community.service.support.ProjectLocks.class)); + options.migrationTimeout()).locks(context.getBean(com.linkerbot.vibemake.service.support.ProjectLocks.class)); try (ExecutorService executor = Executors.newFixedThreadPool(options.concurrency())) { try { @@ -291,8 +291,8 @@ public final class ImportApplication { entry.candidate.sheet(), entry.candidate.row(), code); } - private static CommunityProperties environmentConfig() { - CommunityProperties config = new CommunityProperties(); + private static VibemakeProperties environmentConfig() { + VibemakeProperties config = new VibemakeProperties(); String baseUrl = System.getenv() .getOrDefault("GITEA_BASE_URL", "http://localhost:3000") @@ -305,7 +305,7 @@ public final class ImportApplication { || !("http".equals(base.getScheme()) || "https".equals(base.getScheme()))) throw new ImportFailure("INVALID_GITEA_URL", "Gitea 基础地址不能包含凭据、查询或片段"); config.getGitea().setBaseUrl(baseUrl); - config.getGitea().setOwner(System.getenv().getOrDefault("GITEA_ORGANIZATION", "community")); + config.getGitea().setOwner(System.getenv().getOrDefault("GITEA_ORGANIZATION", "vibemake")); config.getGitea().setToken(System.getenv().getOrDefault("GITEA_TOKEN", "")); return config; } diff --git a/community-import/src/main/java/com/linkerbot/community/importer/ImportCoordinator.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportCoordinator.java similarity index 92% rename from community-import/src/main/java/com/linkerbot/community/importer/ImportCoordinator.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportCoordinator.java index 7c18393..008cfef 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/ImportCoordinator.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportCoordinator.java @@ -1,18 +1,18 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import static com.linkerbot.community.importer.ImportModels.*; +import static com.linkerbot.vibemake.importer.ImportModels.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.gitea.*; -import com.linkerbot.community.service.gitea.GiteaClient.RemoteRepository; -import com.linkerbot.community.service.mapper.ProjectMapper; -import com.linkerbot.community.service.oss.OssResourcePaths; -import com.linkerbot.community.service.support.ProjectInputs; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.gitea.*; +import com.linkerbot.vibemake.service.gitea.GiteaClient.RemoteRepository; +import com.linkerbot.vibemake.service.mapper.ProjectMapper; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.support.ProjectInputs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,16 +27,16 @@ public final class ImportCoordinator { private final ProjectMapper projects; private final ProjectService service; private final GiteaClient gitea; - private final CommunityProperties config; + private final VibemakeProperties config; private final OssResourcePaths resourcePaths; private final StateStore store; private final User owner; private final Duration timeout; private final String batch; - private com.linkerbot.community.service.support.ProjectLocks sharedLocks = - new com.linkerbot.community.service.support.ProjectLocks(); + private com.linkerbot.vibemake.service.support.ProjectLocks sharedLocks = + new com.linkerbot.vibemake.service.support.ProjectLocks(); - public ImportCoordinator locks(com.linkerbot.community.service.support.ProjectLocks locks) { + public ImportCoordinator locks(com.linkerbot.vibemake.service.support.ProjectLocks locks) { this.sharedLocks = locks; return this; } @@ -54,7 +54,7 @@ public final class ImportCoordinator { ProjectMapper projects, ProjectService service, GiteaClient gitea, - CommunityProperties config, + VibemakeProperties config, OssResourcePaths resourcePaths, StateStore store, User owner, @@ -74,7 +74,7 @@ public final class ImportCoordinator { public void run(Entry entry) throws IOException { try { - com.linkerbot.community.service.support.ProjectLocks shared = sharedLocks; + com.linkerbot.vibemake.service.support.ProjectLocks shared = sharedLocks; shared.serial( entry.projectCode, () -> { @@ -199,10 +199,10 @@ public final class ImportCoordinator { log.info("分支适配结果已核对 batch={} projectCode={}", batch, entry.projectCode); } - com.linkerbot.community.service.migration.RepositoryMigration engine = - new com.linkerbot.community.service.migration.RepositoryMigration( + com.linkerbot.vibemake.service.migration.RepositoryMigration engine = + new com.linkerbot.vibemake.service.migration.RepositoryMigration( gitea, config.getGitea().getOwner()); - com.linkerbot.community.service.migration.RepositoryMigration.Result migrated; + com.linkerbot.vibemake.service.migration.RepositoryMigration.Result migrated; try { migrated = sharedLocks.write( @@ -215,7 +215,7 @@ public final class ImportCoordinator { entry.source.defaultBranch(), repoName, timeout, - new com.linkerbot.community.service.migration + new com.linkerbot.vibemake.service.migration .RepositoryMigration.Progress() { public RemoteRepository receipt() { return entry.receipt; diff --git a/community-import/src/main/java/com/linkerbot/community/importer/ImportFailure.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportFailure.java similarity index 89% rename from community-import/src/main/java/com/linkerbot/community/importer/ImportFailure.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportFailure.java index 61a1525..f5f48fc 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/ImportFailure.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportFailure.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; /** 仅携带允许输出的诊断信息,不保留远端响应或认证信息。 */ public final class ImportFailure extends RuntimeException { diff --git a/community-import/src/main/java/com/linkerbot/community/importer/ImportModels.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportModels.java similarity index 91% rename from community-import/src/main/java/com/linkerbot/community/importer/ImportModels.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportModels.java index 7ea4ea7..235ef1e 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/ImportModels.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportModels.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import com.linkerbot.community.bean.Contracts.ProjectInput; -import com.linkerbot.community.service.gitea.GiteaClient.RemoteRepository; +import com.linkerbot.vibemake.bean.Contracts.ProjectInput; +import com.linkerbot.vibemake.service.gitea.GiteaClient.RemoteRepository; import java.util.ArrayList; import java.util.List; diff --git a/community-import/src/main/java/com/linkerbot/community/importer/SourceChecks.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/SourceChecks.java similarity index 87% rename from community-import/src/main/java/com/linkerbot/community/importer/SourceChecks.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/SourceChecks.java index 70f4eb1..1dcdd99 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/SourceChecks.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/SourceChecks.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import com.linkerbot.community.service.migration.GitHubSourceChecks; -import com.linkerbot.community.service.migration.MigrationFailure; +import com.linkerbot.vibemake.service.migration.GitHubSourceChecks; +import com.linkerbot.vibemake.service.migration.MigrationFailure; /** 兼容运维导入的模型与异常类型,网络检查复用通用实现。 */ public class SourceChecks { diff --git a/community-import/src/main/java/com/linkerbot/community/importer/StateStore.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/StateStore.java similarity index 97% rename from community-import/src/main/java/com/linkerbot/community/importer/StateStore.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/StateStore.java index 287c70d..b86353a 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/StateStore.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/StateStore.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import static com.linkerbot.community.importer.ImportModels.*; +import static com.linkerbot.vibemake.importer.ImportModels.*; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/community-import/src/main/java/com/linkerbot/community/importer/WorkbookReader.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/WorkbookReader.java similarity index 97% rename from community-import/src/main/java/com/linkerbot/community/importer/WorkbookReader.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/WorkbookReader.java index 2ee274b..12382a8 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/WorkbookReader.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/WorkbookReader.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import static com.linkerbot.community.importer.ImportModels.*; +import static com.linkerbot.vibemake.importer.ImportModels.*; -import com.linkerbot.community.service.support.ProjectInputs; +import com.linkerbot.vibemake.service.support.ProjectInputs; import java.io.InputStream; import java.net.URI; @@ -238,6 +238,6 @@ public final class WorkbookReader { } public static String repositoryKey(String url) { - return com.linkerbot.community.service.migration.GitHubSourceChecks.repositoryKey(url); + return com.linkerbot.vibemake.service.migration.GitHubSourceChecks.repositoryKey(url); } } diff --git a/community-import/src/main/java/com/linkerbot/community/importer/cover/CoverMigrationApplication.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverMigrationApplication.java similarity index 97% rename from community-import/src/main/java/com/linkerbot/community/importer/cover/CoverMigrationApplication.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverMigrationApplication.java index b9425c7..92c9e16 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/cover/CoverMigrationApplication.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverMigrationApplication.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.importer.cover; +package com.linkerbot.vibemake.importer.cover; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.type.TypeReference; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.charset.StandardCharsets; @@ -132,7 +132,7 @@ public final class CoverMigrationApplication { for (CoverMigrator.Candidate candidate : candidates) { String source = overrides.get(candidate.projectCode()); if (source == null) continue; - source = com.linkerbot.community.service.support.ProjectInputs.coverUrl(source); + source = com.linkerbot.vibemake.service.support.ProjectInputs.coverUrl(source); if (source == null) throw new IllegalArgumentException("备用下载地址不能为空"); String previous = sources.putIfAbsent(candidate.originalUrl().trim(), source); if (previous != null && !previous.equals(source)) diff --git a/community-import/src/main/java/com/linkerbot/community/importer/cover/CoverMigrator.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverMigrator.java similarity index 97% rename from community-import/src/main/java/com/linkerbot/community/importer/cover/CoverMigrator.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverMigrator.java index 4d07434..bc89d6c 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/cover/CoverMigrator.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverMigrator.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.importer.cover; +package com.linkerbot.vibemake.importer.cover; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; import java.net.URI; import java.security.MessageDigest; import java.util.ArrayList; diff --git a/community-import/src/main/java/com/linkerbot/community/importer/cover/CoverOssUploader.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverOssUploader.java similarity index 96% rename from community-import/src/main/java/com/linkerbot/community/importer/cover/CoverOssUploader.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverOssUploader.java index 5aaf584..fc539fb 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/cover/CoverOssUploader.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/CoverOssUploader.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.importer.cover; +package com.linkerbot.vibemake.importer.cover; import com.aliyun.oss.ClientBuilderConfiguration; import com.aliyun.oss.OSS; @@ -8,7 +8,7 @@ import com.aliyun.oss.common.auth.DefaultCredentialProvider; import com.aliyun.oss.common.comm.SignVersion; import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; -import com.linkerbot.community.service.config.OssProperties; +import com.linkerbot.vibemake.service.config.OssProperties; import java.io.ByteArrayInputStream; import java.util.Map; diff --git a/community-import/src/main/java/com/linkerbot/community/importer/cover/ExternalCoverDownloader.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/ExternalCoverDownloader.java similarity index 97% rename from community-import/src/main/java/com/linkerbot/community/importer/cover/ExternalCoverDownloader.java rename to vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/ExternalCoverDownloader.java index b484d18..52bbcfe 100644 --- a/community-import/src/main/java/com/linkerbot/community/importer/cover/ExternalCoverDownloader.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/cover/ExternalCoverDownloader.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.importer.cover; +package com.linkerbot.vibemake.importer.cover; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -57,7 +57,7 @@ public class ExternalCoverDownloader { connection.setInstanceFollowRedirects(false); connection.setConnectTimeout(10000); connection.setReadTimeout(15000); - connection.setRequestProperty("User-Agent", "community-cover-migration/1"); + connection.setRequestProperty("User-Agent", "vibemake-cover-migration/1"); connection.setRequestProperty("Accept", "image/*"); try { int status = connection.getResponseCode(); diff --git a/community-import/src/main/resources/application.yml b/vibemake-import/src/main/resources/application.yml similarity index 79% rename from community-import/src/main/resources/application.yml rename to vibemake-import/src/main/resources/application.yml index 3a7021d..a00cee0 100644 --- a/community-import/src/main/resources/application.yml +++ b/vibemake-import/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: init: mode: never datasource: - url: ${DB_URL:jdbc:mysql://localhost:3306/community?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC} + url: ${DB_URL:jdbc:mysql://localhost:3306/vibemake?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC} username: ${DB_USERNAME:root} password: ${DB_PASSWORD:} driver-class-name: com.mysql.cj.jdbc.Driver @@ -16,7 +16,7 @@ spring: mybatis-plus: configuration: map-underscore-to-camel-case: true -community: +vibemake: oss: # 导入只转换资源地址,永不启用 OSS SDK 或校验上传凭据。 enabled: false @@ -29,18 +29,18 @@ community: root-directory: vibemake_dev gitea: base-url: ${GITEA_BASE_URL:http://localhost:3000} - owner: ${GITEA_ORGANIZATION:community} + owner: ${GITEA_ORGANIZATION:vibemake} token: ${GITEA_TOKEN:} logging: level: root: WARN - com.linkerbot.community: INFO - com.linkerbot.community.service.mapper: WARN + com.linkerbot.vibemake: INFO + com.linkerbot.vibemake.service.mapper: WARN --- spring: config: activate: on-profile: prod -community: +vibemake: oss: root-directory: vibemake diff --git a/community-import/src/test/java/com/linkerbot/community/importer/ImportCoordinatorTest.java b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/ImportCoordinatorTest.java similarity index 95% rename from community-import/src/test/java/com/linkerbot/community/importer/ImportCoordinatorTest.java rename to vibemake-import/src/test/java/com/linkerbot/vibemake/importer/ImportCoordinatorTest.java index e6d755d..7d09f46 100644 --- a/community-import/src/test/java/com/linkerbot/community/importer/ImportCoordinatorTest.java +++ b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/ImportCoordinatorTest.java @@ -1,21 +1,21 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import static com.linkerbot.community.importer.ImportModels.*; +import static com.linkerbot.vibemake.importer.ImportModels.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.gitea.*; -import com.linkerbot.community.service.mapper.*; -import com.linkerbot.community.service.oss.OssObjectStore; -import com.linkerbot.community.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.gitea.*; +import com.linkerbot.vibemake.service.mapper.*; +import com.linkerbot.vibemake.service.oss.OssObjectStore; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; import org.junit.jupiter.api.*; import org.junit.jupiter.api.io.TempDir; @@ -55,7 +55,7 @@ class ImportCoordinatorTest { @Autowired UserMapper users; @Autowired ProjectService service; @Autowired GiteaClient gitea; - @Autowired CommunityProperties config; + @Autowired VibemakeProperties config; @Autowired OssResourcePaths resourcePaths; @Autowired OssProperties oss; @Autowired org.springframework.context.ApplicationContext context; @@ -119,7 +119,7 @@ class ImportCoordinatorTest { remote = new GiteaClient.RemoteRepository( 77, - "community", + "vibemake", "p_" + entry.projectCode, true, false, @@ -357,7 +357,7 @@ class ImportCoordinatorTest { exists.set(false); entry.phase = Phase.READY; when(gitea.createRepository(anyString(), eq(true))) - .thenReturn(new GiteaClient.Repository(88, "community", "temporary")); + .thenReturn(new GiteaClient.Repository(88, "vibemake", "temporary")); String existing = service.create(owner.getId(), entry.candidate.input()).projectCode(); jdbc.update( "UPDATE project SET project_code = ? WHERE project_code = ?", diff --git a/community-import/src/test/java/com/linkerbot/community/importer/SourceChecksTest.java b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/SourceChecksTest.java similarity index 97% rename from community-import/src/test/java/com/linkerbot/community/importer/SourceChecksTest.java rename to vibemake-import/src/test/java/com/linkerbot/vibemake/importer/SourceChecksTest.java index c1dc94c..3c60e8f 100644 --- a/community-import/src/test/java/com/linkerbot/community/importer/SourceChecksTest.java +++ b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/SourceChecksTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; import static org.junit.jupiter.api.Assertions.*; diff --git a/community-import/src/test/java/com/linkerbot/community/importer/WorkbookReaderTest.java b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/WorkbookReaderTest.java similarity index 98% rename from community-import/src/test/java/com/linkerbot/community/importer/WorkbookReaderTest.java rename to vibemake-import/src/test/java/com/linkerbot/vibemake/importer/WorkbookReaderTest.java index ef41cc3..e668079 100644 --- a/community-import/src/test/java/com/linkerbot/community/importer/WorkbookReaderTest.java +++ b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/WorkbookReaderTest.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.importer; +package com.linkerbot.vibemake.importer; -import static com.linkerbot.community.importer.ImportModels.*; +import static com.linkerbot.vibemake.importer.ImportModels.*; import static org.assertj.core.api.Assertions.*; diff --git a/community-import/src/test/java/com/linkerbot/community/importer/cover/CoverMigratorTest.java b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/cover/CoverMigratorTest.java similarity index 96% rename from community-import/src/test/java/com/linkerbot/community/importer/cover/CoverMigratorTest.java rename to vibemake-import/src/test/java/com/linkerbot/vibemake/importer/cover/CoverMigratorTest.java index 62268cd..2414942 100644 --- a/community-import/src/test/java/com/linkerbot/community/importer/cover/CoverMigratorTest.java +++ b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/cover/CoverMigratorTest.java @@ -1,12 +1,12 @@ -package com.linkerbot.community.importer.cover; +package com.linkerbot.vibemake.importer.cover; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -88,7 +88,7 @@ public class CoverMigratorTest { void conditionalUpdateProtectsCaseOnlyEditsAndIsIdempotent() throws Exception { JdbcTemplate jdbc = new JdbcTemplate(new DriverManagerDataSource("jdbc:h2:mem:cover_migrate;MODE=MySQL;DB_CLOSE_DELAY=-1", "sa", "")); jdbc.execute("DROP ALL OBJECTS"); - jdbc.execute("CREATE ALIAS HEX FOR 'com.linkerbot.community.importer.cover.CoverMigratorTest.hex'"); + jdbc.execute("CREATE ALIAS HEX FOR 'com.linkerbot.vibemake.importer.cover.CoverMigratorTest.hex'"); jdbc.execute("CREATE TABLE project (project_code VARCHAR(32) PRIMARY KEY, cover_url VARCHAR(2048))"); jdbc.update("INSERT INTO project VALUES (?, ?)", FIRST.projectCode(), FIRST.originalUrl()); CoverMigrator.JdbcRepository database = new CoverMigrator.JdbcRepository(jdbc); diff --git a/community-import/src/test/java/com/linkerbot/community/importer/cover/ExternalCoverDownloaderTest.java b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/cover/ExternalCoverDownloaderTest.java similarity index 98% rename from community-import/src/test/java/com/linkerbot/community/importer/cover/ExternalCoverDownloaderTest.java rename to vibemake-import/src/test/java/com/linkerbot/vibemake/importer/cover/ExternalCoverDownloaderTest.java index 7e3beda..1281b16 100644 --- a/community-import/src/test/java/com/linkerbot/community/importer/cover/ExternalCoverDownloaderTest.java +++ b/vibemake-import/src/test/java/com/linkerbot/vibemake/importer/cover/ExternalCoverDownloaderTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.importer.cover; +package com.linkerbot.vibemake.importer.cover; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/community-security/pom.xml b/vibemake-security/pom.xml similarity index 64% rename from community-security/pom.xml rename to vibemake-security/pom.xml index 6762240..f8bd557 100644 --- a/community-security/pom.xml +++ b/vibemake-security/pom.xml @@ -3,23 +3,26 @@ 4.0.0 com.linkerbot - community + vibemake 0.0.1-SNAPSHOT - community-security + vibemake-security com.linkerbot - community-service + vibemake-common + ${project.version} + test-jar + test + + + com.linkerbot + vibemake-service ${project.version} org.springframework.boot spring-boot-starter-security - - com.github.ben-manes.caffeine - caffeine - diff --git a/community-security/src/main/java/com/linkerbot/community/security/BearerTokenFilter.java b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/BearerTokenFilter.java similarity index 92% rename from community-security/src/main/java/com/linkerbot/community/security/BearerTokenFilter.java rename to vibemake-security/src/main/java/com/linkerbot/vibemake/security/BearerTokenFilter.java index d6d4bdb..26536b7 100644 --- a/community-security/src/main/java/com/linkerbot/community/security/BearerTokenFilter.java +++ b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/BearerTokenFilter.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.security; +package com.linkerbot.vibemake.security; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.UserService; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.UserService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -39,7 +39,7 @@ public class BearerTokenFilter extends OncePerRequestFilter { TokenService.Session session = tokens.session(header.substring(7)); Long id = session == null ? null : session.userId(); if (id == null) throw new BusinessException(401, "UNAUTHORIZED", "登录已失效,请重新登录"); - com.linkerbot.community.bean.entity.User user = users.require(id); + com.linkerbot.vibemake.bean.entity.User user = users.require(id); if (!"USER".equals(user.getRole()) || user.getSessionVersion() != session.version()) throw new BusinessException(401, "UNAUTHORIZED", "登录已失效,请重新登录"); UsernamePasswordAuthenticationToken auth = diff --git a/community-security/src/main/java/com/linkerbot/community/security/CaptchaService.java b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/CaptchaService.java similarity index 73% rename from community-security/src/main/java/com/linkerbot/community/security/CaptchaService.java rename to vibemake-security/src/main/java/com/linkerbot/vibemake/security/CaptchaService.java index a7f23ac..072fc06 100644 --- a/community-security/src/main/java/com/linkerbot/community/security/CaptchaService.java +++ b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/CaptchaService.java @@ -1,10 +1,9 @@ -package com.linkerbot.community.security; +package com.linkerbot.vibemake.security; -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.linkerbot.community.bean.Contracts.CaptchaView; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.config.CommunityProperties; +import com.linkerbot.vibemake.bean.Contracts.CaptchaView; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.common.state.TransientStateStore; +import com.linkerbot.vibemake.service.config.VibemakeProperties; import org.springframework.stereotype.Service; @@ -23,16 +22,12 @@ import javax.imageio.ImageIO; @Service public class CaptchaService { private final SecureRandom random = new SecureRandom(); - private final Cache challenges; - private final CommunityProperties config; + private final TransientStateStore challenges; + private final VibemakeProperties config; - public CaptchaService(CommunityProperties config) { + public CaptchaService(VibemakeProperties config, TransientStateStore challenges) { this.config = config; - this.challenges = - Caffeine.newBuilder() - .maximumSize(10000) - .expireAfterWrite(config.getCaptchaTtl()) - .build(); + this.challenges = challenges; } protected String generateAnswer() { @@ -72,7 +67,9 @@ public class CaptchaService { try (ByteArrayOutputStream bytes = new ByteArrayOutputStream()) { ImageIO.write(image, "png", bytes); String code = Codes.next(); - challenges.put(code, answer); + if (!challenges.putIfAbsent( + "captcha:" + code, SecurityHashes.sha256(answer), config.getCaptchaTtl())) + throw new BusinessException(503, "CAPTCHA_ERROR", "验证码分配失败,请重试"); return new CaptchaView( code, "data:image/png;base64," @@ -84,12 +81,14 @@ public class CaptchaService { } public void verify(String code, String answer) { - String expected = challenges.asMap().remove(code); + if (code == null || !code.matches("[a-f0-9]{32}")) + throw new BusinessException(400, "CAPTCHA_INVALID", "图片验证码错误、已使用或已过期"); + String expected = challenges.consume("captcha:" + code); String actual = answer == null ? "" : answer.trim().toUpperCase(Locale.ROOT); if (expected == null || !MessageDigest.isEqual( expected.getBytes(StandardCharsets.UTF_8), - actual.getBytes(StandardCharsets.UTF_8))) + SecurityHashes.sha256(actual).getBytes(StandardCharsets.UTF_8))) throw new BusinessException(400, "CAPTCHA_INVALID", "图片验证码错误、已使用或已过期"); } } diff --git a/community-security/src/main/java/com/linkerbot/community/security/CorsProperties.java b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/CorsProperties.java similarity index 76% rename from community-security/src/main/java/com/linkerbot/community/security/CorsProperties.java rename to vibemake-security/src/main/java/com/linkerbot/vibemake/security/CorsProperties.java index 9d3d472..2c23476 100644 --- a/community-security/src/main/java/com/linkerbot/community/security/CorsProperties.java +++ b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/CorsProperties.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.security; +package com.linkerbot.vibemake.security; import lombok.Getter; import lombok.Setter; @@ -11,7 +11,7 @@ import java.util.List; @Getter @Setter @Component -@ConfigurationProperties(prefix = "community.cors") +@ConfigurationProperties(prefix = "vibemake.cors") public class CorsProperties { private List allowedOrigins = List.of(); } diff --git a/community-security/src/main/java/com/linkerbot/community/security/CurrentUser.java b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/CurrentUser.java similarity index 87% rename from community-security/src/main/java/com/linkerbot/community/security/CurrentUser.java rename to vibemake-security/src/main/java/com/linkerbot/vibemake/security/CurrentUser.java index c9ac27f..c7fddc9 100644 --- a/community-security/src/main/java/com/linkerbot/community/security/CurrentUser.java +++ b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/CurrentUser.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.security; +package com.linkerbot.vibemake.security; -import com.linkerbot.community.common.BusinessException; +import com.linkerbot.vibemake.common.BusinessException; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/community-security/src/main/java/com/linkerbot/community/security/SecurityConfiguration.java b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/SecurityConfiguration.java similarity index 88% rename from community-security/src/main/java/com/linkerbot/community/security/SecurityConfiguration.java rename to vibemake-security/src/main/java/com/linkerbot/vibemake/security/SecurityConfiguration.java index f25904c..639859c 100644 --- a/community-security/src/main/java/com/linkerbot/community/security/SecurityConfiguration.java +++ b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/SecurityConfiguration.java @@ -1,7 +1,8 @@ -package com.linkerbot.community.security; +package com.linkerbot.vibemake.security; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.common.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.state.HttpSafetyFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +25,15 @@ import java.util.List; public class SecurityConfiguration { private static final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class); + @Bean + public FilterRegistrationBean disableSafetyServletRegistration( + HttpSafetyFilter filter) { + FilterRegistrationBean registration = + new FilterRegistrationBean<>(filter); + registration.setEnabled(false); + return registration; + } + @Bean public UrlBasedCorsConfigurationSource corsConfigurationSource(CorsProperties properties) { CorsConfiguration configuration = new CorsConfiguration(); @@ -32,7 +42,8 @@ public class SecurityConfiguration { List.of("GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); configuration.setAllowedHeaders( List.of(HttpHeaders.AUTHORIZATION, HttpHeaders.CONTENT_TYPE, HttpHeaders.ACCEPT)); - configuration.setExposedHeaders(List.of("X-Request-Id", HttpHeaders.CONTENT_DISPOSITION)); + configuration.setExposedHeaders( + List.of("X-Request-Id", HttpHeaders.CONTENT_DISPOSITION, "Retry-After")); configuration.setAllowCredentials(false); configuration.setMaxAge(3600L); @@ -59,9 +70,13 @@ public class SecurityConfiguration { @Bean public SecurityFilterChain securityFilterChain( - HttpSecurity http, BearerTokenFilter tokenFilter, ObjectMapper json, + HttpSecurity http, + BearerTokenFilter tokenFilter, + ObjectMapper json, SecurityContextRepository contextRepository, - UrlBasedCorsConfigurationSource corsConfigurationSource) throws Exception { + UrlBasedCorsConfigurationSource corsConfigurationSource, + HttpSafetyFilter safety) + throws Exception { // 在 Token 鉴权前处理预检,并让鉴权失败响应同样携带跨域头。 http.cors(cors -> cors.configurationSource(corsConfigurationSource)) .csrf(csrf -> csrf.disable()) @@ -118,6 +133,7 @@ public class SecurityConfiguration { "FORBIDDEN", "无权访问"))); })) + .addFilterAfter(safety, org.springframework.web.filter.CorsFilter.class) .addFilterBefore(tokenFilter, UsernamePasswordAuthenticationFilter.class); return http.build(); } diff --git a/vibemake-security/src/main/java/com/linkerbot/vibemake/security/TokenService.java b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/TokenService.java new file mode 100644 index 0000000..b1db026 --- /dev/null +++ b/vibemake-security/src/main/java/com/linkerbot/vibemake/security/TokenService.java @@ -0,0 +1,75 @@ +package com.linkerbot.vibemake.security; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.SecurityHashes; +import com.linkerbot.vibemake.common.state.TransientStateStore; +import com.linkerbot.vibemake.service.config.VibemakeProperties; + +import org.springframework.stereotype.Service; + +import java.security.SecureRandom; +import java.util.Base64; + +@Service +public class TokenService { + private final TransientStateStore sessions; + private final VibemakeProperties config; + private final ObjectMapper json; + private final SecureRandom random = new SecureRandom(); + + public TokenService( + VibemakeProperties config, TransientStateStore sessions, ObjectMapper json) { + this.config = config; + this.sessions = sessions; + this.json = json; + } + + public record Session(long userId, long version) {} + + public String issue(long userId) { + return issue(userId, 0L); + } + + public String issue(long userId, long version) { + try { + String value = json.writeValueAsString(new Session(userId, version)); + for (int attempt = 0; attempt < 3; attempt++) { + byte[] bytes = new byte[32]; + random.nextBytes(bytes); + String token = Base64.getUrlEncoder().withoutPadding().encodeToString(bytes); + if (sessions.putIfAbsent(key(token), value, config.getTokenTtl())) return token; + } + throw new IllegalStateException("会话编码分配失败"); + } catch (java.io.IOException error) { + throw new BusinessException(503, "SESSION_UNAVAILABLE", "会话服务暂不可用"); + } + } + + public Long resolve(String token) { + Session session = session(token); + return session == null ? null : session.userId(); + } + + public Session session(String token) { + if (token == null || !token.matches("[A-Za-z0-9_-]{43}")) return null; + String value = sessions.get(key(token)); + if (value == null) return null; + try { + Session session = json.readValue(value, Session.class); + if (session == null || session.userId() <= 0 || session.version() < 0) + throw new IllegalArgumentException("会话数据异常"); + return session; + } catch (java.io.IOException | IllegalArgumentException error) { + throw new BusinessException(503, "SESSION_UNAVAILABLE", "会话数据异常,请稍后重试"); + } + } + + public void revoke(String token) { + if (token != null) sessions.remove(key(token)); + } + + private String key(String token) { + return "session:" + SecurityHashes.sha256(token); + } +} diff --git a/vibemake-security/src/test/java/com/linkerbot/vibemake/security/SessionTest.java b/vibemake-security/src/test/java/com/linkerbot/vibemake/security/SessionTest.java new file mode 100644 index 0000000..6010e5b --- /dev/null +++ b/vibemake-security/src/test/java/com/linkerbot/vibemake/security/SessionTest.java @@ -0,0 +1,100 @@ +package com.linkerbot.vibemake.security; + +import static org.assertj.core.api.Assertions.*; + +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.VibemakeProperties; + +import org.junit.jupiter.api.Test; + +import java.time.Duration; + +class SessionTest { + @Test + void sharedStateSurvivesServiceReplacementAndStoresNoRawToken() { + com.linkerbot.vibemake.testing.InMemoryStateStore state = + new com.linkerbot.vibemake.testing.InMemoryStateStore(); + com.fasterxml.jackson.databind.ObjectMapper json = + new com.fasterxml.jackson.databind.ObjectMapper(); + VibemakeProperties properties = new VibemakeProperties(); + TokenService first = new TokenService(properties, state, json); + String token = first.issue(8, 3); + assertThat(state.get("session:" + token)).isNull(); + TokenService replacement = new TokenService(properties, state, json); + assertThat(replacement.session(token)).isEqualTo(new TokenService.Session(8, 3)); + replacement.revoke(token); + assertThat(first.session(token)).isNull(); + } + + @Test + void captchaCanOnlyBeConsumedOnceAcrossThreads() throws Exception { + VibemakeProperties properties = new VibemakeProperties(); + CaptchaService captcha = + new CaptchaService( + properties, new com.linkerbot.vibemake.testing.InMemoryStateStore()) { + @Override + protected String generateAnswer() { + return "ABCDE"; + } + }; + String code = captcha.issue().captchaCode(); + java.util.concurrent.atomic.AtomicInteger accepted = + new java.util.concurrent.atomic.AtomicInteger(); + try (java.util.concurrent.ExecutorService pool = + java.util.concurrent.Executors.newVirtualThreadPerTaskExecutor()) { + for (int index = 0; index < 20; index++) + pool.submit( + () -> { + try { + captcha.verify(code, "abcde"); + accepted.incrementAndGet(); + } catch (BusinessException expected) { + } + }); + } + assertThat(accepted.get()).isEqualTo(1); + } + + @Test + void expiredCaptchaAndTokenCannotBeUsed() throws Exception { + VibemakeProperties properties = new VibemakeProperties(); + properties.setCaptchaTtl(Duration.ofMillis(1)); + properties.setTokenTtl(Duration.ofMillis(1)); + com.linkerbot.vibemake.common.state.TransientStateStore state = + new com.linkerbot.vibemake.testing.InMemoryStateStore(); + CaptchaService captcha = + new CaptchaService(properties, state) { + @Override + protected String generateAnswer() { + return "ABCDE"; + } + }; + String code = captcha.issue().captchaCode(); + TokenService tokens = + new TokenService( + properties, + new com.linkerbot.vibemake.testing.InMemoryStateStore(), + new com.fasterxml.jackson.databind.ObjectMapper()); + String token = tokens.issue(1L); + Thread.sleep(20); + assertThatThrownBy(() -> captcha.verify(code, "ABCDE")) + .isInstanceOf(BusinessException.class); + assertThat(tokens.resolve(token)).isNull(); + } + + @Test + void tokensAreRandomAndRevocable() { + TokenService tokens = + new TokenService( + new VibemakeProperties(), + new com.linkerbot.vibemake.testing.InMemoryStateStore(), + new com.fasterxml.jackson.databind.ObjectMapper()); + String a = tokens.issue(1L); + String b = tokens.issue(1L); + assertThat(a).isNotEqualTo(b); + assertThat(tokens.resolve(a)).isEqualTo(1L); + tokens.revoke(a); + assertThat(tokens.resolve(a)).isNull(); + assertThat(tokens.resolve(b)).isEqualTo(1L); + } +} diff --git a/community-service/pom.xml b/vibemake-service/pom.xml similarity index 69% rename from community-service/pom.xml rename to vibemake-service/pom.xml index 72d68cb..b1cc77c 100644 --- a/community-service/pom.xml +++ b/vibemake-service/pom.xml @@ -3,11 +3,22 @@ 4.0.0 com.linkerbot - community + vibemake 0.0.1-SNAPSHOT - community-service + vibemake-service + + org.springframework.boot + spring-boot-starter-data-redis + + + com.linkerbot + vibemake-common + ${project.version} + test-jar + test + com.aliyun.oss aliyun-sdk-oss @@ -19,18 +30,14 @@ - - com.github.ben-manes.caffeine - caffeine - com.linkerbot - community-common + vibemake-common ${project.version} com.linkerbot - community-bean + vibemake-bean ${project.version} diff --git a/community-service/src/main/java/com/linkerbot/community/service/AiSearchService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/AiSearchService.java similarity index 61% rename from community-service/src/main/java/com/linkerbot/community/service/AiSearchService.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/AiSearchService.java index b69a314..262ddb6 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/AiSearchService.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/AiSearchService.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.service; +package com.linkerbot.vibemake.service; -import com.linkerbot.community.bean.ai.AiContracts.ChatRequest; +import com.linkerbot.vibemake.bean.ai.AiContracts.ChatRequest; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; public interface AiSearchService { diff --git a/community-service/src/main/java/com/linkerbot/community/service/CoverUploadService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/CoverUploadService.java similarity index 53% rename from community-service/src/main/java/com/linkerbot/community/service/CoverUploadService.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/CoverUploadService.java index e32c741..e148ac6 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/CoverUploadService.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/CoverUploadService.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.service; +package com.linkerbot.vibemake.service; -import com.linkerbot.community.bean.Contracts.CoverUploadInput; -import com.linkerbot.community.bean.Contracts.CoverUploadSignature; +import com.linkerbot.vibemake.bean.Contracts.CoverUploadInput; +import com.linkerbot.vibemake.bean.Contracts.CoverUploadSignature; /** 为浏览器直传项目封面生成 OSS POST 表单,不接收图片内容。 */ public interface CoverUploadService { diff --git a/community-service/src/main/java/com/linkerbot/community/service/FileService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/FileService.java similarity index 57% rename from community-service/src/main/java/com/linkerbot/community/service/FileService.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/FileService.java index 5cc6993..7fa881f 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/FileService.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/FileService.java @@ -1,12 +1,12 @@ -package com.linkerbot.community.service; +package com.linkerbot.vibemake.service; -import com.linkerbot.community.bean.Contracts.CommitInput; -import com.linkerbot.community.bean.Contracts.CommitView; -import com.linkerbot.community.bean.Contracts.FileView; -import com.linkerbot.community.bean.Contracts.HistoryEntry; -import com.linkerbot.community.bean.Contracts.TreeView; -import com.linkerbot.community.common.PageResponse; -import com.linkerbot.community.service.gitea.GiteaClient; +import com.linkerbot.vibemake.bean.Contracts.CommitInput; +import com.linkerbot.vibemake.bean.Contracts.CommitView; +import com.linkerbot.vibemake.bean.Contracts.FileView; +import com.linkerbot.vibemake.bean.Contracts.HistoryEntry; +import com.linkerbot.vibemake.bean.Contracts.TreeView; +import com.linkerbot.vibemake.common.PageResponse; +import com.linkerbot.vibemake.service.gitea.GiteaClient; import org.springframework.web.multipart.MultipartFile; @@ -16,15 +16,15 @@ import java.util.List; public interface FileService { TreeView ownerTree(long userId, String code, String path, String commitSha); - TreeView communityTree(String code, String path); + TreeView vibemakeTree(String code, String path); GiteaClient.StoredFile ownerFile(long userId, String code, String path, String commitSha); FileView ownerFileView(long userId, String code, String path, String commitSha); - GiteaClient.StoredFile communityFile(String code, String path); + GiteaClient.StoredFile vibemakeFile(String code, String path); - FileView communityFileView(String code, String path); + FileView vibemakeFileView(String code, String path); CommitView commit(long userId, String code, CommitInput input); diff --git a/community-service/src/main/java/com/linkerbot/community/service/InteractionService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/InteractionService.java similarity index 63% rename from community-service/src/main/java/com/linkerbot/community/service/InteractionService.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/InteractionService.java index c798aec..84a6d19 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/InteractionService.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/InteractionService.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.service; +package com.linkerbot.vibemake.service; -import com.linkerbot.community.bean.Contracts.CommentInput; -import com.linkerbot.community.bean.Contracts.CommentView; -import com.linkerbot.community.common.PageResponse; +import com.linkerbot.vibemake.bean.Contracts.CommentInput; +import com.linkerbot.vibemake.bean.Contracts.CommentView; +import com.linkerbot.vibemake.common.PageResponse; /** 社区评论和幂等点赞操作。 */ public interface InteractionService { diff --git a/community-service/src/main/java/com/linkerbot/community/service/ProjectService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ProjectService.java similarity index 68% rename from community-service/src/main/java/com/linkerbot/community/service/ProjectService.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/ProjectService.java index 837d275..dff859f 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/ProjectService.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ProjectService.java @@ -1,12 +1,12 @@ -package com.linkerbot.community.service; +package com.linkerbot.vibemake.service; -import com.linkerbot.community.bean.Contracts.ForkInput; -import com.linkerbot.community.bean.Contracts.ProjectInput; -import com.linkerbot.community.bean.Contracts.ProjectView; -import com.linkerbot.community.bean.Contracts.TypeView; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.common.PageResponse; -import com.linkerbot.community.service.gitea.GiteaClient; +import com.linkerbot.vibemake.bean.Contracts.ForkInput; +import com.linkerbot.vibemake.bean.Contracts.ProjectInput; +import com.linkerbot.vibemake.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.Contracts.TypeView; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.common.PageResponse; +import com.linkerbot.vibemake.service.gitea.GiteaClient; import java.util.List; import java.util.function.Function; @@ -17,6 +17,8 @@ public interface ProjectService { ProjectView view(Project project, Long currentUser); + List views(List records, Long currentUser); + PageResponse list( Long ownerId, String type, String keyword, long page, long size, Long currentUser); diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/UrdfService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/UrdfService.java new file mode 100644 index 0000000..baf8887 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/UrdfService.java @@ -0,0 +1,14 @@ +package com.linkerbot.vibemake.service; + +import com.linkerbot.vibemake.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.Contracts.UrdfConfirmInput; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadInput; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadSignature; + +public interface UrdfService { + UrdfUploadSignature signature(long userId, String projectCode, UrdfUploadInput input); + + ProjectView confirm(long userId, String projectCode, UrdfConfirmInput input); + + void clear(long userId, String projectCode); +} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/UserService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/UserService.java new file mode 100644 index 0000000..d2072fc --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/UserService.java @@ -0,0 +1,18 @@ +package com.linkerbot.vibemake.service; + +import com.linkerbot.vibemake.bean.Contracts.PublicUser; +import com.linkerbot.vibemake.bean.Contracts.UserView; +import com.linkerbot.vibemake.bean.entity.User; + +/** 平台用户查询、登录和公开信息转换。 */ +public interface UserService { + User login(String email); + + User require(long id); + + UserView view(User user); + + PublicUser publicView(long id); + + java.util.Map publicViews(java.util.Collection ids); +} diff --git a/community-service/src/main/java/com/linkerbot/community/service/admin/AdminImportService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/admin/AdminImportService.java similarity index 84% rename from community-service/src/main/java/com/linkerbot/community/service/admin/AdminImportService.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/admin/AdminImportService.java index bd3aba3..6ccabce 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/admin/AdminImportService.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/admin/AdminImportService.java @@ -1,22 +1,22 @@ -package com.linkerbot.community.service.admin; +package com.linkerbot.vibemake.service.admin; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.AdminContracts.*; -import com.linkerbot.community.bean.Contracts.UrdfConfirmInput; -import com.linkerbot.community.bean.Contracts.UrdfUploadSignature; -import com.linkerbot.community.bean.entity.*; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.config.*; -import com.linkerbot.community.service.gitea.*; -import com.linkerbot.community.service.mapper.*; -import com.linkerbot.community.service.migration.*; -import com.linkerbot.community.service.oss.OssResourcePaths; -import com.linkerbot.community.service.oss.UrdfResources; -import com.linkerbot.community.service.support.*; +import com.linkerbot.vibemake.bean.AdminContracts.*; +import com.linkerbot.vibemake.bean.Contracts.UrdfConfirmInput; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadSignature; +import com.linkerbot.vibemake.bean.entity.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.config.*; +import com.linkerbot.vibemake.service.gitea.*; +import com.linkerbot.vibemake.service.mapper.*; +import com.linkerbot.vibemake.service.migration.*; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.oss.UrdfResources; +import com.linkerbot.vibemake.service.support.*; import lombok.RequiredArgsConstructor; @@ -32,6 +32,7 @@ import java.util.*; @Service @RequiredArgsConstructor public class AdminImportService { + private final com.linkerbot.vibemake.service.state.RateLimits rateLimits; private static final Logger log = LoggerFactory.getLogger(AdminImportService.class); private final AdminManagementService management; private final GitHubSourceChecks sources; @@ -39,7 +40,7 @@ public class AdminImportService { private final ProjectImportTaskMapper tasks; private final UserMapper users; private final GiteaClient gitea; - private final CommunityProperties properties; + private final VibemakeProperties properties; private final AdminProperties settings; private final ProjectLocks locks; private final OssResourcePaths paths; @@ -99,6 +100,7 @@ public class AdminImportService { public UrdfUploadSignature urdfSignature(ImportUrdfUploadInput input) { management.requireAdmin(); + rateLimits.operation("urdf-sign", 0); urdfResources.requireEnabled(); GitHubSourceChecks.Repository source = check(input.repositoryUrl()); requireNewSource(source.id()); @@ -106,7 +108,10 @@ public class AdminImportService { UrdfUploadSignature signature = urdfResources.sign(code, input.files()); log.info( "生成迁移项目 URDF 签名 userCode={} projectCode={} batchCode={} fileCount={}", - ProjectActors.admin().userCode(), code, signature.batchCode(), input.files().size()); + ProjectActors.admin().userCode(), + code, + signature.batchCode(), + input.files().size()); return signature; } @@ -124,6 +129,7 @@ public class AdminImportService { public TaskView create(ImportInput input) { management.requireAdmin(); + rateLimits.operation("create", 0); ProjectInputs.validate(input.project(), properties); GitHubSourceChecks.Repository source = check(input.repositoryUrl()); String code = ProjectCodes.github(source.id()); @@ -184,8 +190,11 @@ public class AdminImportService { log.info( "迁移项目绑定 URDF userCode={} taskCode={} projectCode={}" + " batchCode={} fileCount={}", - task.getOperatorUserCode(), task.getTaskCode(), code, - input.urdf().batchCode(), input.urdf().files().size()); + task.getOperatorUserCode(), + task.getTaskCode(), + code, + input.urdf().batchCode(), + input.urdf().files().size()); return view(task); }); } catch (DuplicateKeyException duplicate) { @@ -269,8 +278,7 @@ public class AdminImportService { .eq(Project::getDeleted, false)); if (!retryableProject(project)) throw BusinessException.conflict("项目已就绪、发布过、下架或删除,不能重试迁移"); - if (!canRetry(task)) - throw BusinessException.conflict("当前任务无法安全重试,请核对仓库状态"); + if (!canRetry(task)) throw BusinessException.conflict("当前任务无法安全重试,请核对仓库状态"); boolean recreate = recreateOnRetry(task); if (recreate) { // 持久化清理意图后交给后台处理,接口不等待远端删除或迁移。 @@ -297,8 +305,8 @@ public class AdminImportService { } else if (!"FAILED".equals(task.getStatus())) throw BusinessException.conflict("仅失败或可核验的待核对任务允许续跑"); if (!"IDLE".equals(project.getRepoWriteStatus()) - && !"REVIEW".equals(task.getStatus()) && !recreate) - throw BusinessException.conflict("仓库写入状态需要人工核对"); + && !"REVIEW".equals(task.getStatus()) + && !recreate) throw BusinessException.conflict("仓库写入状态需要人工核对"); tasks.update( null, new LambdaUpdateWrapper() @@ -308,8 +316,12 @@ public class AdminImportService { .set(ProjectImportTask::getErrorCode, null) .set(ProjectImportTask::getFinishedAt, null) .set(ProjectImportTask::getUpdatedAt, ProjectSupport.now())); - log.info("迁移重试已排队 operatorUserCode={} taskCode={} projectCode={} cleanup={}", - ProjectActors.admin().userCode(), code, task.getProjectCode(), recreate); + log.info( + "迁移重试已排队 operatorUserCode={} taskCode={} projectCode={} cleanup={}", + ProjectActors.admin().userCode(), + code, + task.getProjectCode(), + recreate); return view(task(code)); }); } @@ -325,8 +337,10 @@ public class AdminImportService { private boolean canRetry(ProjectImportTask task) { if (!Set.of("FAILED", "REVIEW").contains(task.getStatus())) return false; - Project project = projects.selectOne(new LambdaQueryWrapper() - .eq(Project::getProjectCode, task.getProjectCode())); + Project project = + projects.selectOne( + new LambdaQueryWrapper() + .eq(Project::getProjectCode, task.getProjectCode())); if (!retryableProject(project)) return false; if (recreateOnRetry(task)) return true; if ("CLEANING".equals(task.getPhase())) return false; @@ -338,10 +352,12 @@ public class AdminImportService { } private boolean retryableProject(Project project) { - return project != null && !Boolean.TRUE.equals(project.getDeleted()) + return project != null + && !Boolean.TRUE.equals(project.getDeleted()) && "UNPUBLISHED".equals(project.getPublishStatus()) && Set.of("CREATING", "FAILED").contains(project.getRepoStatus()) - && project.getPublishedCommitSha() == null && project.getPublishedAt() == null; + && project.getPublishedCommitSha() == null + && project.getPublishedAt() == null; } private String retryMessage(ProjectImportTask task, boolean retry) { @@ -351,14 +367,13 @@ public class AdminImportService { && Set.of("CLEANUP_REPOSITORY_UNSAFE", "CLEANUP_REPOSITORY_REPLACED") .contains(task.getErrorCode() == null ? "" : task.getErrorCode())) return "残留仓库身份核验未通过;若已手工删除目标仓库,可重试核验并继续迁移,保留项目资料、封面和 URDF"; - if (recreateOnRetry(task)) - return "将核验并清理本任务的失败仓库后重新迁移,保留项目资料、封面和 URDF"; + if (recreateOnRetry(task)) return "将核验并清理本任务的失败仓库后重新迁移,保留项目资料、封面和 URDF"; if (task.getReceiptJson() != null) return "将核验已迁移的仓库并继续后续步骤,不会删除仓库"; return "将重新检查来源并继续迁移,保留项目资料、封面和 URDF"; } private String migrationMarker(ProjectImportTask task) { - return "community-import:" + task.getTaskCode(); + return "vibemake-import:" + task.getTaskCode(); } private GiteaClient.RemoteRepository failedRepository(ProjectImportTask task, Project project) { @@ -372,8 +387,11 @@ public class AdminImportService { GiteaClient.RemoteRepository remote = target.repository(); boolean sourceMatches; try { - sourceMatches = GitHubSourceChecks.repositoryKey(remote.originalUrl()) - .equalsIgnoreCase(GitHubSourceChecks.repositoryKey(task.getSourceRepositoryUrl())); + sourceMatches = + GitHubSourceChecks.repositoryKey(remote.originalUrl()) + .equalsIgnoreCase( + GitHubSourceChecks.repositoryKey( + task.getSourceRepositoryUrl())); } catch (RuntimeException error) { sourceMatches = false; } @@ -381,23 +399,28 @@ public class AdminImportService { || !properties.getGitea().getOwner().equals(project.getGiteaOwner()) || !project.getGiteaOwner().equals(remote.owner()) || !project.getGiteaRepoName().equals(remote.name()) - || !remote.privateRepo() || remote.mirror() || !sourceMatches) + || !remote.privateRepo() + || remote.mirror() + || !sourceMatches) throw new MigrationFailure("CLEANUP_REPOSITORY_UNSAFE", "无法确认残留仓库属于本次失败迁移,未执行删除"); if (project.getGiteaRepoId() != null && project.getGiteaRepoId() != remote.id()) throw new MigrationFailure("CLEANUP_REPOSITORY_REPLACED", "目标仓库身份已变化,未执行删除"); return remote; } - private void rememberFailedRepository(ProjectImportTask task, Project project, - GiteaClient.RemoteRepository remote) { + private void rememberFailedRepository( + ProjectImportTask task, Project project, GiteaClient.RemoteRepository remote) { if (remote == null) return; if (project.getGiteaRepoId() == null) { - int updated = projects.update(null, new LambdaUpdateWrapper() - .eq(Project::getProjectCode, task.getProjectCode()) - .eq(Project::getDeleted, false) - .in(Project::getRepoStatus, List.of("CREATING", "FAILED")) - .isNull(Project::getGiteaRepoId) - .set(Project::getGiteaRepoId, remote.id())); + int updated = + projects.update( + null, + new LambdaUpdateWrapper() + .eq(Project::getProjectCode, task.getProjectCode()) + .eq(Project::getDeleted, false) + .in(Project::getRepoStatus, List.of("CREATING", "FAILED")) + .isNull(Project::getGiteaRepoId) + .set(Project::getGiteaRepoId, remote.id())); if (updated != 1) throw BusinessException.conflict("项目状态已变化,停止清理"); project.setGiteaRepoId(remote.id()); } @@ -413,26 +436,40 @@ public class AdminImportService { GiteaClient.RemoteRepository remote = failedRepository(task, project); rememberFailedRepository(task, project, remote); if (remote != null) { - log.info("清理失败迁移仓库 taskCode={} projectCode={}", task.getTaskCode(), task.getProjectCode()); + log.info( + "清理失败迁移仓库 taskCode={} projectCode={}", + task.getTaskCode(), + task.getProjectCode()); gitea.deleteRepository(remote.repository()); } // 删除响应成功也必须再次确认目标不存在;超时或回写失败可从 CLEANING 恢复。 engine().ensureAbsent(project.getGiteaRepoName()); - transactions.executeWithoutResult(status -> { - int updated = projects.update(null, new LambdaUpdateWrapper() - .eq(Project::getProjectCode, task.getProjectCode()).eq(Project::getDeleted, false) - .in(Project::getRepoStatus, List.of("CREATING", "FAILED")) - .eq(Project::getPublishStatus, "UNPUBLISHED") - .set(Project::getGiteaRepoId, null).set(Project::getRepoStatus, "CREATING") - .set(Project::getRepoWriteStatus, "IDLE")); - if (updated != 1) throw BusinessException.conflict("项目状态已变化,停止重新迁移"); - task.setPhase("PRECHECK"); - task.setTargetSha(null); - task.setErrorCode(null); - save(task); - }); + transactions.executeWithoutResult( + status -> { + int updated = + projects.update( + null, + new LambdaUpdateWrapper() + .eq(Project::getProjectCode, task.getProjectCode()) + .eq(Project::getDeleted, false) + .in( + Project::getRepoStatus, + List.of("CREATING", "FAILED")) + .eq(Project::getPublishStatus, "UNPUBLISHED") + .set(Project::getGiteaRepoId, null) + .set(Project::getRepoStatus, "CREATING") + .set(Project::getRepoWriteStatus, "IDLE")); + if (updated != 1) throw BusinessException.conflict("项目状态已变化,停止重新迁移"); + task.setPhase("PRECHECK"); + task.setTargetSha(null); + task.setErrorCode(null); + save(task); + }); locks.confirmKnownResult(task.getProjectCode()); - log.info("失败迁移仓库清理已确认 taskCode={} projectCode={}", task.getTaskCode(), task.getProjectCode()); + log.info( + "失败迁移仓库清理已确认 taskCode={} projectCode={}", + task.getTaskCode(), + task.getProjectCode()); } public List queued() { @@ -644,19 +681,27 @@ public class AdminImportService { if (error instanceof GiteaFailure failure && failure.uncertain()) review = true; if (error instanceof MigrationFailure failure && "REMOTE_ALREADY_EXISTS".equals(failure.code())) review = true; - boolean rejected = "MIGRATING".equals(task.getPhase()) - && task.getReceiptJson() == null - && error instanceof GiteaFailure failure - && "GITEA_MIGRATION_REJECTED".equals(failure.code()) && !failure.uncertain(); + boolean rejected = + "MIGRATING".equals(task.getPhase()) + && task.getReceiptJson() == null + && error instanceof GiteaFailure failure + && "GITEA_MIGRATION_REJECTED".equals(failure.code()) + && !failure.uncertain(); if (rejected) { review = false; try { - Project project = projects.selectOne(new LambdaQueryWrapper() - .eq(Project::getProjectCode, task.getProjectCode())); - if (project != null) rememberFailedRepository(task, project, failedRepository(task, project)); + Project project = + projects.selectOne( + new LambdaQueryWrapper() + .eq(Project::getProjectCode, task.getProjectCode())); + if (project != null) + rememberFailedRepository(task, project, failedRepository(task, project)); } catch (RuntimeException inspectError) { - log.warn("失败迁移仓库身份未记录 taskCode={} projectCode={} errorType={}", - code, task.getProjectCode(), inspectError.getClass().getSimpleName()); + log.warn( + "失败迁移仓库身份未记录 taskCode={} projectCode={} errorType={}", + code, + task.getProjectCode(), + inspectError.getClass().getSimpleName()); } } String errorCode = diff --git a/community-service/src/main/java/com/linkerbot/community/service/admin/AdminManagementService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/admin/AdminManagementService.java similarity index 81% rename from community-service/src/main/java/com/linkerbot/community/service/admin/AdminManagementService.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/admin/AdminManagementService.java index 4e8b76c..bb315aa 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/admin/AdminManagementService.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/admin/AdminManagementService.java @@ -1,15 +1,15 @@ -package com.linkerbot.community.service.admin; +package com.linkerbot.vibemake.service.admin; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.linkerbot.community.bean.AdminContracts; -import com.linkerbot.community.bean.Contracts; -import com.linkerbot.community.bean.entity.*; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.mapper.*; -import com.linkerbot.community.service.support.*; +import com.linkerbot.vibemake.bean.AdminContracts; +import com.linkerbot.vibemake.bean.Contracts; +import com.linkerbot.vibemake.bean.entity.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.mapper.*; +import com.linkerbot.vibemake.service.support.*; import lombok.RequiredArgsConstructor; @@ -18,6 +18,9 @@ import org.slf4j.LoggerFactory; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Set; @Service @@ -83,8 +86,24 @@ public class AdminManagementService { .orderByDesc(User::getCreatedAt) .orderByDesc(User::getId); Page result = users.selectPage(new Page<>(page, size), query); + Map counts = new HashMap<>(); + if (!result.getRecords().isEmpty()) + for (EntityCount count : + mapper.ownerCounts(result.getRecords().stream().map(User::getId).toList())) + counts.put(count.entityId(), count.total()); return new PageResponse<>( - result.getRecords().stream().map(this::userView).toList(), + result.getRecords().stream() + .map( + user -> + new AdminContracts.UserView( + user.getUserCode(), + user.getNickname(), + user.getEmail(), + user.getStatus(), + user.getRole(), + counts.getOrDefault(user.getId(), 0L), + user.getCreatedAt())) + .toList(), page, size, result.getTotal()); @@ -176,6 +195,7 @@ public class AdminManagementService { checkKeyword(keyword); LambdaQueryWrapper query = new LambdaQueryWrapper().eq(Project::getDeleted, false); + query.select(Project.class, field -> !"urdfFiles".equals(field.getProperty())); if (ownerCode != null) query.eq(Project::getOwnerUserId, user(ownerCode).getId()); query.eq(type != null, Project::getProjectType, type) .eq(publishStatus != null, Project::getPublishStatus, publishStatus) @@ -194,11 +214,18 @@ public class AdminManagementService { .like(Project::getDescription, keyword)); query.orderByDesc(Project::getCreatedAt).orderByDesc(Project::getId); Page result = mapper.selectPage(new Page<>(page, size), query); - return new PageResponse<>( - result.getRecords().stream().map(this::projectView).toList(), - page, - size, - result.getTotal()); + List views = projects.views(result.getRecords(), null); + List managed = new java.util.ArrayList<>(); + for (int index = 0; index < views.size(); index++) { + Project project = result.getRecords().get(index); + managed.add( + new AdminContracts.ManagedProjectView( + views.get(index), + "BLOCKED".equals(project.getPublishStatus()) ? "BLOCKED" : "NORMAL", + project.getModerationReason(), + Boolean.TRUE.equals(project.getDeleted()))); + } + return new PageResponse<>(List.copyOf(managed), page, size, result.getTotal()); } public AdminContracts.ManagedProjectView projectView(Project project) { diff --git a/community-service/src/main/java/com/linkerbot/community/service/ai/AiModelClient.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiModelClient.java similarity index 85% rename from community-service/src/main/java/com/linkerbot/community/service/ai/AiModelClient.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiModelClient.java index 80672b2..c6609e8 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/ai/AiModelClient.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiModelClient.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.ai; +package com.linkerbot.vibemake.service.ai; import com.fasterxml.jackson.databind.JsonNode; diff --git a/community-service/src/main/java/com/linkerbot/community/service/ai/AiProjectAssistant.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiProjectAssistant.java similarity index 92% rename from community-service/src/main/java/com/linkerbot/community/service/ai/AiProjectAssistant.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiProjectAssistant.java index 7c933ad..5452470 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/ai/AiProjectAssistant.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiProjectAssistant.java @@ -1,21 +1,21 @@ -package com.linkerbot.community.service.ai; +package com.linkerbot.vibemake.service.ai; -import static com.linkerbot.community.service.ai.AiResponseValidation.*; +import static com.linkerbot.vibemake.service.ai.AiResponseValidation.*; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.linkerbot.community.bean.Contracts.ForkInput; -import com.linkerbot.community.bean.Contracts.ProjectInput; -import com.linkerbot.community.bean.Contracts.ProjectView; -import com.linkerbot.community.bean.ai.AiContracts.*; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.ai.AiProjectSearch.Criteria; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.support.ProjectInputs; +import com.linkerbot.vibemake.bean.Contracts.ForkInput; +import com.linkerbot.vibemake.bean.Contracts.ProjectInput; +import com.linkerbot.vibemake.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.ai.AiContracts.*; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.ai.AiProjectSearch.Criteria; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.support.ProjectInputs; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,7 +36,7 @@ public class AiProjectAssistant { private final ObjectMapper json; private final AiModelClient model; private final AiSearchRules rules; - private final CommunityProperties properties; + private final VibemakeProperties properties; private final AiProjectSearch search; private final ProjectService projects; @@ -54,7 +54,7 @@ public class AiProjectAssistant { Project project = previous.get(request.previousProjectCodes().get(index)); if (project != null) previousInput.add(search.snapshot(project).put("position", index + 1)); } - JsonNode raw = model.complete("community_project_intent", rules.intentSchema(), rules.intentPrompt(), input); + JsonNode raw = model.complete("vibemake_project_intent", rules.intentSchema(), rules.intentPrompt(), input); checkCancelled(); Intent intent = intent(raw, previous.keySet(), request); log.info("Maker AI 意图解析完成 action={} clarification={} durationMs={}", diff --git a/community-service/src/main/java/com/linkerbot/community/service/ai/AiProjectSearch.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiProjectSearch.java similarity index 57% rename from community-service/src/main/java/com/linkerbot/community/service/ai/AiProjectSearch.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiProjectSearch.java index fec03b2..cb7ba20 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/ai/AiProjectSearch.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiProjectSearch.java @@ -1,25 +1,28 @@ -package com.linkerbot.community.service.ai; +package com.linkerbot.vibemake.service.ai; -import static com.linkerbot.community.service.ai.AiResponseValidation.*; +import static com.linkerbot.vibemake.service.ai.AiResponseValidation.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.linkerbot.community.bean.ai.AiContracts.*; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.mapper.AiProjectMapper; -import com.linkerbot.community.service.mapper.ProjectMapper; -import java.util.*; -import java.util.function.Consumer; +import com.linkerbot.vibemake.bean.ai.AiContracts.*; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.mapper.AiProjectMapper; +import com.linkerbot.vibemake.service.mapper.ProjectMapper; + import lombok.RequiredArgsConstructor; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import java.util.*; +import java.util.function.Consumer; + /** 同步检索流水线,数据可见性和引用校验均由后端控制。 */ @Component @RequiredArgsConstructor @@ -32,14 +35,20 @@ public class AiProjectSearch { private final AiProjectMapper candidates; private final ProjectService projectService; - public record Criteria(String projectType, List keywords, List requirements, - List preferences, List focusProjectCodes) {} + public record Criteria( + String projectType, + List keywords, + List requirements, + List preferences, + List focusProjectCodes) {} - public ChatResult search(long userId, Criteria intent, boolean forFork, Consumer progress) { + public ChatResult search( + long userId, Criteria intent, boolean forFork, Consumer progress) { checkCancelled(); progress.accept(new Progress("searching", "正在检索社区项目")); List patterns = intent.keywords().stream().map(this::pattern).toList(); - List pool = candidates.candidates(intent.projectType(), patterns, intent.focusProjectCodes()); + List pool = + candidates.candidates(intent.projectType(), patterns, intent.focusProjectCodes()); log.info("Maker AI 候选检索完成 candidateCount={}", pool.size()); if (pool.isEmpty()) return noMatch(); checkCancelled(); @@ -49,7 +58,12 @@ public class AiProjectSearch { ranking.put("forFork", forFork); ArrayNode entries = ranking.putArray("candidates"); pool.forEach(project -> entries.add(snapshot(project))); - JsonNode raw = model.complete("community_search_ranking", rules.rankingSchema(), rules.rankingPrompt(), ranking); + JsonNode raw = + model.complete( + "vibemake_search_ranking", + rules.rankingSchema(), + rules.rankingPrompt(), + ranking); checkCancelled(); progress.accept(new Progress("validating", "正在核对项目与匹配依据")); return results(userId, intent, pool, raw); @@ -79,44 +93,74 @@ public class AiProjectSearch { fields(proof, "field", "quote", "requirementIndex", "preferenceIndex"); String field = text(proof.get("field"), 20, false); String quote = text(proof.get("quote"), 300, false); - String source = switch (field) { - case "name" -> project.getName(); - case "description" -> project.getDescription(); - case "projectType" -> project.getProjectType(); - default -> throw invalid("unknown_evidence_field"); - }; + String source = + switch (field) { + case "name" -> project.getName(); + case "description" -> project.getDescription(); + case "projectType" -> project.getProjectType(); + default -> throw invalid("unknown_evidence_field"); + }; if (source == null || !source.contains(quote)) throw invalid("quote_not_in_source"); - Integer requirement = index(proof.get("requirementIndex"), intent.requirements().size()); - Integer preference = index(proof.get("preferenceIndex"), intent.preferences().size()); + Integer requirement = + index(proof.get("requirementIndex"), intent.requirements().size()); + Integer preference = + index(proof.get("preferenceIndex"), intent.preferences().size()); if (requirement != null) { // 类型不能证明技术能力;明确要求必须引用名称或描述。 if ("projectType".equals(field)) throw invalid("type_cannot_prove_capability"); required.add(requirement); - evidence.add(new Evidence(field, quote, intent.requirements().get(requirement))); + evidence.add( + new Evidence(field, quote, intent.requirements().get(requirement))); } if (preference != null) { preferred.add(preference); evidence.add(new Evidence(field, quote, intent.preferences().get(preference))); } - if (requirement == null && preference == null) evidence.add(new Evidence(field, quote, null)); + if (requirement == null && preference == null) + evidence.add(new Evidence(field, quote, null)); } - if (required.size() != intent.requirements().size()) throw invalid("missing_required_evidence"); + if (required.size() != intent.requirements().size()) + throw invalid("missing_required_evidence"); List unknown = new ArrayList<>(); for (int index = 0; index < intent.preferences().size(); index++) if (!preferred.contains(index)) unknown.add(intent.preferences().get(index)); - validated.add(new ValidatedCard(project, reason, List.copyOf(evidence), List.copyOf(unknown))); + validated.add( + new ValidatedCard( + project, reason, List.copyOf(evidence), List.copyOf(unknown))); } Map current = byCode(visible(new ArrayList<>(chosen))); + List visibleCards = + validated.stream() + .filter( + card -> + current.get(card.project().getProjectCode()) != null + && sameSnapshot( + card.project(), + current.get( + card.project().getProjectCode()))) + .map(card -> current.get(card.project().getProjectCode())) + .toList(); + Map views = new HashMap<>(); + projectService + .views(visibleCards, userId) + .forEach(view -> views.put(view.projectCode(), view)); for (ValidatedCard card : validated) { checkCancelled(); Project latest = current.get(card.project().getProjectCode()); // 描述、类型或发布版本变化后,旧依据不再用于新的结果。 if (latest == null || !sameSnapshot(card.project(), latest)) continue; - cards.add(new ProjectCard(projectService.view(latest, userId), card.reason(), card.evidence(), card.unknown())); + cards.add( + new ProjectCard( + views.get(latest.getProjectCode()), + card.reason(), + card.evidence(), + card.unknown())); } if (cards.isEmpty()) return noMatch(); - return new ChatResult(Status.MATCHED, - "为你找到 " + cards.size() + " 个候选项目,请结合匹配依据和未确认事项查看详情。", List.copyOf(cards)); + return new ChatResult( + Status.MATCHED, + "为你找到 " + cards.size() + " 个候选项目,请结合匹配依据和未确认事项查看详情。", + List.copyOf(cards)); } private boolean sameSnapshot(Project before, Project after) { @@ -128,9 +172,13 @@ public class AiProjectSearch { List visible(List codes) { if (codes.isEmpty()) return List.of(); - return projects.selectList(new LambdaQueryWrapper() - .in(Project::getProjectCode, codes).eq(Project::getDeleted, false) - .eq(Project::getRepoStatus, "READY").eq(Project::getPublishStatus, "PUBLISHED")); + return projects.selectList( + new LambdaQueryWrapper() + .select(Project.class, field -> !"urdfFiles".equals(field.getProperty())) + .in(Project::getProjectCode, codes) + .eq(Project::getDeleted, false) + .eq(Project::getRepoStatus, "READY") + .eq(Project::getPublishStatus, "PUBLISHED")); } private Map byCode(List records) { @@ -140,13 +188,20 @@ public class AiProjectSearch { } ObjectNode snapshot(Project project) { - return json.createObjectNode().put("projectCode", project.getProjectCode()) - .put("name", project.getName()).put("description", project.getDescription()) + return json.createObjectNode() + .put("projectCode", project.getProjectCode()) + .put("name", project.getName()) + .put("description", project.getDescription()) .put("projectType", project.getProjectType()); } private String pattern(String word) { - return "%" + word.toLowerCase(Locale.ROOT).replace("!", "!!").replace("%", "!%").replace("_", "!_") + "%"; + return "%" + + word.toLowerCase(Locale.ROOT) + .replace("!", "!!") + .replace("%", "!%") + .replace("_", "!_") + + "%"; } private void checkCancelled() { @@ -158,5 +213,6 @@ public class AiProjectSearch { return new ChatResult(Status.NO_MATCH, "暂未找到有充分资料匹配要求的社区项目,可以尝试调整类型或减少条件。", List.of()); } - private record ValidatedCard(Project project, String reason, List evidence, List unknown) {} + private record ValidatedCard( + Project project, String reason, List evidence, List unknown) {} } diff --git a/community-service/src/main/java/com/linkerbot/community/service/ai/AiResponseValidation.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiResponseValidation.java similarity index 95% rename from community-service/src/main/java/com/linkerbot/community/service/ai/AiResponseValidation.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiResponseValidation.java index ee8e313..eb78878 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/ai/AiResponseValidation.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiResponseValidation.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.service.ai; +package com.linkerbot.vibemake.service.ai; import com.fasterxml.jackson.databind.JsonNode; -import com.linkerbot.community.common.BusinessException; +import com.linkerbot.vibemake.common.BusinessException; import java.util.ArrayList; import java.util.List; import org.slf4j.Logger; diff --git a/community-service/src/main/java/com/linkerbot/community/service/ai/AiSearchRules.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiSearchRules.java similarity index 86% rename from community-service/src/main/java/com/linkerbot/community/service/ai/AiSearchRules.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiSearchRules.java index 49a8f2e..dc50c92 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/ai/AiSearchRules.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/AiSearchRules.java @@ -1,10 +1,10 @@ -package com.linkerbot.community.service.ai; +package com.linkerbot.vibemake.service.ai; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.linkerbot.community.service.config.CommunityProperties; +import com.linkerbot.vibemake.service.config.VibemakeProperties; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -17,9 +17,9 @@ public class AiSearchRules { private final JsonNode rankingSchema; private final String intentPrompt; private final String rankingPrompt; - private final CommunityProperties properties; + private final VibemakeProperties properties; - public AiSearchRules(ObjectMapper json, CommunityProperties properties) throws IOException { + public AiSearchRules(ObjectMapper json, VibemakeProperties properties) throws IOException { this.properties = properties; intentSchema = (ObjectNode) json.readTree(read("intent.schema.json")); rankingSchema = json.readTree(read("ranking.schema.json")); diff --git a/community-service/src/main/java/com/linkerbot/community/service/ai/ArkAiClient.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/ArkAiClient.java similarity index 97% rename from community-service/src/main/java/com/linkerbot/community/service/ai/ArkAiClient.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/ArkAiClient.java index 6f148d5..d825e6b 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/ai/ArkAiClient.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/ai/ArkAiClient.java @@ -1,12 +1,12 @@ -package com.linkerbot.community.service.ai; +package com.linkerbot.vibemake.service.ai; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.AiProperties; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.AiProperties; import java.net.URI; import java.net.http.*; import java.nio.ByteBuffer; diff --git a/community-service/src/main/java/com/linkerbot/community/service/config/AdminProperties.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/AdminProperties.java similarity index 87% rename from community-service/src/main/java/com/linkerbot/community/service/config/AdminProperties.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/AdminProperties.java index caa111f..d9edc26 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/config/AdminProperties.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/AdminProperties.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.config; +package com.linkerbot.vibemake.service.config; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; @@ -17,7 +17,7 @@ import java.util.List; @Setter @Component @Validated -@ConfigurationProperties(prefix = "community.admin") +@ConfigurationProperties(prefix = "vibemake.admin") public class AdminProperties { private List allowedOrigins = List.of(); private String githubToken = ""; diff --git a/community-service/src/main/java/com/linkerbot/community/service/config/AiProperties.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/AiProperties.java similarity index 95% rename from community-service/src/main/java/com/linkerbot/community/service/config/AiProperties.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/AiProperties.java index 71bb4ce..50ff8b8 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/config/AiProperties.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/AiProperties.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.config; +package com.linkerbot.vibemake.service.config; import jakarta.validation.constraints.AssertTrue; import jakarta.validation.constraints.Max; @@ -16,7 +16,7 @@ import org.springframework.validation.annotation.Validated; @Setter @Validated @Component -@ConfigurationProperties(prefix = "community.ai") +@ConfigurationProperties(prefix = "vibemake.ai") public class AiProperties { private boolean enabled; private String apiKey = ""; diff --git a/community-service/src/main/java/com/linkerbot/community/service/config/ForkProperties.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/ForkProperties.java similarity index 87% rename from community-service/src/main/java/com/linkerbot/community/service/config/ForkProperties.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/ForkProperties.java index aa452e9..cc0edc7 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/config/ForkProperties.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/ForkProperties.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.config; +package com.linkerbot.vibemake.service.config; import jakarta.validation.constraints.AssertTrue; import jakarta.validation.constraints.Max; @@ -17,13 +17,13 @@ import org.springframework.validation.annotation.Validated; @Setter @Validated @Component -@ConfigurationProperties(prefix = "community.fork") +@ConfigurationProperties(prefix = "vibemake.fork") public class ForkProperties { @NotBlank private String gitExecutable = "git"; private Duration timeout = Duration.ofMinutes(5); @Min(1) @Max(32) private int maxConcurrent = 2; @Positive private long maxTemporaryBytes = 5L * 1024 * 1024 * 1024; - @NotBlank private String temporaryDirectory = Path.of(System.getProperty("java.io.tmpdir"), "community-fork").toString(); + @NotBlank private String temporaryDirectory = Path.of(System.getProperty("java.io.tmpdir"), "vibemake-fork").toString(); @AssertTrue(message = "Fork 超时必须在 100 毫秒至 1 小时之间") public boolean isTimeoutValid() { diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/LimitProperties.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/LimitProperties.java new file mode 100644 index 0000000..e45ccb7 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/LimitProperties.java @@ -0,0 +1,61 @@ +package com.linkerbot.vibemake.service.config; + +import jakarta.validation.constraints.AssertTrue; + +import lombok.Getter; +import lombok.Setter; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +@Getter +@Setter +@Validated +@Component +@ConfigurationProperties("vibemake.limits") +public class LimitProperties { + private boolean enabled = true; + private List trustedProxies = List.of(); + private Map perMinute = defaults(); + private long jsonBytes = 256 * 1024; + private long urdfJsonBytes = 2 * 1024 * 1024; + private long commitJsonBytes = 64 * 1024 * 1024; + private int fileConcurrent = 4; + + private static Map defaults() { + Map values = new LinkedHashMap<>(); + values.put("captcha", 20); + values.put("login-ip", 20); + values.put("login-account", 10); + values.put("admin-login", 30); + values.put("vibemake-read", 120); + values.put("file-read", 60); + values.put("create", 5); + values.put("fork", 10); + values.put("file-write", 10); + values.put("cover-sign", 30); + values.put("urdf-sign", 20); + values.put("comment", 10); + values.put("like", 60); + return values; + } + + @AssertTrue(message = "限流及请求保护配置不合法") + public boolean isValid() { + return perMinute != null + && perMinute.keySet().containsAll(defaults().keySet()) + && perMinute.values().stream().allMatch(n -> n != null && n > 0 && n <= 100000) + && jsonBytes > 0 + && urdfJsonBytes > 0 + && commitJsonBytes > 0 + && commitJsonBytes <= 256L * 1024 * 1024 + && fileConcurrent > 0 + && fileConcurrent <= 64 + && trustedProxies != null; + } +} diff --git a/community-service/src/main/java/com/linkerbot/community/service/config/MybatisConfiguration.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/MybatisConfiguration.java similarity index 93% rename from community-service/src/main/java/com/linkerbot/community/service/config/MybatisConfiguration.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/MybatisConfiguration.java index 329b3d2..7ee130c 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/config/MybatisConfiguration.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/MybatisConfiguration.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.config; +package com.linkerbot.vibemake.service.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/community-service/src/main/java/com/linkerbot/community/service/config/OssProperties.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/OssProperties.java similarity index 96% rename from community-service/src/main/java/com/linkerbot/community/service/config/OssProperties.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/OssProperties.java index 1db00c9..10f3ddc 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/config/OssProperties.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/OssProperties.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.config; +package com.linkerbot.vibemake.service.config; import jakarta.validation.constraints.AssertTrue; import java.net.URI; @@ -14,7 +14,7 @@ import org.springframework.validation.annotation.Validated; @Setter @Validated @Component -@ConfigurationProperties(prefix = "community.oss") +@ConfigurationProperties(prefix = "vibemake.oss") public class OssProperties { private boolean enabled; private String region = ""; diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/RedisStateProperties.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/RedisStateProperties.java new file mode 100644 index 0000000..d667444 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/RedisStateProperties.java @@ -0,0 +1,27 @@ +package com.linkerbot.vibemake.service.config; + +import jakarta.validation.constraints.Pattern; + +import lombok.Getter; +import lombok.Setter; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +@Getter +@Setter +@Component +@Validated +@ConfigurationProperties("vibemake.redis") +public class RedisStateProperties { + @Pattern(regexp = "[A-Za-z0-9:_-]{1,100}") + private String keyPrefix = "vibemake:test"; + + @Pattern(regexp = "api|admin") + private String application = "api"; + + public String prefix() { + return keyPrefix + ":" + application + ":v1:"; + } +} diff --git a/community-service/src/main/java/com/linkerbot/community/service/config/UrdfProperties.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/UrdfProperties.java similarity index 83% rename from community-service/src/main/java/com/linkerbot/community/service/config/UrdfProperties.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/UrdfProperties.java index f00c217..45ef039 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/config/UrdfProperties.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/UrdfProperties.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.config; +package com.linkerbot.vibemake.service.config; import jakarta.validation.constraints.Positive; import lombok.Getter; @@ -11,7 +11,7 @@ import org.springframework.validation.annotation.Validated; @Setter @Validated @Component -@ConfigurationProperties(prefix = "community.oss.urdf") +@ConfigurationProperties(prefix = "vibemake.oss.urdf") public class UrdfProperties { @Positive private long maxFileBytes = 50L * 1024 * 1024; @Positive private long maxTotalBytes = 200L * 1024 * 1024; diff --git a/community-service/src/main/java/com/linkerbot/community/service/config/CommunityProperties.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/VibemakeProperties.java similarity index 88% rename from community-service/src/main/java/com/linkerbot/community/service/config/CommunityProperties.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/VibemakeProperties.java index 52c6d25..2dc7094 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/config/CommunityProperties.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/config/VibemakeProperties.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.config; +package com.linkerbot.vibemake.service.config; import lombok.Getter; import lombok.Setter; @@ -13,8 +13,8 @@ import java.util.Map; @Getter @Setter @Component -@ConfigurationProperties(prefix = "community") -public class CommunityProperties { +@ConfigurationProperties(prefix = "vibemake") +public class VibemakeProperties { private Map types = defaultTypes(); private long maxTextBytes = 1024 * 1024; private long maxFileBytes = 10 * 1024 * 1024; @@ -37,7 +37,7 @@ public class CommunityProperties { @Setter public static class Gitea { private String baseUrl = "http://localhost:3000"; - private String owner = "community"; + private String owner = "vibemake"; private String token = ""; private Duration connectTimeout = Duration.ofSeconds(5); private Duration requestTimeout = Duration.ofSeconds(30); diff --git a/community-service/src/main/java/com/linkerbot/community/service/fork/CliGitSnapshotCopier.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/CliGitSnapshotCopier.java similarity index 91% rename from community-service/src/main/java/com/linkerbot/community/service/fork/CliGitSnapshotCopier.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/CliGitSnapshotCopier.java index ee3a28b..708e084 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/fork/CliGitSnapshotCopier.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/CliGitSnapshotCopier.java @@ -1,13 +1,13 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.common.FilePaths; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.config.ForkProperties; -import com.linkerbot.community.service.gitea.GiteaClient; -import com.linkerbot.community.service.gitea.GiteaClient.Repository; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.FilePaths; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.config.ForkProperties; +import com.linkerbot.vibemake.service.gitea.GiteaClient; +import com.linkerbot.vibemake.service.gitea.GiteaClient.Repository; import java.io.IOException; import java.net.URI; import java.net.URLEncoder; @@ -26,15 +26,15 @@ import org.springframework.stereotype.Component; public class CliGitSnapshotCopier implements GitSnapshotCopier { private static final Logger log = LoggerFactory.getLogger(CliGitSnapshotCopier.class); private final ForkProperties properties; - private final CommunityProperties community; + private final VibemakeProperties vibemake; private final GitCommandRunner commands; private final GiteaClient gitea; private final ObjectMapper json; - public CliGitSnapshotCopier(ForkProperties properties, CommunityProperties community, GitCommandRunner commands, + public CliGitSnapshotCopier(ForkProperties properties, VibemakeProperties vibemake, GitCommandRunner commands, GiteaClient gitea, ObjectMapper json) { this.properties = properties; - this.community = community; + this.vibemake = vibemake; this.commands = commands; this.gitea = gitea; this.json = json; @@ -44,7 +44,7 @@ public class CliGitSnapshotCopier implements GitSnapshotCopier { public void checkAvailable() { try { trustedBase(); - if (community.getGitea().getToken().isBlank()) throw unavailable(); + if (vibemake.getGitea().getToken().isBlank()) throw unavailable(); ForkDeadline deadline = new ForkDeadline(Duration.ofSeconds(5)); if (commands.run(null, deadline, "git-runtime", Map.of(), Map.of(), "--version").exitCode() != 0 || commands.run(null, deadline, "lfs-runtime", Map.of(), Map.of(), "lfs", "version").exitCode() != 0) @@ -62,7 +62,7 @@ public class CliGitSnapshotCopier implements GitSnapshotCopier { } protected URI trustedBase() { - URI base = URI.create(community.getGitea().getBaseUrl().replaceAll("/+$", "")); + URI base = URI.create(vibemake.getGitea().getBaseUrl().replaceAll("/+$", "")); if (!("http".equals(base.getScheme()) || "https".equals(base.getScheme())) || base.getHost() == null || base.getRawUserInfo() != null || base.getRawQuery() != null || base.getRawFragment() != null) throw unavailable(); @@ -78,7 +78,7 @@ public class CliGitSnapshotCopier implements GitSnapshotCopier { protected Map configuration(String lfsEndpoint) { String username = gitea.authenticatedUsername(); if (username == null || username.isBlank()) throw unavailable(); - String basic = Base64.getEncoder().encodeToString((username + ":" + community.getGitea().getToken()).getBytes(StandardCharsets.UTF_8)); + String basic = Base64.getEncoder().encodeToString((username + ":" + vibemake.getGitea().getToken()).getBytes(StandardCharsets.UTF_8)); Map settings = new LinkedHashMap<>(); settings.put("http." + trustedBase() + "/.extraHeader", "Authorization: Basic " + basic); settings.put("lfs.url", lfsEndpoint); @@ -121,12 +121,12 @@ public class CliGitSnapshotCopier implements GitSnapshotCopier { } snapshot.require("source-check", "cat-file", "-e", sha + "^{commit}"); snapshot.tree = FilePaths.sha(snapshot.require("source-tree", "rev-parse", sha + "^{tree}")); - String author = authorName == null ? "Community user" : authorName.replaceAll("[\\r\\n<>\\x00]", " ").trim(); - if (author.isEmpty()) author = "Community user"; + String author = authorName == null ? "Vibemake user" : authorName.replaceAll("[\\r\\n<>\\x00]", " ").trim(); + if (author.isEmpty()) author = "Vibemake user"; Map identity = Map.of("GIT_AUTHOR_NAME", author, "GIT_COMMITTER_NAME", author, - "GIT_AUTHOR_EMAIL", authorCode + "@users.community.invalid", "GIT_COMMITTER_EMAIL", authorCode + "@users.community.invalid"); + "GIT_AUTHOR_EMAIL", authorCode + "@users.vibemake.invalid", "GIT_COMMITTER_EMAIL", authorCode + "@users.vibemake.invalid"); GitCommandRunner.Result commit = commands.run(workspace, deadline, "root-commit", settings, identity, - "commit-tree", snapshot.tree, "-m", "Fork community snapshot"); + "commit-tree", snapshot.tree, "-m", "Fork vibemake snapshot"); if (commit.exitCode() != 0) throw GitCommandRunner.failed(deadline); snapshot.commit = FilePaths.sha(commit.output()); snapshot.require("snapshot-ref", "update-ref", "refs/heads/snapshot", snapshot.commit); diff --git a/community-service/src/main/java/com/linkerbot/community/service/fork/ForkDeadline.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/ForkDeadline.java similarity index 94% rename from community-service/src/main/java/com/linkerbot/community/service/fork/ForkDeadline.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/ForkDeadline.java index 9944bdd..59099c7 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/fork/ForkDeadline.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/ForkDeadline.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.gitea.GiteaFailure; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.gitea.GiteaFailure; import java.time.Duration; import java.util.Map; import java.util.ArrayList; diff --git a/community-service/src/main/java/com/linkerbot/community/service/fork/ForkExecutor.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/ForkExecutor.java similarity index 55% rename from community-service/src/main/java/com/linkerbot/community/service/fork/ForkExecutor.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/ForkExecutor.java index 07c45a5..df71ff6 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/fork/ForkExecutor.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/ForkExecutor.java @@ -1,17 +1,20 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; + +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.ForkProperties; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.ForkProperties; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; -import java.util.Set; -import java.util.concurrent.*; -import java.util.function.Function; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; import org.springframework.stereotype.Component; +import java.util.Set; +import java.util.concurrent.*; +import java.util.function.Function; + /** 同步等待结果,但工作线程及并发名额的生命周期不依赖 HTTP 连接。 */ @Component public class ForkExecutor { @@ -19,7 +22,9 @@ public class ForkExecutor { private final ForkProperties properties; private final GitSnapshotCopier copier; private final Semaphore permits; - private final ExecutorService workers = Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name("project-fork-", 0).factory()); + private final ExecutorService workers = + Executors.newThreadPerTaskExecutor( + Thread.ofVirtual().name("project-fork-", 0).factory()); private final Set> active = ConcurrentHashMap.newKeySet(); public ForkExecutor(ForkProperties properties, GitSnapshotCopier copier) { @@ -30,28 +35,50 @@ public class ForkExecutor { @PostConstruct public void inspectRuntime() { - try { copier.checkAvailable(); } - catch (BusinessException error) { log.warn("Fork 运行依赖不可用 code={}", error.code()); } + try { + copier.checkAvailable(); + } catch (BusinessException error) { + log.warn("Fork 运行依赖不可用 code={}", error.code()); + } } public T execute(Function action) { ForkDeadline deadline = new ForkDeadline(properties.getTimeout()); - if (!permits.tryAcquire()) throw new BusinessException(429, "FORK_BUSY", "Fork 繁忙,请稍后手动重试"); - try { copier.checkAvailable(); } - catch (RuntimeException error) { permits.release(); throw error; } + if (!permits.tryAcquire()) + throw new com.linkerbot.vibemake.common.RateLimitedException( + "FORK_BUSY", "Fork 繁忙,请稍后手动重试", 1); + try { + copier.checkAvailable(); + } catch (RuntimeException error) { + permits.release(); + throw error; + } String requestId = MDC.get("requestId"); - FutureTask task = new FutureTask<>(() -> { - ForkDeadline.bind(deadline); - if (requestId != null) MDC.put("requestId", requestId); - try { deadline.check(); return action.apply(deadline); } - finally { deadline.closeResources(); ForkDeadline.unbind(); MDC.remove("requestId"); } - }); + FutureTask task = + new FutureTask<>( + () -> { + ForkDeadline.bind(deadline); + if (requestId != null) MDC.put("requestId", requestId); + try { + deadline.check(); + return action.apply(deadline); + } finally { + deadline.closeResources(); + ForkDeadline.unbind(); + MDC.remove("requestId"); + } + }); active.add(task); try { - workers.execute(() -> { - try { task.run(); } - finally { active.remove(task); permits.release(); } - }); + workers.execute( + () -> { + try { + task.run(); + } finally { + active.remove(task); + permits.release(); + } + }); } catch (RejectedExecutionException error) { active.remove(task); permits.release(); @@ -82,9 +109,13 @@ public class ForkExecutor { private BusinessException failure(ForkDeadline deadline) { BusinessException error = deadline.failure(); - return new BusinessException(error.status(), error.code(), error.getMessage(), deadline.details()); + return new BusinessException( + error.status(), error.code(), error.getMessage(), deadline.details()); } @PreDestroy - public void close() { active.forEach(task -> task.cancel(true)); workers.shutdownNow(); } + public void close() { + active.forEach(task -> task.cancel(true)); + workers.shutdownNow(); + } } diff --git a/community-service/src/main/java/com/linkerbot/community/service/fork/GitCommandRunner.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/GitCommandRunner.java similarity index 97% rename from community-service/src/main/java/com/linkerbot/community/service/fork/GitCommandRunner.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/GitCommandRunner.java index c4ef018..2eb3094 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/fork/GitCommandRunner.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/GitCommandRunner.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.ForkProperties; -import com.linkerbot.community.service.gitea.GiteaFailure; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.ForkProperties; +import com.linkerbot.vibemake.service.gitea.GiteaFailure; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/community-service/src/main/java/com/linkerbot/community/service/fork/GitSnapshotCopier.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/GitSnapshotCopier.java similarity index 80% rename from community-service/src/main/java/com/linkerbot/community/service/fork/GitSnapshotCopier.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/GitSnapshotCopier.java index 0c7fa2d..23da91b 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/fork/GitSnapshotCopier.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/GitSnapshotCopier.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; -import com.linkerbot.community.service.gitea.GiteaClient.Repository; +import com.linkerbot.vibemake.service.gitea.GiteaClient.Repository; /** 仓库传输边界;准备阶段不创建远端仓库,业务测试可使用内存替身。 */ public interface GitSnapshotCopier { diff --git a/community-service/src/main/java/com/linkerbot/community/service/fork/LfsEndpointGuard.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/LfsEndpointGuard.java similarity index 99% rename from community-service/src/main/java/com/linkerbot/community/service/fork/LfsEndpointGuard.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/LfsEndpointGuard.java index 91692cd..c11016c 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/fork/LfsEndpointGuard.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/fork/LfsEndpointGuard.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/community-service/src/main/java/com/linkerbot/community/service/gitea/GiteaClient.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/GiteaClient.java similarity index 95% rename from community-service/src/main/java/com/linkerbot/community/service/gitea/GiteaClient.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/GiteaClient.java index 9f68b1c..986b07b 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/gitea/GiteaClient.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/GiteaClient.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.service.gitea; +package com.linkerbot.vibemake.service.gitea; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.common.PageResponse; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.common.PageResponse; import java.util.List; import java.time.Duration; diff --git a/community-service/src/main/java/com/linkerbot/community/service/gitea/GiteaFailure.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/GiteaFailure.java similarity index 75% rename from community-service/src/main/java/com/linkerbot/community/service/gitea/GiteaFailure.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/GiteaFailure.java index ce9b6a4..4201dee 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/gitea/GiteaFailure.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/GiteaFailure.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.service.gitea; +package com.linkerbot.vibemake.service.gitea; -import com.linkerbot.community.common.BusinessException; +import com.linkerbot.vibemake.common.BusinessException; public class GiteaFailure extends BusinessException { private final boolean uncertain; diff --git a/community-service/src/main/java/com/linkerbot/community/service/gitea/RestGiteaClient.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/RestGiteaClient.java similarity index 74% rename from community-service/src/main/java/com/linkerbot/community/service/gitea/RestGiteaClient.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/RestGiteaClient.java index c7c0ad3..9ef7693 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/gitea/RestGiteaClient.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/gitea/RestGiteaClient.java @@ -1,13 +1,14 @@ -package com.linkerbot.community.service.gitea; +package com.linkerbot.vibemake.service.gitea; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.common.FilePaths; -import com.linkerbot.community.common.PageResponse; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.fork.ForkDeadline; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.FilePaths; +import com.linkerbot.vibemake.common.LimitedHttpBody; +import com.linkerbot.vibemake.common.PageResponse; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.fork.ForkDeadline; import org.springframework.stereotype.Component; @@ -18,16 +19,16 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.charset.StandardCharsets; -import java.util.*; import java.time.Duration; +import java.util.*; @Component public class RestGiteaClient implements GiteaClient { - private final CommunityProperties properties; + private final VibemakeProperties properties; private final ObjectMapper json; private final HttpClient http; - public RestGiteaClient(CommunityProperties properties, ObjectMapper json) { + public RestGiteaClient(VibemakeProperties properties, ObjectMapper json) { this.properties = properties; this.json = json; this.http = @@ -56,7 +57,8 @@ public class RestGiteaClient implements GiteaClient { return request(method, path, body, properties.getGitea().getRequestTimeout()); } - private HttpResponse request(String method, String path, Object body, Duration timeout) { + private HttpResponse request( + String method, String path, Object body, Duration timeout) { if (properties.getGitea().getToken().isBlank()) throw new GiteaFailure(503, "GITEA_NOT_CONFIGURED", "请配置 Gitea Token", false); try { @@ -74,12 +76,15 @@ public class RestGiteaClient implements GiteaClient { HttpRequest.BodyPublishers.ofByteArray( json.writeValueAsBytes(body))); HttpResponse response = - http.send(builder.build(), HttpResponse.BodyHandlers.ofByteArray()); + http.send( + builder.build(), + info -> new LimitedHttpBody(responseLimit(path, info.statusCode()))); int status = response.statusCode(); if (status < 200 || status >= 300) { if (status == 404) throw new GiteaFailure(404, "NOT_FOUND", "仓库文件或版本不存在", false); if (status == 422 && path.equals("/repos/migrate")) - throw new GiteaFailure(422, "GITEA_MIGRATION_REJECTED", "Gitea 迁移失败,需核对源站访问和服务端迁移日志", false); + throw new GiteaFailure( + 422, "GITEA_MIGRATION_REJECTED", "Gitea 迁移失败,需核对源站访问和服务端迁移日志", false); if (status == 409 || status == 422) throw new GiteaFailure(409, "GITEA_CONFLICT", "仓库内容冲突,请刷新后重试", false); throw new GiteaFailure( @@ -94,11 +99,22 @@ public class RestGiteaClient implements GiteaClient { throw new GiteaFailure( 504, "REMOTE_RESULT_UNKNOWN", "仓库调用被中断,写入结果需核对", !method.equals("GET")); } catch (IOException error) { + for (Throwable cause = error; cause != null; cause = cause.getCause()) + if (cause instanceof LimitedHttpBody.TooLarge && method.equals("GET")) + throw new GiteaFailure(502, "GITEA_RESPONSE_TOO_LARGE", "仓库响应超过读取限制", false); throw new GiteaFailure( 504, "REMOTE_RESULT_UNKNOWN", "仓库连接异常或超时,写入结果需核对", !method.equals("GET")); } } + private long responseLimit(String path, int status) { + if (status < 200 || status >= 300) return 64 * 1024; + if (path.contains("/raw/")) return properties.getMaxFileBytes(); + if (path.contains("/contents")) + return (properties.getMaxFileBytes() + 2) / 3 * 4 + 2 * 1024 * 1024; + return 8 * 1024 * 1024; + } + private JsonNode parse(byte[] bytes, boolean writing) { try { return json.readTree(bytes); @@ -139,16 +155,25 @@ public class RestGiteaClient implements GiteaClient { @Override public String branch(Repository repo, String branchName) { JsonNode branch = - parse(request("GET", repoPath(repo) + "/branches/" + encode(branchName), null).body(), false); + parse( + request("GET", repoPath(repo) + "/branches/" + encode(branchName), null) + .body(), + false); return FilePaths.sha(branch.path("commit").path("id").asText()); } private RemoteRepository remote(JsonNode data) { if (data.path("id").asLong() <= 0) throw new GiteaFailure(502, "GITEA_INVALID_RESPONSE", "仓库响应缺少标识", true); - return new RemoteRepository(data.path("id").asLong(), data.path("owner").path("login").asText(), - data.path("name").asText(), data.path("private").asBoolean(), data.path("mirror").asBoolean(), - data.path("empty").asBoolean(), data.path("original_url").asText(), data.path("default_branch").asText()); + return new RemoteRepository( + data.path("id").asLong(), + data.path("owner").path("login").asText(), + data.path("name").asText(), + data.path("private").asBoolean(), + data.path("mirror").asBoolean(), + data.path("empty").asBoolean(), + data.path("original_url").asText(), + data.path("default_branch").asText()); } @Override @@ -157,7 +182,8 @@ public class RestGiteaClient implements GiteaClient { } @Override - public RemoteRepository migrate(String cloneUrl, String name, Duration timeout, String description) { + public RemoteRepository migrate( + String cloneUrl, String name, Duration timeout, String description) { Map body = new LinkedHashMap<>(); body.put("clone_addr", cloneUrl); body.put("repo_owner", properties.getGitea().getOwner()); @@ -167,7 +193,8 @@ public class RestGiteaClient implements GiteaClient { body.put("mirror", false); body.put("lfs", true); if (description != null) body.put("description", description); - for (String option : List.of("issues", "labels", "milestones", "pull_requests", "releases", "wiki")) + for (String option : + List.of("issues", "labels", "milestones", "pull_requests", "releases", "wiki")) body.put(option, false); HttpResponse response = request("POST", "/repos/migrate", body, timeout); if (response.statusCode() != 201) @@ -177,13 +204,32 @@ public class RestGiteaClient implements GiteaClient { @Override public RemoteRepository inspect(String name) { - return remote(parse(request("GET", "/repos/" + encode(properties.getGitea().getOwner()) + "/" + encode(name), null).body(), false)); + return remote( + parse( + request( + "GET", + "/repos/" + + encode(properties.getGitea().getOwner()) + + "/" + + encode(name), + null) + .body(), + false)); } @Override public MigrationTarget inspectMigrationTarget(String name) { - JsonNode data = parse(request("GET", "/repos/" + encode(properties.getGitea().getOwner()) - + "/" + encode(name), null).body(), false); + JsonNode data = + parse( + request( + "GET", + "/repos/" + + encode(properties.getGitea().getOwner()) + + "/" + + encode(name), + null) + .body(), + false); if (!data.path("private").isBoolean() || !data.path("mirror").isBoolean()) throw new GiteaFailure(502, "GITEA_INVALID_RESPONSE", "无法核验迁移仓库属性", false); return new MigrationTarget(remote(data), data.path("description").asText(null)); @@ -194,8 +240,7 @@ public class RestGiteaClient implements GiteaClient { if (!properties.getGitea().getOwner().equals(repository.owner())) throw BusinessException.conflict("仓库组织与当前配置不一致,禁止删除"); RemoteRepository current = inspect(repository.name()); - if (current.id() != repository.id()) - throw BusinessException.conflict("仓库身份已变化,禁止删除"); + if (current.id() != repository.id()) throw BusinessException.conflict("仓库身份已变化,禁止删除"); HttpResponse response = request("DELETE", repoPath(repository), null); if (response.statusCode() != 204) throw new GiteaFailure(502, "MIGRATION_CLEANUP_UNCONFIRMED", "仓库清理结果尚未确认", true); @@ -203,7 +248,10 @@ public class RestGiteaClient implements GiteaClient { @Override public void createBranch(Repository repo, String name, String sha) { - request("POST", repoPath(repo) + "/branches", Map.of("new_branch_name", name, "old_ref_name", FilePaths.sha(sha))); + request( + "POST", + repoPath(repo) + "/branches", + Map.of("new_branch_name", name, "old_ref_name", FilePaths.sha(sha))); } @Override @@ -214,8 +262,10 @@ public class RestGiteaClient implements GiteaClient { @Override public void checkMigrationSettings() { JsonNode settings = parse(request("GET", "/settings/repository", null).body(), false); - if (!settings.has("lfs_disabled") || settings.path("lfs_disabled").asBoolean() - || settings.path("migrations_disabled").asBoolean() || settings.path("http_git_disabled").asBoolean()) + if (!settings.has("lfs_disabled") + || settings.path("lfs_disabled").asBoolean() + || settings.path("migrations_disabled").asBoolean() + || settings.path("http_git_disabled").asBoolean()) throw BusinessException.badRequest("Gitea 必须启用迁移、HTTP Git 和 LFS"); } @@ -228,18 +278,33 @@ public class RestGiteaClient implements GiteaClient { long modules = 0; long seen = 0; for (int page = 1; page <= 10000; page++) { - JsonNode tree = parse(request("GET", repoPath(repo) + "/git/trees/" + FilePaths.sha(sha) - + "?recursive=true&per_page=1000&page=" + page, null).body(), false); + JsonNode tree = + parse( + request( + "GET", + repoPath(repo) + + "/git/trees/" + + FilePaths.sha(sha) + + "?recursive=true&per_page=1000&page=" + + page, + null) + .body(), + false); JsonNode entries = tree.path("tree"); - if (!entries.isArray()) throw new GiteaFailure(502, "GITEA_INVALID_RESPONSE", "Git 文件树响应格式异常", false); + if (!entries.isArray()) + throw new GiteaFailure(502, "GITEA_INVALID_RESPONSE", "Git 文件树响应格式异常", false); for (JsonNode entry : entries) { if (entry.path("size").asLong() > maxFileBytes) large++; if (entry.path("mode").asText().equals("120000")) links++; if (entry.path("mode").asText().equals("160000")) modules++; } seen += entries.size(); - if (seen >= tree.path("total_count").asLong(seen) && !tree.path("truncated").asBoolean()) break; - if (entries.isEmpty() || page == 10000) { warnings.add("文件树扫描不完整,需要人工核对剩余文件"); break; } + if (seen >= tree.path("total_count").asLong(seen) + && !tree.path("truncated").asBoolean()) break; + if (entries.isEmpty() || page == 10000) { + warnings.add("文件树扫描不完整,需要人工核对剩余文件"); + break; + } } if (large > 0) warnings.add("发布快照有 " + large + " 个文件超过社区单文件读取限制 " + maxFileBytes + " 字节"); if (links > 0) warnings.add("发布快照有 " + links + " 个符号链接,在线普通文件读取不支持,Git 快照 Fork 保留链接"); @@ -338,7 +403,7 @@ public class RestGiteaClient implements GiteaClient { "name", authorName, "email", - authorCode + "@users.community.invalid")); + authorCode + "@users.vibemake.invalid")); JsonNode result = parse(request("POST", repoPath(repo) + "/contents", body).body(), true); String sha = result.path("commit").path("sha").asText(); if (sha.isBlank()) diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/AiSearchServiceImpl.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/AiSearchServiceImpl.java new file mode 100644 index 0000000..944d918 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/AiSearchServiceImpl.java @@ -0,0 +1,299 @@ +package com.linkerbot.vibemake.service.impl; + +import com.linkerbot.vibemake.bean.ai.AiContracts.*; +import com.linkerbot.vibemake.common.ApiResponse; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.AiSearchService; +import com.linkerbot.vibemake.service.ai.AiProjectAssistant; +import com.linkerbot.vibemake.service.config.AiProperties; +import com.linkerbot.vibemake.service.config.ForkProperties; +import com.linkerbot.vibemake.service.state.RateLimits; + +import jakarta.annotation.PreDestroy; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.MDC; +import org.springframework.stereotype.Service; +import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; + +import java.io.IOException; +import java.time.Duration; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicBoolean; + +/** Redis 用户频率限制与本机 SSE 生命周期。 */ +@Service +public class AiSearchServiceImpl implements AiSearchService { + private static final Logger log = LoggerFactory.getLogger(AiSearchServiceImpl.class); + private final AiProperties properties; + private final AiProjectAssistant assistant; + private final ForkProperties forkProperties; + private final Semaphore permits; + private final ExecutorService workers = + Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name("ai-search-", 0).factory()); + private final ScheduledExecutorService timer = + Executors.newScheduledThreadPool( + 2, Thread.ofPlatform().daemon(true).name("ai-search-timer-", 0).factory()); + private final RateLimits rates; + private final Set active = ConcurrentHashMap.newKeySet(); + + public AiSearchServiceImpl( + AiProperties properties, + AiProjectAssistant assistant, + ForkProperties forkProperties, + RateLimits rates) { + this.properties = properties; + this.assistant = assistant; + this.forkProperties = forkProperties; + this.rates = rates; + permits = new Semaphore(properties.getMaxConcurrent()); + } + + @Override + public SseEmitter chat(long userId, ChatRequest request) { + validateHistory(request); + if (!properties.isEnabled()) + throw new BusinessException(503, "AI_UNAVAILABLE", "Maker AI 暂未开启"); + if (!permits.tryAcquire()) + throw new com.linkerbot.vibemake.common.RateLimitedException( + "AI_BUSY", "Maker AI 繁忙,请稍后重试", 1); + try { + rateLimit(userId); + } catch (RuntimeException error) { + permits.release(); + throw error; + } + Job job = new Job(userId, request, MDC.get("requestId")); + active.add(job); + try { + job.start(); + return job.emitter; + } catch (RejectedExecutionException error) { + job.cancel(); + job.release(); + throw new BusinessException(503, "AI_UNAVAILABLE", "Maker AI 暂不可用"); + } + } + + private void validateHistory(ChatRequest request) { + if (request.history().size() % 2 != 0) + throw BusinessException.badRequest("history 必须为完整的用户和助手对话轮次"); + for (int index = 0; index < request.history().size(); index++) { + String expected = index % 2 == 0 ? "user" : "assistant"; + if (!expected.equals(request.history().get(index).role())) + throw BusinessException.badRequest("history 必须由 user 和 assistant 交替组成"); + } + } + + private void rateLimit(long userId) { + rates.check( + "ai", + Long.toString(userId), + properties.getRequestsPerMinute(), + Duration.ofMinutes(1), + "AI_RATE_LIMITED", + "Maker AI 请求过于频繁,请稍后重试"); + } + + @PreDestroy + public void close() { + active.forEach(Job::cancel); + workers.shutdownNow(); + timer.shutdownNow(); + } + + private final class Job { + private final long userId; + private final ChatRequest request; + private final String requestId; + private final long started = System.nanoTime(); + private final SseEmitter emitter = + new SseEmitter( + properties + .getSearchTimeout() + .plus(forkProperties.getTimeout()) + .plusSeconds(15) + .toMillis()); + private final AtomicBoolean finished = new AtomicBoolean(); + private final AtomicBoolean released = new AtomicBoolean(); + private final FutureTask task; + private volatile ScheduledFuture heartbeat; + private volatile ScheduledFuture deadline; + + private Job(long userId, ChatRequest request, String requestId) { + this.userId = userId; + this.request = request; + this.requestId = requestId; + task = + new FutureTask<>( + () -> { + run(); + return null; + }); + emitter.onCompletion(this::cancel); + emitter.onError(ignored -> cancel()); + emitter.onTimeout( + () -> + fail( + new BusinessException( + 504, + "AI_TIMEOUT", + "Maker AI 处理超时,若涉及创建或 Fork,请先核对工作区项目状态"))); + } + + private void start() { + heartbeat = + timer.scheduleAtFixedRate( + this::heartbeat, + properties.getHeartbeatInterval().toMillis(), + properties.getHeartbeatInterval().toMillis(), + TimeUnit.MILLISECONDS); + deadline = + timer.schedule( + () -> + fail( + new BusinessException( + 504, + "AI_TIMEOUT", + "Maker AI 处理超时,若涉及创建或 Fork,请先核对工作区项目状态")), + properties.getSearchTimeout().toMillis(), + TimeUnit.MILLISECONDS); + workers.execute( + () -> { + try { + task.run(); + } finally { + release(); + } + }); + if (finished.get()) stopTimers(); + } + + private void run() { + if (requestId != null) MDC.put("requestId", requestId); + try { + log.info("Maker AI 开始 requestId={}", requestId); + ChatResult result = + assistant.chat(userId, request, progress -> send("progress", progress)); + if (finished.compareAndSet(false, true)) { + write("result", success(result)); + stopTimers(); + emitter.complete(); + log.info( + "Maker AI 完成 requestId={} status={} resultCount={} projectCode={}" + + " durationMs={}", + requestId, + result.status(), + result.projects().size(), + result.project() == null ? null : result.project().projectCode(), + elapsed()); + } + } catch (BusinessException error) { + fail(error); + } catch (Exception error) { + log.warn( + "Maker AI 异常 requestId={} exceptionType={} location={} durationMs={}", + requestId, + error.getClass().getSimpleName(), + error.getStackTrace().length == 0 ? null : error.getStackTrace()[0], + elapsed()); + fail( + new BusinessException( + 500, "AI_SEARCH_FAILURE", "Maker AI 处理失败,若涉及创建或 Fork,请先核对工作区项目状态")); + } finally { + stopTimers(); + MDC.remove("requestId"); + } + } + + private void send(String event, Object data) { + if (finished.get() || Thread.currentThread().isInterrupted()) throw cancelled(); + if (data instanceof Progress progress && "forking".equals(progress.stage())) { + if (deadline != null) deadline.cancel(false); + deadline = + timer.schedule( + () -> + fail( + new BusinessException( + 504, + "FORK_TIMEOUT", + "Fork 超时,请先核对工作区项目状态")), + forkProperties.getTimeout().plusSeconds(15).toMillis(), + TimeUnit.MILLISECONDS); + } + if (!write(event, success(data))) throw cancelled(); + } + + private ApiResponse success(Object data) { + return new ApiResponse<>("OK", "成功", data, requestId); + } + + private boolean write(String event, ApiResponse data) { + try { + emitter.send(SseEmitter.event().name(event).data(data)); + return true; + } catch (IOException | IllegalStateException error) { + cancel(); + return false; + } + } + + private void heartbeat() { + if (finished.get()) return; + try { + emitter.send(SseEmitter.event().comment("keep-alive")); + } catch (IOException | IllegalStateException error) { + cancel(); + } + } + + private void fail(BusinessException error) { + if (!finished.compareAndSet(false, true)) return; + log.warn( + "Maker AI 失败 requestId={} code={} durationMs={}", + requestId, + error.code(), + elapsed()); + stopTimers(); + write( + "error", + new ApiResponse<>( + error.code(), error.getMessage(), error.details(), requestId)); + emitter.complete(); + task.cancel(true); + } + + private void cancel() { + boolean first = finished.compareAndSet(false, true); + stopTimers(); + // 即使终态写出时连接断开,也必须停止未完成的工作。 + if (first) { + task.cancel(true); + emitter.complete(); + log.info("Maker AI 连接关闭 requestId={} durationMs={}", requestId, elapsed()); + } + } + + private void stopTimers() { + if (heartbeat != null) heartbeat.cancel(false); + if (deadline != null) deadline.cancel(false); + } + + private void release() { + if (released.compareAndSet(false, true)) { + active.remove(this); + permits.release(); + } + } + + private long elapsed() { + return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - started); + } + + private BusinessException cancelled() { + return new BusinessException(499, "AI_CANCELLED", "Maker AI 已取消"); + } + } +} diff --git a/community-service/src/main/java/com/linkerbot/community/service/impl/CoverUploadServiceImpl.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/CoverUploadServiceImpl.java similarity index 55% rename from community-service/src/main/java/com/linkerbot/community/service/impl/CoverUploadServiceImpl.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/CoverUploadServiceImpl.java index 7fc81f8..6efeeda 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/impl/CoverUploadServiceImpl.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/CoverUploadServiceImpl.java @@ -1,31 +1,37 @@ -package com.linkerbot.community.service.impl; +package com.linkerbot.vibemake.service.impl; + +import com.linkerbot.vibemake.bean.Contracts.CoverUploadInput; +import com.linkerbot.vibemake.bean.Contracts.CoverUploadSignature; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.CoverUploadService; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.oss.OssPostSigner; +import com.linkerbot.vibemake.service.state.RateLimits; +import com.linkerbot.vibemake.service.support.ProjectActors; -import com.linkerbot.community.bean.Contracts.CoverUploadInput; -import com.linkerbot.community.bean.Contracts.CoverUploadSignature; -import com.linkerbot.community.service.support.ProjectActors; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.CoverUploadService; -import com.linkerbot.community.service.UserService; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.oss.OssPostSigner; -import java.util.Map; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import java.util.Map; @Service @RequiredArgsConstructor public class CoverUploadServiceImpl implements CoverUploadService { + private final RateLimits rateLimits; private static final Logger log = LoggerFactory.getLogger(CoverUploadServiceImpl.class); - private static final Map EXTENSIONS = Map.of( - "image/jpeg", "jpg", "image/png", "png", "image/webp", "webp"); + private static final Map EXTENSIONS = + Map.of("image/jpeg", "jpg", "image/png", "png", "image/webp", "webp"); private final UserService users; private final OssProperties properties; private final OssPostSigner signer; @Override public CoverUploadSignature signature(long userId, CoverUploadInput input) { + rateLimits.operation("cover-sign", userId); if (!properties.isEnabled()) throw new BusinessException(503, "OSS_UNAVAILABLE", "OSS 封面上传暂未开启"); String extension = EXTENSIONS.get(input.contentType()); @@ -34,8 +40,11 @@ public class CoverUploadServiceImpl implements CoverUploadService { throw new BusinessException(413, "UPLOAD_TOO_LARGE", "封面图片不能超过 5 MiB"); ProjectActors.Author author = ProjectActors.author(users, userId); CoverUploadSignature result = signer.sign(author.code(), input.contentType(), extension); - log.info("生成封面上传签名 userCode={} objectKey={} expiresAt={}", - author.code(), result.objectKey(), result.expiresAt()); + log.info( + "生成封面上传签名 userCode={} objectKey={} expiresAt={}", + author.code(), + result.objectKey(), + result.expiresAt()); return result; } } diff --git a/community-service/src/main/java/com/linkerbot/community/service/impl/FileServiceImpl.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/FileServiceImpl.java similarity index 90% rename from community-service/src/main/java/com/linkerbot/community/service/impl/FileServiceImpl.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/FileServiceImpl.java index b966b48..e17291f 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/impl/FileServiceImpl.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/FileServiceImpl.java @@ -1,15 +1,16 @@ -package com.linkerbot.community.service.impl; +package com.linkerbot.vibemake.service.impl; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.service.support.ProjectActors; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.FileService; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.UserService; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.gitea.*; -import com.linkerbot.community.service.support.ProjectSupport; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.FileService; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.gitea.*; +import com.linkerbot.vibemake.service.state.RateLimits; +import com.linkerbot.vibemake.service.support.ProjectActors; +import com.linkerbot.vibemake.service.support.ProjectSupport; import lombok.RequiredArgsConstructor; @@ -26,11 +27,12 @@ import java.util.*; @Service @RequiredArgsConstructor public class FileServiceImpl implements FileService { + private final RateLimits rateLimits; private static final Logger log = LoggerFactory.getLogger(FileServiceImpl.class); private final ProjectService projects; private final UserService users; private final GiteaClient gitea; - private final CommunityProperties config; + private final VibemakeProperties config; @Override public TreeView ownerTree(long userId, String code, String path, String commitSha) { @@ -43,7 +45,7 @@ public class FileServiceImpl implements FileService { } @Override - public TreeView communityTree(String code, String path) { + public TreeView vibemakeTree(String code, String path) { Project project = projects.published(code); return tree(project, project.getPublishedCommitSha(), path); } @@ -76,7 +78,7 @@ public class FileServiceImpl implements FileService { } @Override - public GiteaClient.StoredFile communityFile(String code, String path) { + public GiteaClient.StoredFile vibemakeFile(String code, String path) { Project project = projects.published(code); return gitea.file( projects.repository(project), @@ -85,7 +87,7 @@ public class FileServiceImpl implements FileService { } @Override - public FileView communityFileView(String code, String path) { + public FileView vibemakeFileView(String code, String path) { Project project = projects.published(code); return fileView( project.getPublishedCommitSha(), @@ -135,6 +137,7 @@ public class FileServiceImpl implements FileService { @Override public CommitView commit(long userId, String code, CommitInput input) { + rateLimits.operation("file-write", userId); return projects.write( userId, code, @@ -161,6 +164,7 @@ public class FileServiceImpl implements FileService { size(data.length, config.getMaxTextBytes()); changes.add(new GiteaClient.Change("create", path, null, data)); bytes += data.length; + size(bytes, config.getMaxRequestBytes()); } case UPDATE_FILE -> { if (item.content() == null) @@ -174,6 +178,7 @@ public class FileServiceImpl implements FileService { new GiteaClient.Change( "update", path, old.blobSha(), data)); bytes += data.length; + size(bytes, config.getMaxRequestBytes()); } case DELETE_FILE -> { GiteaClient.StoredFile old = gitea.file(repo, sha, path); @@ -210,6 +215,7 @@ public class FileServiceImpl implements FileService { String directory, List files, List paths) { + rateLimits.operation("file-write", userId); if (message == null || message.isBlank() || message.length() > 1000) throw BusinessException.badRequest("提交说明不合法"); if (files == null @@ -258,8 +264,7 @@ public class FileServiceImpl implements FileService { } ProjectActors.Author author = ProjectActors.author(users, userId); CommitView result = - gitea.commit( - repo, changes, message, author.nickname(), author.code()); + gitea.commit(repo, changes, message, author.nickname(), author.code()); log.info( "文件上传 projectCode={} commitSha={} fileCount={}", code, diff --git a/community-service/src/main/java/com/linkerbot/community/service/impl/InteractionServiceImpl.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/InteractionServiceImpl.java similarity index 71% rename from community-service/src/main/java/com/linkerbot/community/service/impl/InteractionServiceImpl.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/InteractionServiceImpl.java index f5644bc..2fd3afb 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/impl/InteractionServiceImpl.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/InteractionServiceImpl.java @@ -1,16 +1,17 @@ -package com.linkerbot.community.service.impl; +package com.linkerbot.vibemake.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.bean.entity.*; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.InteractionService; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.UserService; -import com.linkerbot.community.service.mapper.*; -import com.linkerbot.community.service.support.ProjectSupport; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.bean.entity.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.InteractionService; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.mapper.*; +import com.linkerbot.vibemake.service.state.RateLimits; +import com.linkerbot.vibemake.service.support.ProjectSupport; import lombok.RequiredArgsConstructor; @@ -22,6 +23,7 @@ import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor public class InteractionServiceImpl implements InteractionService { + private final RateLimits rateLimits; private static final Logger log = LoggerFactory.getLogger(InteractionServiceImpl.class); private final ProjectService projects; private final UserService users; @@ -40,8 +42,23 @@ public class InteractionServiceImpl implements InteractionService { .eq(ProjectComment::getDeleted, false) .orderByDesc(ProjectComment::getCreatedAt) .orderByDesc(ProjectComment::getId)); + java.util.Map authors = + users.publicViews( + result.getRecords().stream() + .map(ProjectComment::getUserId) + .collect(java.util.stream.Collectors.toSet())); return new PageResponse<>( - result.getRecords().stream().map(this::view).toList(), + result.getRecords().stream() + .map( + comment -> + new CommentView( + comment.getCommentCode(), + authors.getOrDefault( + comment.getUserId(), + new PublicUser(null, "已删除用户")), + comment.getContent(), + comment.getCreatedAt())) + .toList(), page, size, result.getTotal()); @@ -57,6 +74,7 @@ public class InteractionServiceImpl implements InteractionService { @Override public CommentView comment(long userId, String code, CommentInput input) { + rateLimits.operation("comment", userId); users.require(userId); Project project = projects.published(code); ProjectComment comment = new ProjectComment(); @@ -89,6 +107,7 @@ public class InteractionServiceImpl implements InteractionService { @Override public void like(long userId, String code) { + rateLimits.operation("like", userId); users.require(userId); Project project = projects.published(code); ProjectLike like = new ProjectLike(); @@ -105,6 +124,7 @@ public class InteractionServiceImpl implements InteractionService { @Override public void unlike(long userId, String code) { + rateLimits.operation("like", userId); Project project = projects.published(code); likes.delete( new LambdaQueryWrapper() diff --git a/community-service/src/main/java/com/linkerbot/community/service/impl/ProjectServiceImpl.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/ProjectServiceImpl.java similarity index 81% rename from community-service/src/main/java/com/linkerbot/community/service/impl/ProjectServiceImpl.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/ProjectServiceImpl.java index 8c19977..1e78216 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/impl/ProjectServiceImpl.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/ProjectServiceImpl.java @@ -1,28 +1,29 @@ -package com.linkerbot.community.service.impl; +package com.linkerbot.vibemake.service.impl; -import static com.linkerbot.community.service.support.ProjectSupport.now; -import static com.linkerbot.community.service.support.ProjectSupport.pageCheck; +import static com.linkerbot.vibemake.service.support.ProjectSupport.now; +import static com.linkerbot.vibemake.service.support.ProjectSupport.pageCheck; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.bean.entity.*; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.ProjectService; -import com.linkerbot.community.service.UserService; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.fork.ForkDeadline; -import com.linkerbot.community.service.fork.ForkExecutor; -import com.linkerbot.community.service.fork.GitSnapshotCopier; -import com.linkerbot.community.service.gitea.*; -import com.linkerbot.community.service.mapper.*; -import com.linkerbot.community.service.oss.OssResourcePaths; -import com.linkerbot.community.service.oss.UrdfResources; -import com.linkerbot.community.service.support.ProjectActors; -import com.linkerbot.community.service.support.ProjectInputs; -import com.linkerbot.community.service.support.ProjectLocks; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.bean.entity.*; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.fork.ForkDeadline; +import com.linkerbot.vibemake.service.fork.ForkExecutor; +import com.linkerbot.vibemake.service.fork.GitSnapshotCopier; +import com.linkerbot.vibemake.service.gitea.*; +import com.linkerbot.vibemake.service.mapper.*; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.oss.UrdfResources; +import com.linkerbot.vibemake.service.state.RateLimits; +import com.linkerbot.vibemake.service.support.ProjectActors; +import com.linkerbot.vibemake.service.support.ProjectInputs; +import com.linkerbot.vibemake.service.support.ProjectLocks; import lombok.RequiredArgsConstructor; @@ -38,6 +39,7 @@ import java.util.function.Function; @Service @RequiredArgsConstructor public class ProjectServiceImpl implements ProjectService { + private final ObjectProvider rateLimits; private static final Logger log = LoggerFactory.getLogger(ProjectServiceImpl.class); private final ProjectMapper projects; private final ProjectImportTaskMapper importTasks; @@ -45,7 +47,7 @@ public class ProjectServiceImpl implements ProjectService { private final CommentMapper comments; private final UserService users; private final GiteaClient gitea; - private final CommunityProperties config; + private final VibemakeProperties config; private final ProjectLocks locks; private final OssResourcePaths resourcePaths; // 离线导入只需地址转换配置,没有 URDF 时无需初始化 OSS 客户端。 @@ -114,26 +116,79 @@ public class ProjectServiceImpl implements ProjectService { @Override public ProjectView view(Project project, Long currentUser) { - Project source = - project.getSourceProjectId() == null - ? null - : projects.selectById(project.getSourceProjectId()); - long likeCount = - likes.selectCount( - new LambdaQueryWrapper() - .eq(ProjectLike::getProjectId, project.getId())); - long commentCount = - comments.selectCount( - new LambdaQueryWrapper() - .eq(ProjectComment::getProjectId, project.getId()) - .eq(ProjectComment::getDeleted, false)); - boolean liked = - currentUser != null - && likes.selectCount( - new LambdaQueryWrapper() - .eq(ProjectLike::getProjectId, project.getId()) - .eq(ProjectLike::getUserId, currentUser)) - > 0; + return views(List.of(project), currentUser).getFirst(); + } + + @Override + public List views(List records, Long currentUser) { + if (records.isEmpty()) return List.of(); + Set ids = new HashSet<>(); + Set ownerIds = new HashSet<>(); + Set sourceIds = new HashSet<>(); + List codes = new ArrayList<>(); + for (Project project : records) { + ids.add(project.getId()); + ownerIds.add(project.getOwnerUserId()); + codes.add(project.getProjectCode()); + if (project.getSourceProjectId() != null) sourceIds.add(project.getSourceProjectId()); + } + Map owners = users.publicViews(ownerIds); + Map sources = new HashMap<>(); + if (!sourceIds.isEmpty()) + for (Project source : + projects.selectList( + new LambdaQueryWrapper() + .select(Project::getId, Project::getProjectCode) + .in(Project::getId, sourceIds))) + sources.put(source.getId(), source); + Map likeCounts = new HashMap<>(); + for (com.linkerbot.vibemake.service.support.EntityCount count : likes.counts(ids)) + likeCounts.put(count.entityId(), count.total()); + Map commentCounts = new HashMap<>(); + for (com.linkerbot.vibemake.service.support.EntityCount count : comments.counts(ids)) + commentCounts.put(count.entityId(), count.total()); + Set likedIds = new HashSet<>(); + if (currentUser != null) + for (ProjectLike like : + likes.selectList( + new LambdaQueryWrapper() + .select(ProjectLike::getProjectId) + .in(ProjectLike::getProjectId, ids) + .eq(ProjectLike::getUserId, currentUser))) + likedIds.add(like.getProjectId()); + Map imported = new HashMap<>(); + for (ProjectImportTask task : + importTasks.selectList( + new LambdaQueryWrapper() + .select( + ProjectImportTask::getProjectCode, + ProjectImportTask::getSourceRepositoryUrl, + ProjectImportTask::getSourceLicense) + .in(ProjectImportTask::getProjectCode, codes))) + imported.put(task.getProjectCode(), task); + List result = new ArrayList<>(); + for (Project project : records) + result.add( + assemble( + project, + sources.get(project.getSourceProjectId()), + owners.getOrDefault( + project.getOwnerUserId(), new PublicUser(null, "已删除用户")), + likeCounts.getOrDefault(project.getId(), 0L), + commentCounts.getOrDefault(project.getId(), 0L), + likedIds.contains(project.getId()), + imported.get(project.getProjectCode()))); + return List.copyOf(result); + } + + private ProjectView assemble( + Project project, + Project source, + PublicUser owner, + long likeCount, + long commentCount, + boolean liked, + ProjectImportTask imported) { String coverUrl; String urdfMainUrl; String urdfBaseUrl; @@ -145,10 +200,6 @@ public class ProjectServiceImpl implements ProjectService { log.warn("项目资源地址生成失败 projectCode={} code={}", project.getProjectCode(), error.code()); throw error; } - ProjectImportTask imported = - importTasks.selectOne( - new LambdaQueryWrapper() - .eq(ProjectImportTask::getProjectCode, project.getProjectCode())); return new ProjectView( project.getProjectCode(), project.getName(), @@ -157,7 +208,7 @@ public class ProjectServiceImpl implements ProjectService { urdfMainUrl, urdfBaseUrl, project.getProjectType(), - users.publicView(project.getOwnerUserId()), + owner, project.getRepoStatus(), project.getPublishStatus(), project.getPublishedCommitSha(), @@ -189,6 +240,8 @@ public class ProjectServiceImpl implements ProjectService { "CASE WHEN urdf_main_object_key <> '' THEN 1 ELSE 0 END") .lambda() .eq(Project::getDeleted, false); + // 列表不需要资源包清单,避免为每个项目读取可能很大的 JSON 字段。 + query.select(Project.class, field -> !"urdfFiles".equals(field.getProperty())); if (ownerId == null) query.eq(Project::getRepoStatus, "READY") .eq(Project::getPublishStatus, "PUBLISHED") @@ -206,10 +259,7 @@ public class ProjectServiceImpl implements ProjectService { query.orderByDesc(Project::getId); Page result = projects.selectPage(new Page<>(page, size), query); return new PageResponse<>( - result.getRecords().stream().map(p -> view(p, currentUser)).toList(), - page, - size, - result.getTotal()); + views(result.getRecords(), currentUser), page, size, result.getTotal()); } private Project initialize(long userId, ProjectInput input, Project source) { @@ -271,6 +321,7 @@ public class ProjectServiceImpl implements ProjectService { @Override public ProjectView create(long userId, ProjectInput input) { + if (rateLimits.getIfAvailable() != null) rateLimits.getObject().operation("create", userId); users.require(userId); Project project = initialize(userId, input, null); return locks.write(project.getProjectCode(), () -> createRemote(project)); @@ -278,6 +329,7 @@ public class ProjectServiceImpl implements ProjectService { @Override public ProjectView fork(long userId, String sourceCode, ForkInput input) { + if (rateLimits.getIfAvailable() != null) rateLimits.getObject().operation("fork", userId); User user = users.require(userId); Project source = published(sourceCode); if (!source.getPublishedCommitSha().equals(FilePaths.sha(input.publishedCommitSha()))) @@ -359,7 +411,7 @@ public class ProjectServiceImpl implements ProjectService { if (projects.updateById(project) != 1) throw new IllegalStateException("Fork 完成状态回写失败"); log.info( "Fork 完成 projectCode={} sourceProjectCode={} sourceCommitSha={}" - + " snapshotCommitSha={} durationMs={}", + + " snapshotCommitSha={} durationMs={}", project.getProjectCode(), source.getProjectCode(), project.getSourceCommitSha(), @@ -407,7 +459,7 @@ public class ProjectServiceImpl implements ProjectService { } log.warn( "Fork 失败 projectCode={} sourceProjectCode={} sourceCommitSha={} code={}" - + " uncertain={} errorType={} durationMs={}", + + " uncertain={} errorType={} durationMs={}", project.getProjectCode(), source.getProjectCode(), project.getSourceCommitSha(), @@ -456,6 +508,7 @@ public class ProjectServiceImpl implements ProjectService { error.getMessage(), Map.of("projectCode", project.getProjectCode())); } catch (RuntimeException error) { + SafeExceptionLog.write(log, "仓库创建或回写异常 projectCode=" + project.getProjectCode(), error); log.error( "仓库创建或回写异常 projectCode={} type={}", project.getProjectCode(), diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/UrdfServiceImpl.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/UrdfServiceImpl.java new file mode 100644 index 0000000..7f8708f --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/UrdfServiceImpl.java @@ -0,0 +1,96 @@ +package com.linkerbot.vibemake.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.linkerbot.vibemake.bean.Contracts.ProjectView; +import com.linkerbot.vibemake.bean.Contracts.UrdfConfirmInput; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadInput; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadSignature; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.ProjectService; +import com.linkerbot.vibemake.service.UrdfService; +import com.linkerbot.vibemake.service.mapper.ProjectMapper; +import com.linkerbot.vibemake.service.oss.UrdfResources; +import com.linkerbot.vibemake.service.state.RateLimits; +import com.linkerbot.vibemake.service.support.ProjectLocks; +import com.linkerbot.vibemake.service.support.ProjectSupport; + +import lombok.RequiredArgsConstructor; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class UrdfServiceImpl implements UrdfService { + private final RateLimits rateLimits; + private static final Logger log = LoggerFactory.getLogger(UrdfServiceImpl.class); + private final ProjectService projects; + private final ProjectMapper mapper; + private final UrdfResources resources; + private final ProjectLocks locks; + + @Override + public UrdfUploadSignature signature(long userId, String projectCode, UrdfUploadInput input) { + rateLimits.operation("urdf-sign", userId); + projects.readyOwner(userId, projectCode); + return resources.sign(projectCode, input.files()); + } + + @Override + public ProjectView confirm(long userId, String projectCode, UrdfConfirmInput input) { + projects.readyOwner(userId, projectCode); + // OSS 网络调用在锁外执行,最终落库时重新检查项目归属及状态。 + resources.verify(projectCode, input.batchCode(), input.files()); + String prefix = resources.prefix(projectCode, input.batchCode()); + String main = resources.validate(prefix, input.files()); + String manifest = resources.manifest(input.files()); + return locks.serial( + projectCode, + () -> { + Project project = projects.readyOwner(userId, projectCode); + project.setUrdfPrefix(prefix); + project.setUrdfMainObjectKey(prefix + main); + project.setUrdfFiles(manifest); + persist(project); + log.info( + "绑定 URDF 资源 projectCode={} batchCode={} fileCount={}", + projectCode, + input.batchCode(), + input.files().size()); + return projects.view(project, userId); + }); + } + + @Override + public void clear(long userId, String projectCode) { + locks.serial( + projectCode, + () -> { + Project project = projects.owner(userId, projectCode); + project.setUrdfMainObjectKey(""); + project.setUrdfPrefix(""); + project.setUrdfFiles("[]"); + persist(project); + log.info("清除 URDF 绑定 projectCode={}", projectCode); + return null; + }); + } + + private void persist(Project project) { + project.setUpdatedAt(ProjectSupport.now()); + int updated = + mapper.update( + null, + new LambdaUpdateWrapper() + .eq(Project::getProjectCode, project.getProjectCode()) + .eq(Project::getOwnerUserId, project.getOwnerUserId()) + .eq(Project::getDeleted, false) + .set(Project::getUrdfMainObjectKey, project.getUrdfMainObjectKey()) + .set(Project::getUrdfFiles, project.getUrdfFiles()) + .set(Project::getUrdfPrefix, project.getUrdfPrefix()) + .set(Project::getUpdatedAt, project.getUpdatedAt())); + if (updated != 1) throw BusinessException.notFound(); + } +} diff --git a/community-service/src/main/java/com/linkerbot/community/service/impl/UserServiceImpl.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/UserServiceImpl.java similarity index 78% rename from community-service/src/main/java/com/linkerbot/community/service/impl/UserServiceImpl.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/UserServiceImpl.java index cf399d5..fe933ab 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/impl/UserServiceImpl.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/UserServiceImpl.java @@ -1,11 +1,11 @@ -package com.linkerbot.community.service.impl; +package com.linkerbot.vibemake.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.linkerbot.community.bean.Contracts.*; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.*; -import com.linkerbot.community.service.UserService; -import com.linkerbot.community.service.mapper.UserMapper; +import com.linkerbot.vibemake.bean.Contracts.*; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.mapper.UserMapper; import lombok.RequiredArgsConstructor; @@ -28,7 +28,7 @@ public class UserServiceImpl implements UserService { @Override public User login(String email) { String normalized = email.trim().toLowerCase(Locale.ROOT); - if (com.linkerbot.community.service.support.OfficialUsers.EMAIL.equals(normalized)) + if (com.linkerbot.vibemake.service.support.OfficialUsers.EMAIL.equals(normalized)) throw new BusinessException(403, "ACCOUNT_DISABLED", "账号不可用"); User user = users.selectOne(new LambdaQueryWrapper().eq(User::getEmail, normalized)); if (user == null) user = create(normalized); @@ -90,4 +90,17 @@ public class UserServiceImpl implements UserService { ? new PublicUser(null, "已删除用户") : new PublicUser(user.getUserCode(), user.getNickname()); } + + @Override + public java.util.Map publicViews(java.util.Collection ids) { + if (ids.isEmpty()) return java.util.Map.of(); + java.util.Map result = new java.util.HashMap<>(); + for (User user : + users.selectList( + new LambdaQueryWrapper() + .select(User::getId, User::getUserCode, User::getNickname) + .in(User::getId, ids))) + result.put(user.getId(), new PublicUser(user.getUserCode(), user.getNickname())); + return result; + } } diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/AiProjectMapper.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/AiProjectMapper.java new file mode 100644 index 0000000..cdbb733 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/AiProjectMapper.java @@ -0,0 +1,44 @@ +package com.linkerbot.vibemake.service.mapper; + +import com.linkerbot.vibemake.bean.entity.Project; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface AiProjectMapper { + @Select( + """ + + """) + List candidates( + @Param("projectType") String projectType, + @Param("patterns") List patterns, + @Param("focusCodes") List focusCodes); +} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/CommentMapper.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/CommentMapper.java new file mode 100644 index 0000000..1f12e9b --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/CommentMapper.java @@ -0,0 +1,19 @@ +package com.linkerbot.vibemake.service.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.linkerbot.vibemake.bean.entity.ProjectComment; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CommentMapper extends BaseMapper { + @org.apache.ibatis.annotations.Select( + """ + + """) + java.util.List counts( + @org.apache.ibatis.annotations.Param("ids") java.util.Collection ids); +} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/LikeMapper.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/LikeMapper.java new file mode 100644 index 0000000..bc40b79 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/LikeMapper.java @@ -0,0 +1,19 @@ +package com.linkerbot.vibemake.service.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.linkerbot.vibemake.bean.entity.ProjectLike; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface LikeMapper extends BaseMapper { + @org.apache.ibatis.annotations.Select( + """ + + """) + java.util.List counts( + @org.apache.ibatis.annotations.Param("ids") java.util.Collection ids); +} diff --git a/community-service/src/main/java/com/linkerbot/community/service/mapper/ProjectImportTaskMapper.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/ProjectImportTaskMapper.java similarity index 56% rename from community-service/src/main/java/com/linkerbot/community/service/mapper/ProjectImportTaskMapper.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/ProjectImportTaskMapper.java index e9e531f..2787fb8 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/mapper/ProjectImportTaskMapper.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/ProjectImportTaskMapper.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.service.mapper; +package com.linkerbot.vibemake.service.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.linkerbot.community.bean.entity.ProjectImportTask; +import com.linkerbot.vibemake.bean.entity.ProjectImportTask; public interface ProjectImportTaskMapper extends BaseMapper {} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/ProjectMapper.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/ProjectMapper.java new file mode 100644 index 0000000..29fd97b --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/ProjectMapper.java @@ -0,0 +1,19 @@ +package com.linkerbot.vibemake.service.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.linkerbot.vibemake.bean.entity.Project; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ProjectMapper extends BaseMapper { + @org.apache.ibatis.annotations.Select( + """ + + """) + java.util.List ownerCounts( + @org.apache.ibatis.annotations.Param("ids") java.util.Collection ids); +} diff --git a/community-service/src/main/java/com/linkerbot/community/service/mapper/UserMapper.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/UserMapper.java similarity index 63% rename from community-service/src/main/java/com/linkerbot/community/service/mapper/UserMapper.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/UserMapper.java index 281d09f..9203ed9 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/mapper/UserMapper.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/mapper/UserMapper.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.service.mapper; +package com.linkerbot.vibemake.service.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.linkerbot.community.bean.entity.User; +import com.linkerbot.vibemake.bean.entity.User; import org.apache.ibatis.annotations.Mapper; diff --git a/community-service/src/main/java/com/linkerbot/community/service/migration/GitHubSourceChecks.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/GitHubSourceChecks.java similarity index 97% rename from community-service/src/main/java/com/linkerbot/community/service/migration/GitHubSourceChecks.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/GitHubSourceChecks.java index b0f9981..52ad391 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/migration/GitHubSourceChecks.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/GitHubSourceChecks.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.migration; +package com.linkerbot.vibemake.service.migration; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -50,7 +50,7 @@ public class GitHubSourceChecks { HttpRequest.newBuilder(uri) .timeout(Duration.ofSeconds(30)) .header("Accept", "application/vnd.github+json") - .header("User-Agent", "community-import/1"); + .header("User-Agent", "vibemake-import/1"); if (!token.isBlank()) request.header("Authorization", "Bearer " + token); HttpResponse response = http.send(request.GET().build(), HttpResponse.BodyHandlers.ofString()); @@ -98,7 +98,7 @@ public class GitHubSourceChecks { HttpRequest.newBuilder(uri) .timeout(Duration.ofSeconds(30)) .header("Accept", "text/html") - .header("User-Agent", "community-import/1") + .header("User-Agent", "vibemake-import/1") .GET() .build(); // 网页请求不携带任何 GitHub 或 Gitea 凭据。 @@ -174,7 +174,7 @@ public class GitHubSourceChecks { HttpRequest request = HttpRequest.newBuilder(uri) .timeout(Duration.ofSeconds(30)) - .header("User-Agent", "community-import/1") + .header("User-Agent", "vibemake-import/1") .header("Range", "bytes=0-511") .GET() .build(); diff --git a/community-service/src/main/java/com/linkerbot/community/service/migration/MigrationConfiguration.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/MigrationConfiguration.java similarity index 70% rename from community-service/src/main/java/com/linkerbot/community/service/migration/MigrationConfiguration.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/MigrationConfiguration.java index 6fabc45..fc73026 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/migration/MigrationConfiguration.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/MigrationConfiguration.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.service.migration; +package com.linkerbot.vibemake.service.migration; -import com.linkerbot.community.service.config.AdminProperties; +import com.linkerbot.vibemake.service.config.AdminProperties; import org.springframework.context.annotation.*; diff --git a/community-service/src/main/java/com/linkerbot/community/service/migration/MigrationFailure.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/MigrationFailure.java similarity index 60% rename from community-service/src/main/java/com/linkerbot/community/service/migration/MigrationFailure.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/MigrationFailure.java index 9af5d78..5586b46 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/migration/MigrationFailure.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/MigrationFailure.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.service.migration; +package com.linkerbot.vibemake.service.migration; -import com.linkerbot.community.common.BusinessException; +import com.linkerbot.vibemake.common.BusinessException; public class MigrationFailure extends BusinessException { public MigrationFailure(String code, String message) { diff --git a/community-service/src/main/java/com/linkerbot/community/service/migration/RepositoryMigration.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/RepositoryMigration.java similarity index 98% rename from community-service/src/main/java/com/linkerbot/community/service/migration/RepositoryMigration.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/RepositoryMigration.java index 22aaed6..847e07e 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/migration/RepositoryMigration.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/migration/RepositoryMigration.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.service.migration; +package com.linkerbot.vibemake.service.migration; -import com.linkerbot.community.service.gitea.*; +import com.linkerbot.vibemake.service.gitea.*; import java.io.IOException; import java.time.Duration; diff --git a/community-service/src/main/java/com/linkerbot/community/service/oss/AliyunOssObjectStore.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/AliyunOssObjectStore.java similarity index 95% rename from community-service/src/main/java/com/linkerbot/community/service/oss/AliyunOssObjectStore.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/AliyunOssObjectStore.java index 3ecdf0b..0e0b0cc 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/oss/AliyunOssObjectStore.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/AliyunOssObjectStore.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; import com.aliyun.oss.ClientBuilderConfiguration; import com.aliyun.oss.ClientException; @@ -10,10 +10,10 @@ import com.aliyun.oss.common.comm.SignVersion; import com.aliyun.oss.common.auth.DefaultCredentialProvider; import com.aliyun.oss.model.CopyObjectRequest; import com.aliyun.oss.model.ObjectMetadata; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.fork.ForkDeadline; -import com.linkerbot.community.service.gitea.GiteaFailure; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.fork.ForkDeadline; +import com.linkerbot.vibemake.service.gitea.GiteaFailure; import jakarta.annotation.PreDestroy; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/community-service/src/main/java/com/linkerbot/community/service/oss/OssObjectStore.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssObjectStore.java similarity index 85% rename from community-service/src/main/java/com/linkerbot/community/service/oss/OssObjectStore.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssObjectStore.java index 5316e87..7ee2feb 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/oss/OssObjectStore.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssObjectStore.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; /** URDF 所需的 OSS 操作边界,测试使用内存实现。 */ public interface OssObjectStore { diff --git a/community-service/src/main/java/com/linkerbot/community/service/oss/OssPostSigner.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssPostSigner.java similarity index 96% rename from community-service/src/main/java/com/linkerbot/community/service/oss/OssPostSigner.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssPostSigner.java index a90f323..7162cec 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/oss/OssPostSigner.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssPostSigner.java @@ -1,10 +1,10 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.Contracts.CoverUploadSignature; -import com.linkerbot.community.common.Codes; -import com.linkerbot.community.service.config.OssProperties; +import com.linkerbot.vibemake.bean.Contracts.CoverUploadSignature; +import com.linkerbot.vibemake.common.Codes; +import com.linkerbot.vibemake.service.config.OssProperties; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; import java.time.*; diff --git a/community-service/src/main/java/com/linkerbot/community/service/oss/OssResourcePaths.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssResourcePaths.java similarity index 95% rename from community-service/src/main/java/com/linkerbot/community/service/oss/OssResourcePaths.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssResourcePaths.java index d7af643..1378f48 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/oss/OssResourcePaths.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssResourcePaths.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.common.FilePaths; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.support.ProjectInputs; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.FilePaths; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.support.ProjectInputs; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/community-service/src/main/java/com/linkerbot/community/service/oss/UrdfResources.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/UrdfResources.java similarity index 93% rename from community-service/src/main/java/com/linkerbot/community/service/oss/UrdfResources.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/UrdfResources.java index e504fee..ae89952 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/oss/UrdfResources.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/UrdfResources.java @@ -1,18 +1,18 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.Contracts.UrdfFile; -import com.linkerbot.community.bean.Contracts.UrdfFileSignature; -import com.linkerbot.community.bean.Contracts.UrdfUploadSignature; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.common.Codes; -import com.linkerbot.community.common.FilePaths; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.config.UrdfProperties; -import com.linkerbot.community.service.fork.ForkDeadline; +import com.linkerbot.vibemake.bean.Contracts.UrdfFile; +import com.linkerbot.vibemake.bean.Contracts.UrdfFileSignature; +import com.linkerbot.vibemake.bean.Contracts.UrdfUploadSignature; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.Codes; +import com.linkerbot.vibemake.common.FilePaths; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.config.UrdfProperties; +import com.linkerbot.vibemake.service.fork.ForkDeadline; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/ClientAddresses.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/ClientAddresses.java new file mode 100644 index 0000000..94ee477 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/ClientAddresses.java @@ -0,0 +1,88 @@ +package com.linkerbot.vibemake.service.state; + +import com.linkerbot.vibemake.service.config.LimitProperties; + +import jakarta.servlet.http.HttpServletRequest; + +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class ClientAddresses { + private final List trusted; + + public ClientAddresses(LimitProperties properties) { + trusted = properties.getTrustedProxies().stream().map(Network::parse).toList(); + } + + public String resolve(HttpServletRequest request) { + String peer = canonical(request.getRemoteAddr()); + if (!trusted(peer)) return peer; + String forwarded = request.getHeader("X-Forwarded-For"); + if (forwarded == null || forwarded.length() > 4096) return peer; + String current = peer; + String[] chain = forwarded.split(",", -1); + for (int index = chain.length - 1; index >= 0 && trusted(current); index--) { + String candidate = chain[index].trim(); + // 只接收数字 IP,不做 DNS 查询;保留原始连接地址作为异常输入的安全默认值。 + if (!candidate.matches("[0-9a-fA-F:.]{2,45}")) return peer; + try { + Network.address(candidate); + } catch (IllegalArgumentException error) { + return peer; + } + current = canonical(candidate); + } + return current; + } + + private boolean trusted(String address) { + return address != null && trusted.stream().anyMatch(matcher -> matcher.matches(address)); + } + + private static String canonical(String address) { + try { + return java.net.InetAddress.getByAddress(Network.address(address)).getHostAddress(); + } catch (IllegalArgumentException | java.net.UnknownHostException error) { + return "unknown"; + } + } + + private record Network(byte[] bytes, int bits) { + static Network parse(String cidr) { + String[] parts = cidr.split("/", -1); + byte[] bytes = address(parts[0]); + int bits = parts.length == 1 ? bytes.length * 8 : Integer.parseInt(parts[1]); + if (parts.length > 2 || bits < 0 || bits > bytes.length * 8) + throw new IllegalArgumentException("可信代理 CIDR 不合法"); + return new Network(bytes, bits); + } + + static byte[] address(String value) { + if (value == null + || !(value.matches("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+") + || value.contains(":") && value.matches("[0-9a-fA-F:.]+"))) + throw new IllegalArgumentException("IP 不合法"); + try { + return java.net.InetAddress.getByName(value).getAddress(); + } catch (java.net.UnknownHostException error) { + throw new IllegalArgumentException("IP 不合法"); + } + } + + boolean matches(String value) { + byte[] other; + try { + other = address(value); + } catch (IllegalArgumentException error) { + return false; + } + if (other.length != bytes.length) return false; + for (int bit = 0; bit < bits; bit++) + if ((other[bit / 8] & (1 << (7 - bit % 8))) + != (bytes[bit / 8] & (1 << (7 - bit % 8)))) return false; + return true; + } + } +} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/HttpSafetyFilter.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/HttpSafetyFilter.java new file mode 100644 index 0000000..9475d94 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/HttpSafetyFilter.java @@ -0,0 +1,170 @@ +package com.linkerbot.vibemake.service.state; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.service.config.LimitProperties; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.*; + +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.Locale; +import java.util.concurrent.Semaphore; + +/** 在安全链的 CORS 之后、请求正文解析之前执行;不预先复制请求体。 */ +@Component +public class HttpSafetyFilter extends OncePerRequestFilter { + private final LimitProperties properties; + private final RateLimits limits; + private final ClientAddresses addresses; + private final ObjectMapper json; + private final Semaphore files; + + public HttpSafetyFilter( + LimitProperties properties, + RateLimits limits, + ClientAddresses addresses, + ObjectMapper json) { + this.properties = properties; + this.limits = limits; + this.addresses = addresses; + this.json = json; + files = new Semaphore(properties.getFileConcurrent()); + } + + @Override + protected boolean shouldNotFilter(HttpServletRequest request) { + String path = request.getServletPath(); + if (path.isEmpty()) path = request.getRequestURI(); + return "OPTIONS".equals(request.getMethod()) + || !(path.startsWith("/api/") || path.startsWith("/admin-api/")); + } + + @Override + protected void doFilterInternal( + HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws ServletException, IOException { + String path = + request.getServletPath().isEmpty() + ? request.getRequestURI() + : request.getServletPath(); + String method = request.getMethod(); + boolean read = "GET".equals(method) || "HEAD".equals(method); + boolean acquired = false; + try { + if (path.contains("/auth/") || path.endsWith("/signature")) + response.setHeader("Cache-Control", "no-store"); + String ip = addresses.resolve(request); + if (path.equals("/api/auth/captcha")) limits.request("captcha", ip); + else if (path.equals("/api/auth/login")) limits.request("login-ip", ip); + else if (path.equals("/admin-api/auth/login")) limits.request("admin-login", ip); + else if (read + && path.matches( + "/(api/community|api/workspace|admin-api)/projects/[^/]+/files")) + limits.request("file-read", ip); + else if (read && path.startsWith("/api/community/")) + limits.request("vibemake-read", ip); + + boolean fileOperation = + ("GET".equals(method) || "HEAD".equals(method)) + && path.matches( + "/(api/workspace|api/community|admin-api)/projects/[^/]+/(files|tree|commits)") + || "POST".equals(method) + && path.matches( + "/(api/workspace|admin-api)/projects/[^/]+/(commits|uploads/commit)"); + if (fileOperation) { + acquired = files.tryAcquire(); + if (!acquired) throw new RateLimitedException("FILE_BUSY", "文件服务繁忙,请稍后重试", 1); + } + String contentType = request.getContentType(); + if (contentType != null && contentType.toLowerCase(Locale.ROOT).contains("json")) { + long maximum = + path.endsWith("/commits") && "POST".equals(method) + ? properties.getCommitJsonBytes() + : path.contains("/urdf") + ? properties.getUrdfJsonBytes() + : properties.getJsonBytes(); + if (request.getContentLengthLong() > maximum) throw new RequestTooLargeException(); + chain.doFilter(new LimitedRequest(request, maximum), response); + } else chain.doFilter(request, response); + } catch (BusinessException error) { + if (!response.isCommitted()) HttpFailures.write(response, json, error); + else throw error; + } finally { + if (acquired) files.release(); + } + } + + private static final class LimitedRequest extends HttpServletRequestWrapper { + private final ServletInputStream stream; + + LimitedRequest(HttpServletRequest request, long maximum) throws IOException { + super(request); + ServletInputStream input = request.getInputStream(); + stream = + new ServletInputStream() { + private long count; + + private void counted(int size) { + if (size > 0 && (count += size) > maximum) + throw new RequestTooLargeException(); + } + + @Override + public int read() throws IOException { + int value = input.read(); + if (value >= 0) counted(1); + return value; + } + + @Override + public int read(byte[] bytes, int offset, int length) throws IOException { + int size = + input.read( + bytes, + offset, + (int) + Math.min( + length, + Math.max(1, maximum - count + 1))); + counted(size); + return size; + } + + @Override + public boolean isFinished() { + return input.isFinished(); + } + + @Override + public boolean isReady() { + return input.isReady(); + } + + @Override + public void setReadListener(ReadListener listener) { + input.setReadListener(listener); + } + }; + } + + @Override + public ServletInputStream getInputStream() { + return stream; + } + + @Override + public BufferedReader getReader() { + return new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)); + } + } +} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RateLimits.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RateLimits.java new file mode 100644 index 0000000..022e32b --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RateLimits.java @@ -0,0 +1,56 @@ +package com.linkerbot.vibemake.service.state; + +import com.linkerbot.vibemake.common.RateLimitedException; +import com.linkerbot.vibemake.common.SecurityHashes; +import com.linkerbot.vibemake.common.state.TransientStateStore; +import com.linkerbot.vibemake.service.config.LimitProperties; +import com.linkerbot.vibemake.service.support.ProjectActors; + +import lombok.RequiredArgsConstructor; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.time.Duration; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; + +@Component +@RequiredArgsConstructor +public class RateLimits { + private static final Logger log = LoggerFactory.getLogger(RateLimits.class); + private final TransientStateStore state; + private final LimitProperties properties; + private final ConcurrentHashMap lastLogs = new ConcurrentHashMap<>(); + + public void operation(String group, long userId) { + String actor = + ProjectActors.isAdmin() + ? "admin:" + ProjectActors.admin().userCode() + : "user:" + userId; + request(group, actor); + } + + public void request(String group, String subject) { + if (!properties.isEnabled()) return; + Integer limit = properties.getPerMinute().get(group); + if (limit == null) throw new IllegalArgumentException("未配置的限流规则"); + check(group, subject, limit, Duration.ofMinutes(1), "RATE_LIMITED", "请求过于频繁,请稍后重试"); + } + + /** AI 和后台失败计数使用自身既有配置,不依赖普通业务限流开关。 */ + public void check( + String group, String subject, int limit, Duration window, String code, String message) { + TransientStateStore.Window result = + state.increment( + "rate:" + group + ":" + SecurityHashes.sha256(subject), window, false); + if (result.count() <= limit) return; + AtomicLong last = lastLogs.computeIfAbsent(group, ignored -> new AtomicLong()); + long previous = last.get(); + long now = System.nanoTime(); + if ((previous == 0 || now - previous > Duration.ofMinutes(1).toNanos()) + && last.compareAndSet(previous, now)) log.warn("请求限流 rule={} code={}", group, code); + throw new RateLimitedException(code, message, result.retryAfterSeconds()); + } +} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RedisStateConfiguration.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RedisStateConfiguration.java new file mode 100644 index 0000000..3bd2704 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RedisStateConfiguration.java @@ -0,0 +1,35 @@ +package com.linkerbot.vibemake.service.state; + +import com.linkerbot.vibemake.common.state.TransientStateStore; +import com.linkerbot.vibemake.service.config.RedisStateProperties; + +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.SmartInitializingSingleton; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.core.StringRedisTemplate; + +@Configuration(proxyBeanMethods = false) +public class RedisStateConfiguration { + @Bean + @ConditionalOnMissingBean(TransientStateStore.class) + public TransientStateStore transientStateStore( + StringRedisTemplate redis, RedisStateProperties properties) { + return new RedisStateStore(redis, properties); + } + + @Bean + @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) + public SmartInitializingSingleton verifyRedisSecurityState( + TransientStateStore state, ApplicationArguments arguments) { + // 在 ContextRefreshedEvent 之前验证,避免 Redis 尚未就绪时定时导入任务已开始写入。 + return () -> { + if (arguments.containsOption("bootstrap-admin-user-code")) return; + state.verify(); + LoggerFactory.getLogger(RedisStateConfiguration.class).info("Redis 安全状态校验通过"); + }; + } +} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RedisStateStore.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RedisStateStore.java new file mode 100644 index 0000000..cf84a30 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/state/RedisStateStore.java @@ -0,0 +1,138 @@ +package com.linkerbot.vibemake.service.state; + +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.Codes; +import com.linkerbot.vibemake.common.state.TransientStateStore; +import com.linkerbot.vibemake.service.config.RedisStateProperties; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.script.DefaultRedisScript; + +import java.time.Duration; +import java.util.List; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Supplier; + +public final class RedisStateStore implements TransientStateStore { + private static final Logger log = LoggerFactory.getLogger(RedisStateStore.class); + private static final DefaultRedisScript INCREMENT = + new DefaultRedisScript<>( + """ + local n = redis.call('INCR', KEYS[1]) + if n == 1 or ARGV[2] == '1' then redis.call('PEXPIRE', KEYS[1], ARGV[1]) end + local ttl = redis.call('PTTL', KEYS[1]) + if ttl < 0 then redis.call('PEXPIRE', KEYS[1], ARGV[1]); ttl = tonumber(ARGV[1]) end + return {n, ttl} + """, + List.class); + private final StringRedisTemplate redis; + private final String prefix; + private final AtomicLong lastFailureLog = new AtomicLong(); + private final AtomicLong suppressed = new AtomicLong(); + + public RedisStateStore(StringRedisTemplate redis, RedisStateProperties properties) { + this.redis = redis; + this.prefix = properties.prefix(); + } + + private T execute(String operation, Supplier action) { + try { + return action.get(); + } catch (RuntimeException error) { + long now = System.nanoTime(); + long previous = lastFailureLog.get(); + suppressed.incrementAndGet(); + if ((previous == 0 || now - previous > Duration.ofMinutes(1).toNanos()) + && lastFailureLog.compareAndSet(previous, now)) { + log.error( + "Redis 安全状态访问失败 operation={} errorType={} failureCount={}", + operation, + error.getClass().getSimpleName(), + suppressed.getAndSet(0)); + com.linkerbot.vibemake.common.SafeExceptionLog.write( + log, "Redis operation=" + operation, error); + } + throw new BusinessException(503, "REDIS_UNAVAILABLE", "安全状态服务暂不可用,请稍后重试"); + } + } + + @Override + public boolean putIfAbsent(String key, String value, Duration ttl) { + return execute( + "set", + () -> + Boolean.TRUE.equals( + redis.opsForValue().setIfAbsent(prefix + key, value, ttl))); + } + + @Override + public String get(String key) { + return execute("get", () -> redis.opsForValue().get(prefix + key)); + } + + @Override + public String consume(String key) { + return execute("getdel", () -> redis.opsForValue().getAndDelete(prefix + key)); + } + + @Override + public void remove(String key) { + execute("del", () -> redis.delete(prefix + key)); + } + + @Override + public long remainingSeconds(String key) { + return execute( + "ttl", + () -> { + Long ttl = redis.getExpire(prefix + key, java.util.concurrent.TimeUnit.SECONDS); + return ttl == null ? 0L : Math.max(0, ttl); + }); + } + + @Override + public Window increment(String key, Duration ttl, boolean refreshTtl) { + return execute( + "increment", + () -> { + List result = + redis.execute( + INCREMENT, + List.of(prefix + key), + Long.toString(ttl.toMillis()), + refreshTtl ? "1" : "0"); + if (result == null || result.size() != 2) + throw new IllegalStateException("Redis 计数响应异常"); + return new Window( + ((Number) result.get(0)).longValue(), + Math.max(1, (((Number) result.get(1)).longValue() + 999) / 1000)); + }); + } + + @Override + public void verify() { + String probe = "probe:" + Codes.next(); + String counter = probe + ":counter"; + try { + checked("set", putIfAbsent(probe, "ready", Duration.ofSeconds(10))); + checked("get", "ready".equals(get(probe))); + checked("getdel", "ready".equals(consume(probe))); + checked("increment", increment(counter, Duration.ofSeconds(10), false).count() == 1); + checked("ttl", remainingSeconds(counter) > 0); + checked("refresh", increment(counter, Duration.ofSeconds(10), true).count() == 2); + } finally { + remove(probe); + remove(counter); + } + } + + private void checked(String operation, boolean successful) { + if (!successful) { + log.error("Redis 安全状态校验失败 operation={}", operation); + throw new BusinessException( + 503, "REDIS_UNAVAILABLE", "Redis 安全状态校验失败 operation=" + operation); + } + } +} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/EntityCount.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/EntityCount.java new file mode 100644 index 0000000..6fe3858 --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/EntityCount.java @@ -0,0 +1,3 @@ +package com.linkerbot.vibemake.service.support; + +public record EntityCount(long entityId, long total) {} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/OfficialUsers.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/OfficialUsers.java new file mode 100644 index 0000000..9d1938c --- /dev/null +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/OfficialUsers.java @@ -0,0 +1,7 @@ +package com.linkerbot.vibemake.service.support; + +public final class OfficialUsers { + public static final String EMAIL = "vibemake-official@internal.invalid"; + + private OfficialUsers() {} +} diff --git a/community-service/src/main/java/com/linkerbot/community/service/support/ProjectActors.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectActors.java similarity index 88% rename from community-service/src/main/java/com/linkerbot/community/service/support/ProjectActors.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectActors.java index 6c001ab..06b652b 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/support/ProjectActors.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectActors.java @@ -1,7 +1,7 @@ -package com.linkerbot.community.service.support; +package com.linkerbot.vibemake.service.support; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.service.UserService; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.service.UserService; /** 仅由已鉴权的管理端入口设置;不从请求参数推断管理员身份。 */ public final class ProjectActors { diff --git a/community-service/src/main/java/com/linkerbot/community/service/support/ProjectInputs.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectInputs.java similarity index 78% rename from community-service/src/main/java/com/linkerbot/community/service/support/ProjectInputs.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectInputs.java index 5a481a8..e07276e 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/support/ProjectInputs.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectInputs.java @@ -1,20 +1,20 @@ -package com.linkerbot.community.service.support; +package com.linkerbot.vibemake.service.support; -import com.linkerbot.community.bean.Contracts.ProjectInput; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.CommunityProperties; +import com.linkerbot.vibemake.bean.Contracts.ProjectInput; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.VibemakeProperties; import java.net.URI; public final class ProjectInputs { private ProjectInputs() {} - public static void validate(ProjectInput input, CommunityProperties config) { + public static void validate(ProjectInput input, VibemakeProperties config) { validateMetadata(input, config); coverUrl(input.coverUrl()); } - public static void validateMetadata(ProjectInput input, CommunityProperties config) { + public static void validateMetadata(ProjectInput input, VibemakeProperties config) { if (input.name() == null || input.name().isBlank() || input.name().length() > 100) throw BusinessException.badRequest("项目名称必须为 1~100 字符"); if (input.description() != null && input.description().length() > 2000) diff --git a/community-service/src/main/java/com/linkerbot/community/service/support/ProjectLocks.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectLocks.java similarity index 96% rename from community-service/src/main/java/com/linkerbot/community/service/support/ProjectLocks.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectLocks.java index 88c669a..c9a9219 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/support/ProjectLocks.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectLocks.java @@ -1,11 +1,11 @@ -package com.linkerbot.community.service.support; +package com.linkerbot.vibemake.service.support; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.gitea.GiteaFailure; -import com.linkerbot.community.service.mapper.ProjectMapper; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.gitea.GiteaFailure; +import com.linkerbot.vibemake.service.mapper.ProjectMapper; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; @@ -133,7 +133,7 @@ public class ProjectLocks { throw new BusinessException(503, "PROJECT_LOCK_INTERRUPTED", "等待项目锁被中断"); } boolean executed = false; - String name = "community:" + namespace + ":" + code; + String name = "vibemake:" + namespace + ":" + code; try (Connection connection = lockPool == null ? null : lockPool.getConnection()) { if (connection != null && !lockFunction(connection, "GET_LOCK", name, true)) throw new BusinessException(409, "PROJECT_BUSY", "项目正在处理,请稍后重试"); diff --git a/community-service/src/main/java/com/linkerbot/community/service/support/ProjectSupport.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectSupport.java similarity index 82% rename from community-service/src/main/java/com/linkerbot/community/service/support/ProjectSupport.java rename to vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectSupport.java index ddba506..d90e218 100644 --- a/community-service/src/main/java/com/linkerbot/community/service/support/ProjectSupport.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/support/ProjectSupport.java @@ -1,6 +1,6 @@ -package com.linkerbot.community.service.support; +package com.linkerbot.vibemake.service.support; -import com.linkerbot.community.common.BusinessException; +import com.linkerbot.vibemake.common.BusinessException; import java.time.Clock; import java.time.LocalDateTime; diff --git a/community-service/src/main/resources/ai-search/intent-prompt.txt b/vibemake-service/src/main/resources/ai-search/intent-prompt.txt similarity index 100% rename from community-service/src/main/resources/ai-search/intent-prompt.txt rename to vibemake-service/src/main/resources/ai-search/intent-prompt.txt diff --git a/community-service/src/main/resources/ai-search/intent.schema.json b/vibemake-service/src/main/resources/ai-search/intent.schema.json similarity index 100% rename from community-service/src/main/resources/ai-search/intent.schema.json rename to vibemake-service/src/main/resources/ai-search/intent.schema.json diff --git a/community-service/src/main/resources/ai-search/ranking-prompt.txt b/vibemake-service/src/main/resources/ai-search/ranking-prompt.txt similarity index 100% rename from community-service/src/main/resources/ai-search/ranking-prompt.txt rename to vibemake-service/src/main/resources/ai-search/ranking-prompt.txt diff --git a/community-service/src/main/resources/ai-search/ranking.schema.json b/vibemake-service/src/main/resources/ai-search/ranking.schema.json similarity index 100% rename from community-service/src/main/resources/ai-search/ranking.schema.json rename to vibemake-service/src/main/resources/ai-search/ranking.schema.json diff --git a/community-service/src/test/java/com/linkerbot/community/service/ProjectCodeAllocationTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/ProjectCodeAllocationTest.java similarity index 65% rename from community-service/src/test/java/com/linkerbot/community/service/ProjectCodeAllocationTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/ProjectCodeAllocationTest.java index 0e7d809..dbd5354 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/ProjectCodeAllocationTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/ProjectCodeAllocationTest.java @@ -1,31 +1,44 @@ -package com.linkerbot.community.service; +package com.linkerbot.vibemake.service; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import com.linkerbot.community.bean.Contracts.ProjectInput; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.common.ProjectCodes; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.gitea.GiteaClient; -import com.linkerbot.community.service.fork.ForkExecutor; -import com.linkerbot.community.service.fork.GitSnapshotCopier; -import com.linkerbot.community.service.impl.ProjectServiceImpl; -import com.linkerbot.community.service.mapper.*; -import com.linkerbot.community.service.oss.UrdfResources; -import com.linkerbot.community.service.oss.OssResourcePaths; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.support.ProjectLocks; +import com.linkerbot.vibemake.bean.Contracts.ProjectInput; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.ProjectCodes; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.fork.ForkExecutor; +import com.linkerbot.vibemake.service.fork.GitSnapshotCopier; +import com.linkerbot.vibemake.service.gitea.GiteaClient; +import com.linkerbot.vibemake.service.impl.ProjectServiceImpl; +import com.linkerbot.vibemake.service.mapper.*; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.oss.UrdfResources; +import com.linkerbot.vibemake.service.support.ProjectLocks; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; -import org.springframework.dao.DuplicateKeyException; import org.springframework.beans.factory.support.StaticListableBeanFactory; +import org.springframework.dao.DuplicateKeyException; class ProjectCodeAllocationTest { + @org.junit.jupiter.api.BeforeAll + static void initializeProjectionMetadata() { + org.apache.ibatis.builder.MapperBuilderAssistant assistant = + new org.apache.ibatis.builder.MapperBuilderAssistant( + new com.baomidou.mybatisplus.core.MybatisConfiguration(), + "allocation-test"); + assistant.setCurrentNamespace("allocation-test"); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo( + assistant, com.linkerbot.vibemake.bean.entity.ProjectLike.class); + com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo( + assistant, com.linkerbot.vibemake.bean.entity.ProjectImportTask.class); + } + @Test void retriesOnlyProjectCodeConstraintBeforeAnyRemoteCreation() { ProjectMapper mapper = mock(ProjectMapper.class); @@ -39,7 +52,7 @@ class ProjectCodeAllocationTest { return 1; }); when(gitea.createRepository(anyString(), eq(true))) - .thenReturn(new GiteaClient.Repository(1, "community", "p_222222222222")); + .thenReturn(new GiteaClient.Repository(1, "vibemake", "p_222222222222")); try (MockedStatic codes = mockStatic(ProjectCodes.class)) { codes.when(ProjectCodes::next).thenReturn("111111111111", "222222222222"); assertThat( @@ -84,13 +97,15 @@ class ProjectCodeAllocationTest { UserService users = mock(UserService.class); when(users.require(1)).thenReturn(new User()); return new ProjectServiceImpl( + new org.springframework.beans.factory.support.StaticListableBeanFactory() + .getBeanProvider(com.linkerbot.vibemake.service.state.RateLimits.class), projects, mock(ProjectImportTaskMapper.class), mock(LikeMapper.class), mock(CommentMapper.class), users, gitea, - new CommunityProperties(), + new VibemakeProperties(), new ProjectLocks(), new OssResourcePaths(new OssProperties()), new StaticListableBeanFactory().getBeanProvider(UrdfResources.class), diff --git a/community-service/src/test/java/com/linkerbot/community/service/ai/AiPropertiesTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/ai/AiPropertiesTest.java similarity index 66% rename from community-service/src/test/java/com/linkerbot/community/service/ai/AiPropertiesTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/ai/AiPropertiesTest.java index 073798c..9bede6d 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/ai/AiPropertiesTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/ai/AiPropertiesTest.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.service.ai; +package com.linkerbot.vibemake.service.ai; import static org.assertj.core.api.Assertions.*; -import com.linkerbot.community.service.config.AiProperties; +import com.linkerbot.vibemake.service.config.AiProperties; import org.junit.jupiter.api.Test; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -23,14 +23,14 @@ class AiPropertiesTest { } @Test void enabledRequiresKeyAtStartup() { - runner.withPropertyValues("community.ai.enabled=true").run(context -> assertThat(context).hasFailed()); - runner.withPropertyValues("community.ai.enabled=true", "community.ai.api-key=test-placeholder") + runner.withPropertyValues("vibemake.ai.enabled=true").run(context -> assertThat(context).hasFailed()); + runner.withPropertyValues("vibemake.ai.enabled=true", "vibemake.ai.api-key=test-placeholder") .run(context -> assertThat(context).hasNotFailed()); } @Test void rejectsInvalidTimeoutAndCredentialBearingEndpoint() { - runner.withPropertyValues("community.ai.request-timeout=0s").run(context -> assertThat(context).hasFailed()); - runner.withPropertyValues("community.ai.endpoint=https://user:placeholder@example.invalid/responses") + runner.withPropertyValues("vibemake.ai.request-timeout=0s").run(context -> assertThat(context).hasFailed()); + runner.withPropertyValues("vibemake.ai.endpoint=https://user:placeholder@example.invalid/responses") .run(context -> assertThat(context).hasFailed()); } } diff --git a/community-service/src/test/java/com/linkerbot/community/service/ai/ArkAiClientTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/ai/ArkAiClientTest.java similarity index 96% rename from community-service/src/test/java/com/linkerbot/community/service/ai/ArkAiClientTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/ai/ArkAiClientTest.java index 04f0ef0..bc8162f 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/ai/ArkAiClientTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/ai/ArkAiClientTest.java @@ -1,11 +1,11 @@ -package com.linkerbot.community.service.ai; +package com.linkerbot.vibemake.service.ai; import static org.assertj.core.api.Assertions.*; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.AiProperties; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.AiProperties; import com.sun.net.httpserver.HttpServer; import java.net.InetSocketAddress; import java.nio.charset.StandardCharsets; diff --git a/community-service/src/test/java/com/linkerbot/community/service/fork/CliGitSnapshotCopierTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/CliGitSnapshotCopierTest.java similarity index 89% rename from community-service/src/test/java/com/linkerbot/community/service/fork/CliGitSnapshotCopierTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/CliGitSnapshotCopierTest.java index 0e0de4f..2e2315e 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/fork/CliGitSnapshotCopierTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/CliGitSnapshotCopierTest.java @@ -1,4 +1,4 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -7,11 +7,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.CommunityProperties; -import com.linkerbot.community.service.config.ForkProperties; -import com.linkerbot.community.service.gitea.GiteaClient; -import com.linkerbot.community.service.gitea.GiteaClient.Repository; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.config.ForkProperties; +import com.linkerbot.vibemake.service.gitea.GiteaClient; +import com.linkerbot.vibemake.service.gitea.GiteaClient.Repository; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpServer; import java.io.IOException; @@ -38,7 +38,7 @@ class CliGitSnapshotCopierTest { private HttpServer lfs; private String origin; private ForkProperties properties; - private CommunityProperties community; + private VibemakeProperties vibemake; private GitCommandRunner commands; private GiteaClient gitea; private CliGitSnapshotCopier copier; @@ -55,13 +55,13 @@ class CliGitSnapshotCopierTest { lfs.start(); properties = new ForkProperties(); properties.setTemporaryDirectory(root.resolve("jobs").toString()); - community = new CommunityProperties(); - community.getGitea().setBaseUrl(origin); - community.getGitea().setToken("fixture-token"); + vibemake = new VibemakeProperties(); + vibemake.getGitea().setBaseUrl(origin); + vibemake.getGitea().setToken("fixture-token"); commands = new GitCommandRunner(properties); gitea = mock(GiteaClient.class); when(gitea.authenticatedUsername()).thenReturn("fixture"); - copier = new CliGitSnapshotCopier(properties, community, commands, gitea, json) { + copier = new CliGitSnapshotCopier(properties, vibemake, commands, gitea, json) { @Override protected void verifyRemote(Repository target, String commit, ForkDeadline deadline) {} @Override protected String repositoryUrl(Repository repo) { return rejectGitPush && repo.name().equals("target") ? origin + "/denied.git" : repository(repo.name()).toUri().toString(); @@ -92,8 +92,8 @@ class CliGitSnapshotCopierTest { command.addAll(List.of(args)); ProcessBuilder builder = new ProcessBuilder(command); builder.environment().putAll(Map.of("GIT_CONFIG_NOSYSTEM", "1", "GIT_CONFIG_GLOBAL", "/dev/null", - "GIT_AUTHOR_NAME", "Fixture", "GIT_AUTHOR_EMAIL", "fixture@users.community.invalid", - "GIT_COMMITTER_NAME", "Fixture", "GIT_COMMITTER_EMAIL", "fixture@users.community.invalid")); + "GIT_AUTHOR_NAME", "Fixture", "GIT_AUTHOR_EMAIL", "fixture@users.vibemake.invalid", + "GIT_COMMITTER_NAME", "Fixture", "GIT_COMMITTER_EMAIL", "fixture@users.vibemake.invalid")); Process process = builder.start(); if (input != null) process.getOutputStream().write(input); process.getOutputStream().close(); @@ -135,20 +135,20 @@ class CliGitSnapshotCopierTest { git(repository("source"), null, "update-ref", "refs/heads/main", unpublished); git(repository("source"), null, "update-ref", "refs/tags/old", initial); String result; - try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "community", "source"), published, + try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "vibemake", "source"), published, "测试用户", "public-code", deadline())) { try (java.util.stream.Stream paths = Files.list(root.resolve("jobs"))) { String config = Files.readString(paths.findFirst().orElseThrow().resolve("config")); assertThat(config).doesNotContain("fixture-token", "Authorization", "Basic "); } - result = snapshot.push(new Repository(2, "community", "target")); + result = snapshot.push(new Repository(2, "vibemake", "target")); } assertThat(git(repository("target"), null, "rev-parse", "main^{tree}")).isEqualTo(publishedTree); assertThat(repository("target").resolve("shallow")).doesNotExist(); assertThat(git(repository("target"), null, "rev-list", "--parents", "main")).isEqualTo(result); assertThat(git(repository("target"), null, "for-each-ref", "--format=%(refname)")).isEqualTo("refs/heads/main"); assertThat(git(repository("target"), null, "ls-tree", "-r", "main")).contains("100755 blob", "120000 blob", "160000 commit"); - assertThat(git(repository("target"), null, "log", "--format=%ae", "main")).isEqualTo("public-code@users.community.invalid"); + assertThat(git(repository("target"), null, "log", "--format=%ae", "main")).isEqualTo("public-code@users.vibemake.invalid"); for (String original : List.of(initial, published, unpublished)) { Process check = new ProcessBuilder("git", "--git-dir=" + repository("target"), "cat-file", "-e", original) .redirectError(ProcessBuilder.Redirect.DISCARD).start(); @@ -161,9 +161,9 @@ class CliGitSnapshotCopierTest { String sha = simplePublication(); for (String target : List.of("target", "another")) { git(repository(target), null, "init", "--bare", "--quiet"); - try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "community", "source"), sha, + try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "vibemake", "source"), sha, target, target, deadline())) { - snapshot.push(new Repository(2, "community", target)); + snapshot.push(new Repository(2, "vibemake", target)); } assertThat(git(repository(target), null, "rev-list", "--count", "main")).isEqualTo("1"); } @@ -187,9 +187,9 @@ class CliGitSnapshotCopierTest { byte[] bytes = new byte[128 * 1024]; new Random(42).nextBytes(bytes); String sha = lfsPublication(bytes, true); - try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "community", "source"), sha, + try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "vibemake", "source"), sha, "测试用户", "public-code", deadline())) { - snapshot.push(new Repository(2, "community", "target")); + snapshot.push(new Repository(2, "vibemake", "target")); } assertThat(objects.get("target").values()).singleElement().satisfies(actual -> assertThat(actual).isEqualTo(bytes)); assertThat(unexpectedRequests).hasValue(0); @@ -200,7 +200,7 @@ class CliGitSnapshotCopierTest { @Test void refusesMissingLfsObjectBeforeAnyTargetPush() throws Exception { String sha = lfsPublication("missing entity".getBytes(StandardCharsets.UTF_8), false); - assertThatThrownBy(() -> copier.prepare(new Repository(1, "community", "source"), sha, "Fixture", "code", deadline())) + assertThatThrownBy(() -> copier.prepare(new Repository(1, "vibemake", "source"), sha, "Fixture", "code", deadline())) .isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("FORK_COPY_FAILED")); assertThat(objects.get("target")).isNull(); assertClean(); @@ -212,7 +212,7 @@ class CliGitSnapshotCopierTest { String sha = lfsPublication("restricted entity".getBytes(StandardCharsets.UTF_8), true); redirectLfs = redirect; externalAction = !redirect; - assertThatThrownBy(() -> copier.prepare(new Repository(1, "community", "source"), sha, "Fixture", "code", deadline())) + assertThatThrownBy(() -> copier.prepare(new Repository(1, "vibemake", "source"), sha, "Fixture", "code", deadline())) .isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("FORK_COPY_FAILED")); assertThat(unexpectedRequests).hasValue(0); assertClean(); @@ -221,15 +221,15 @@ class CliGitSnapshotCopierTest { @Test void waitsForGiteaMetadataBeforeReadingTheFirstBranchAndChecksExactCommit() { String sha = "a".repeat(40); when(gitea.inspect("target")).thenReturn( - new GiteaClient.RemoteRepository(2, "community", "target", true, false, true, "", "main"), - new GiteaClient.RemoteRepository(2, "community", "target", true, false, false, "", "main")); + new GiteaClient.RemoteRepository(2, "vibemake", "target", true, false, true, "", "main"), + new GiteaClient.RemoteRepository(2, "vibemake", "target", true, false, false, "", "main")); when(gitea.head(any())).thenReturn(sha); - CliGitSnapshotCopier real = new CliGitSnapshotCopier(properties, community, commands, gitea, json); - real.verifyRemote(new Repository(2, "community", "target"), sha, deadline()); + CliGitSnapshotCopier real = new CliGitSnapshotCopier(properties, vibemake, commands, gitea, json); + real.verifyRemote(new Repository(2, "vibemake", "target"), sha, deadline()); verify(gitea, times(2)).inspect("target"); verify(gitea).head(any()); when(gitea.head(any())).thenReturn("b".repeat(40)); - assertThatThrownBy(() -> real.verifyRemote(new Repository(2, "community", "target"), sha, deadline())) + assertThatThrownBy(() -> real.verifyRemote(new Repository(2, "vibemake", "target"), sha, deadline())) .isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("FORK_COPY_FAILED")); } @@ -237,9 +237,9 @@ class CliGitSnapshotCopierTest { String sha = lfsPublication("target download must work".getBytes(StandardCharsets.UTF_8), true); rejectTargetDownload = true; ForkDeadline deadline = deadline(); - try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "community", "source"), sha, + try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "vibemake", "source"), sha, "Fixture", "code", deadline)) { - assertThatThrownBy(() -> snapshot.push(new Repository(2, "community", "target"))) + assertThatThrownBy(() -> snapshot.push(new Repository(2, "vibemake", "target"))) .isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("FORK_COPY_FAILED")); assertThat(deadline.writing()).isFalse(); } @@ -248,11 +248,11 @@ class CliGitSnapshotCopierTest { @Test void rejectsUnknownShaAndDiskQuotaAndCleansTemporaryData() throws Exception { String sha = simplePublication(); - assertThatThrownBy(() -> copier.prepare(new Repository(1, "community", "source"), "b".repeat(40), "Fixture", "code", deadline())) + assertThatThrownBy(() -> copier.prepare(new Repository(1, "vibemake", "source"), "b".repeat(40), "Fixture", "code", deadline())) .isInstanceOf(BusinessException.class); assertClean(); properties.setMaxTemporaryBytes(1); - assertThatThrownBy(() -> copier.prepare(new Repository(1, "community", "source"), sha, "Fixture", "code", deadline())) + assertThatThrownBy(() -> copier.prepare(new Repository(1, "vibemake", "source"), sha, "Fixture", "code", deadline())) .isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("FORK_RESOURCE_LIMIT")); assertClean(); } @@ -262,8 +262,8 @@ class CliGitSnapshotCopierTest { assertThatThrownBy(copier::checkAvailable).isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("FORK_UNAVAILABLE")); properties.setGitExecutable("git"); - CliGitSnapshotCopier http = new CliGitSnapshotCopier(properties, community, commands, gitea, json); - assertThatThrownBy(() -> http.prepare(new Repository(1, "community", "source"), "c".repeat(40), "Fixture", "code", deadline())) + CliGitSnapshotCopier http = new CliGitSnapshotCopier(properties, vibemake, commands, gitea, json); + assertThatThrownBy(() -> http.prepare(new Repository(1, "vibemake", "source"), "c".repeat(40), "Fixture", "code", deadline())) .isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("FORK_COPY_FAILED")); assertClean(); } @@ -272,9 +272,9 @@ class CliGitSnapshotCopierTest { String sha = simplePublication(); rejectGitPush = true; ForkDeadline deadline = deadline(); - try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "community", "source"), sha, + try (GitSnapshotCopier.PreparedSnapshot snapshot = copier.prepare(new Repository(1, "vibemake", "source"), sha, "Fixture", "code", deadline)) { - assertThatThrownBy(() -> snapshot.push(new Repository(2, "community", "target"))) + assertThatThrownBy(() -> snapshot.push(new Repository(2, "vibemake", "target"))) .isInstanceOfSatisfying(BusinessException.class, error -> assertThat(error.code()).isEqualTo("FORK_COPY_FAILED")); assertThat(deadline.writing()).isFalse(); } diff --git a/community-service/src/test/java/com/linkerbot/community/service/fork/ForkExecutorTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/ForkExecutorTest.java similarity index 96% rename from community-service/src/test/java/com/linkerbot/community/service/fork/ForkExecutorTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/ForkExecutorTest.java index ea7f55d..de09b16 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/fork/ForkExecutorTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/ForkExecutorTest.java @@ -1,11 +1,11 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; import static org.assertj.core.api.Assertions.*; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.*; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.ForkProperties; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.ForkProperties; import java.time.Duration; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/community-service/src/test/java/com/linkerbot/community/service/fork/GitCommandRunnerTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/GitCommandRunnerTest.java similarity index 95% rename from community-service/src/test/java/com/linkerbot/community/service/fork/GitCommandRunnerTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/GitCommandRunnerTest.java index a67e86e..bf9de18 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/fork/GitCommandRunnerTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/GitCommandRunnerTest.java @@ -1,10 +1,10 @@ -package com.linkerbot.community.service.fork; +package com.linkerbot.vibemake.service.fork; import static org.assertj.core.api.Assertions.*; import static org.awaitility.Awaitility.await; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.ForkProperties; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.ForkProperties; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.attribute.PosixFilePermissions; diff --git a/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/ProjectForkStateTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/ProjectForkStateTest.java new file mode 100644 index 0000000..a4ab7d9 --- /dev/null +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/fork/ProjectForkStateTest.java @@ -0,0 +1,140 @@ +package com.linkerbot.vibemake.service.fork; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + +import com.linkerbot.vibemake.bean.Contracts.ForkInput; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.UserService; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.linkerbot.vibemake.service.config.ForkProperties; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.gitea.GiteaClient; +import com.linkerbot.vibemake.service.impl.ProjectServiceImpl; +import com.linkerbot.vibemake.service.mapper.*; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; +import com.linkerbot.vibemake.service.oss.UrdfResources; +import com.linkerbot.vibemake.service.support.ProjectLocks; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.springframework.beans.factory.support.StaticListableBeanFactory; + +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; + +class ProjectForkStateTest { + @ParameterizedTest + @ValueSource(strings = {"initial", "association", "completion"}) + void databaseWriteFailuresRemainUncertainWithCode(String stage) { + boolean completion = stage.equals("completion"); + Project source = new Project(); + source.setId(1L); + source.setProjectCode("111111111111"); + source.setPublishedCommitSha("a".repeat(40)); + source.setProjectType("GENERAL"); + source.setName("来源"); + source.setDescription(""); + source.setGiteaRepoId(1L); + source.setGiteaOwner("vibemake"); + source.setGiteaRepoName("p_111111111111"); + ProjectMapper projects = mock(ProjectMapper.class); + when(projects.selectOne(any())).thenReturn(source); + AtomicReference target = new AtomicReference<>(); + when(projects.insert(any(Project.class))) + .thenAnswer( + call -> { + Project project = call.getArgument(0); + project.setId(2L); + target.set(project); + if (stage.equals("initial")) + throw new IllegalStateException("simulated insertion receipt lost"); + return 1; + }); + AtomicReference failed = new AtomicReference<>(false); + when(projects.updateById(any(Project.class))) + .thenAnswer( + call -> { + Project project = call.getArgument(0); + if (!failed.get() + && (completion == "READY".equals(project.getRepoStatus()))) { + failed.set(true); + throw new IllegalStateException("simulated database write failure"); + } + return 1; + }); + User user = new User(); + user.setNickname("测试用户"); + user.setUserCode("user-code"); + UserService users = mock(UserService.class); + when(users.require(1)).thenReturn(user); + GiteaClient gitea = mock(GiteaClient.class); + when(gitea.createRepository(anyString(), eq(false))) + .thenReturn(new GiteaClient.Repository(2, "vibemake", "target")); + GitSnapshotCopier copier = mock(GitSnapshotCopier.class); + GitSnapshotCopier.PreparedSnapshot snapshot = + mock(GitSnapshotCopier.PreparedSnapshot.class); + when(copier.prepare(any(), anyString(), anyString(), anyString(), any())) + .thenReturn(snapshot); + when(snapshot.push(any())).thenReturn("b".repeat(40)); + ForkExecutor executor = new ForkExecutor(new ForkProperties(), copier); + StaticListableBeanFactory factory = new StaticListableBeanFactory(); + factory.addBean("forks", executor); + factory.addBean("snapshots", copier); + ProjectLocks locks = new ProjectLocks(); + ProjectServiceImpl service = + new ProjectServiceImpl( + new org.springframework.beans.factory.support.StaticListableBeanFactory() + .getBeanProvider( + com.linkerbot.vibemake.service.state.RateLimits.class), + projects, + mock(ProjectImportTaskMapper.class), + mock(LikeMapper.class), + mock(CommentMapper.class), + users, + gitea, + new VibemakeProperties(), + locks, + new OssResourcePaths(new OssProperties()), + factory.getBeanProvider(UrdfResources.class), + factory.getBeanProvider(ForkExecutor.class), + factory.getBeanProvider(GitSnapshotCopier.class)); + try { + assertThatThrownBy( + () -> + service.fork( + 1, + source.getProjectCode(), + new ForkInput(source.getPublishedCommitSha(), "副本"))) + .isInstanceOfSatisfying( + BusinessException.class, + error -> { + assertThat(error.code()).isEqualTo("PROJECT_INITIALIZATION_ERROR"); + assertThat(error.details()) + .isEqualTo( + Map.of( + "projectCode", + target.get().getProjectCode())); + }); + assertThat(target.get().getRepoStatus()).isEqualTo("CREATING"); + assertThat(target.get().getGiteaRepoId()) + .isEqualTo(stage.equals("initial") ? null : 2L); + assertThatThrownBy(() -> locks.write(target.get().getProjectCode(), () -> true)) + .isInstanceOfSatisfying( + BusinessException.class, + error -> assertThat(error.code()).isEqualTo("REMOTE_RESULT_UNKNOWN")); + if (completion) verify(snapshot).push(any()); + else verify(snapshot, never()).push(any()); + if (stage.equals("initial")) { + verify(copier, never()) + .prepare(any(), anyString(), anyString(), anyString(), any()); + verify(snapshot, never()).close(); + } else verify(snapshot).close(); + } finally { + executor.close(); + } + } +} diff --git a/community-service/src/test/java/com/linkerbot/community/service/gitea/GiteaMigrationTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/gitea/GiteaMigrationTest.java similarity index 86% rename from community-service/src/test/java/com/linkerbot/community/service/gitea/GiteaMigrationTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/gitea/GiteaMigrationTest.java index f2d1596..d37f608 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/gitea/GiteaMigrationTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/gitea/GiteaMigrationTest.java @@ -1,10 +1,10 @@ -package com.linkerbot.community.service.gitea; +package com.linkerbot.vibemake.service.gitea; import static org.assertj.core.api.Assertions.*; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.service.config.CommunityProperties; +import com.linkerbot.vibemake.service.config.VibemakeProperties; import com.sun.net.httpserver.HttpServer; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ class GiteaMigrationTest { assertThat(exchange.getRequestHeaders().getFirst("Authorization")) .isEqualTo("token fixture-token"); byte[] response = - "{\"id\":77,\"owner\":{\"login\":\"community\"},\"name\":\"p_111111111111\",\"private\":true,\"mirror\":false,\"empty\":false,\"default_branch\":\"master\",\"original_url\":\"https://github.com/example/robot.git\"}" + "{\"id\":77,\"owner\":{\"login\":\"vibemake\"},\"name\":\"p_111111111111\",\"private\":true,\"mirror\":false,\"empty\":false,\"default_branch\":\"master\",\"original_url\":\"https://github.com/example/robot.git\"}" .getBytes(StandardCharsets.UTF_8); exchange.sendResponseHeaders(201, response.length); exchange.getResponseBody().write(response); @@ -35,7 +35,7 @@ class GiteaMigrationTest { }); server.start(); try { - CommunityProperties config = new CommunityProperties(); + VibemakeProperties config = new VibemakeProperties(); config.getGitea().setBaseUrl("http://127.0.0.1:" + server.getAddress().getPort()); config.getGitea().setToken("fixture-token"); GiteaClient client = new RestGiteaClient(config, json); @@ -44,15 +44,15 @@ class GiteaMigrationTest { "https://github.com/example/robot.git", "p_111111111111", Duration.ofSeconds(2), - "community-import:fixture-task"); + "vibemake-import:fixture-task"); assertThat(result.id()).isEqualTo(77); assertThat(result.defaultBranch()).isEqualTo("master"); - assertThat(body.get().path("repo_owner").asText()).isEqualTo("community"); + assertThat(body.get().path("repo_owner").asText()).isEqualTo("vibemake"); assertThat(body.get().path("repo_name").asText()).isEqualTo("p_111111111111"); assertThat(body.get().path("service").asText()).isEqualTo("git"); assertThat(body.get().path("private").asBoolean()).isTrue(); assertThat(body.get().path("lfs").asBoolean()).isTrue(); - assertThat(body.get().path("description").asText()).isEqualTo("community-import:fixture-task"); + assertThat(body.get().path("description").asText()).isEqualTo("vibemake-import:fixture-task"); for (String key : new String[] { "mirror", @@ -84,7 +84,7 @@ class GiteaMigrationTest { }); server.start(); try { - CommunityProperties config = new CommunityProperties(); + VibemakeProperties config = new VibemakeProperties(); config.getGitea().setBaseUrl("http://127.0.0.1:" + server.getAddress().getPort()); config.getGitea().setToken("fixture-token"); GiteaClient client = new RestGiteaClient(config, new ObjectMapper()); @@ -121,7 +121,7 @@ class GiteaMigrationTest { }); server.start(); try { - CommunityProperties config = new CommunityProperties(); + VibemakeProperties config = new VibemakeProperties(); config.getGitea().setBaseUrl("http://127.0.0.1:" + server.getAddress().getPort()); config.getGitea().setToken("fixture-token"); assertThatThrownBy( @@ -142,15 +142,15 @@ class GiteaMigrationTest { void deletionChecksRepositoryIdAndUsesAuthenticatedDelete() throws Exception { java.util.concurrent.atomic.AtomicInteger deleted = new java.util.concurrent.atomic.AtomicInteger(); HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); - server.createContext("/api/v1/repos/community/p_fixture", exchange -> { + server.createContext("/api/v1/repos/vibemake/p_fixture", exchange -> { assertThat(exchange.getRequestHeaders().getFirst("Authorization")).isEqualTo("token fixture-token"); if (exchange.getRequestMethod().equals("DELETE")) { deleted.incrementAndGet(); exchange.sendResponseHeaders(204, -1); } else { - byte[] response = ("{\"id\":77,\"owner\":{\"login\":\"community\"},\"name\":\"p_fixture\"," + byte[] response = ("{\"id\":77,\"owner\":{\"login\":\"vibemake\"},\"name\":\"p_fixture\"," + "\"private\":true,\"mirror\":false,\"empty\":true," - + "\"description\":\"community-import:fixture-task\"," + + "\"description\":\"vibemake-import:fixture-task\"," + "\"original_url\":\"https://github.com/example/robot.git\"}") .getBytes(StandardCharsets.UTF_8); exchange.sendResponseHeaders(200, response.length); @@ -160,14 +160,14 @@ class GiteaMigrationTest { }); server.start(); try { - CommunityProperties config = new CommunityProperties(); + VibemakeProperties config = new VibemakeProperties(); config.getGitea().setBaseUrl("http://127.0.0.1:" + server.getAddress().getPort()); config.getGitea().setToken("fixture-token"); GiteaClient client = new RestGiteaClient(config, new ObjectMapper()); GiteaClient.MigrationTarget target = client.inspectMigrationTarget("p_fixture"); - assertThat(target.description()).isEqualTo("community-import:fixture-task"); - assertThatThrownBy(() -> client.deleteRepository(new GiteaClient.Repository(78, "community", "p_fixture"))) - .isInstanceOf(com.linkerbot.community.common.BusinessException.class); + assertThat(target.description()).isEqualTo("vibemake-import:fixture-task"); + assertThatThrownBy(() -> client.deleteRepository(new GiteaClient.Repository(78, "vibemake", "p_fixture"))) + .isInstanceOf(com.linkerbot.vibemake.common.BusinessException.class); assertThat(deleted.get()).isZero(); client.deleteRepository(target.repository().repository()); assertThat(deleted.get()).isEqualTo(1); @@ -179,7 +179,7 @@ class GiteaMigrationTest { @Test void asynchronousDeleteResponseDoesNotConfirmCleanup() throws Exception { HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); - server.createContext("/api/v1/repos/community/p_fixture", exchange -> { + server.createContext("/api/v1/repos/vibemake/p_fixture", exchange -> { byte[] response = "{\"id\":77}".getBytes(StandardCharsets.UTF_8); exchange.sendResponseHeaders(exchange.getRequestMethod().equals("DELETE") ? 202 : 200, response.length); exchange.getResponseBody().write(response); @@ -187,11 +187,11 @@ class GiteaMigrationTest { }); server.start(); try { - CommunityProperties config = new CommunityProperties(); + VibemakeProperties config = new VibemakeProperties(); config.getGitea().setBaseUrl("http://127.0.0.1:" + server.getAddress().getPort()); config.getGitea().setToken("fixture-token"); GiteaClient client = new RestGiteaClient(config, new ObjectMapper()); - assertThatThrownBy(() -> client.deleteRepository(new GiteaClient.Repository(77, "community", "p_fixture"))) + assertThatThrownBy(() -> client.deleteRepository(new GiteaClient.Repository(77, "vibemake", "p_fixture"))) .isInstanceOfSatisfying(GiteaFailure.class, error -> { assertThat(error.code()).isEqualTo("MIGRATION_CLEANUP_UNCONFIRMED"); assertThat(error.uncertain()).isTrue(); diff --git a/vibemake-service/src/test/java/com/linkerbot/vibemake/service/gitea/GiteaResponseLimitTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/gitea/GiteaResponseLimitTest.java new file mode 100644 index 0000000..7669c62 --- /dev/null +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/gitea/GiteaResponseLimitTest.java @@ -0,0 +1,106 @@ +package com.linkerbot.vibemake.service.gitea; + +import static org.assertj.core.api.Assertions.*; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.linkerbot.vibemake.service.config.VibemakeProperties; +import com.sun.net.httpserver.HttpServer; + +import org.junit.jupiter.api.Test; + +import java.net.InetSocketAddress; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + +class GiteaResponseLimitTest { + @Test + void oversizedMetadataIsStoppedWhileReceiving() throws Exception { + HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); + AtomicInteger calls = new AtomicInteger(); + server.createContext( + "/api/v1/repos/vibemake/repo/branches/main", + exchange -> { + calls.incrementAndGet(); + exchange.sendResponseHeaders(200, 0); + try { + byte[] block = new byte[65536]; + for (int index = 0; index < 130; index++) + exchange.getResponseBody().write(block); + } catch (java.io.IOException expected) { + /* 客户端按上限主动取消。 */ + } finally { + exchange.close(); + } + }); + server.start(); + try { + RestGiteaClient client = client(server, 10 * 1024 * 1024); + assertThatThrownBy( + () -> client.head(new GiteaClient.Repository(1, "vibemake", "repo"))) + .isInstanceOfSatisfying( + GiteaFailure.class, + error -> { + assertThat(error.code()).isEqualTo("GITEA_RESPONSE_TOO_LARGE"); + assertThat(error.uncertain()).isFalse(); + }); + assertThat(calls.get()).isEqualTo(1); + } finally { + server.stop(0); + } + } + + @Test + void oversizedWriteResponseIsUncertainAndNeverRetried() throws Exception { + HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); + AtomicInteger calls = new AtomicInteger(); + server.createContext( + "/api/v1/repos/vibemake/repo/contents", + exchange -> { + calls.incrementAndGet(); + exchange.getRequestBody().readAllBytes(); + exchange.sendResponseHeaders(201, 0); + try { + byte[] block = new byte[65536]; + for (int index = 0; index < 34; index++) + exchange.getResponseBody().write(block); + } catch (java.io.IOException expected) { + } finally { + exchange.close(); + } + }); + server.start(); + try { + RestGiteaClient client = client(server, 3); + assertThatThrownBy( + () -> + client.commit( + new GiteaClient.Repository(1, "vibemake", "repo"), + List.of( + new GiteaClient.Change( + "create", + "test.txt", + null, + new byte[] {1})), + "test", + "test", + "111111111111")) + .isInstanceOfSatisfying( + GiteaFailure.class, + error -> { + assertThat(error.code()).isEqualTo("REMOTE_RESULT_UNKNOWN"); + assertThat(error.uncertain()).isTrue(); + }); + assertThat(calls.get()).isEqualTo(1); + } finally { + server.stop(0); + } + } + + private RestGiteaClient client(HttpServer server, long fileBytes) { + VibemakeProperties config = new VibemakeProperties(); + config.getGitea().setBaseUrl("http://127.0.0.1:" + server.getAddress().getPort()); + config.getGitea().setToken("test-placeholder"); + config.setMaxFileBytes(fileBytes); + return new RestGiteaClient(config, new ObjectMapper()); + } +} diff --git a/community-service/src/test/java/com/linkerbot/community/service/impl/UserServiceImplTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/impl/UserServiceImplTest.java similarity index 95% rename from community-service/src/test/java/com/linkerbot/community/service/impl/UserServiceImplTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/impl/UserServiceImplTest.java index 2cdd5a9..8c5614b 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/impl/UserServiceImplTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/impl/UserServiceImplTest.java @@ -1,12 +1,12 @@ -package com.linkerbot.community.service.impl; +package com.linkerbot.vibemake.service.impl; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import com.linkerbot.community.bean.entity.User; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.mapper.UserMapper; +import com.linkerbot.vibemake.bean.entity.User; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.mapper.UserMapper; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/community-service/src/test/java/com/linkerbot/community/service/oss/AliyunOssObjectStoreTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/AliyunOssObjectStoreTest.java similarity index 93% rename from community-service/src/test/java/com/linkerbot/community/service/oss/AliyunOssObjectStoreTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/AliyunOssObjectStoreTest.java index b7264fb..05f41a2 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/oss/AliyunOssObjectStoreTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/AliyunOssObjectStoreTest.java @@ -1,12 +1,12 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; import static org.assertj.core.api.Assertions.*; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.config.ForkProperties; -import com.linkerbot.community.service.fork.ForkExecutor; -import com.linkerbot.community.service.fork.GitSnapshotCopier; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.config.ForkProperties; +import com.linkerbot.vibemake.service.fork.ForkExecutor; +import com.linkerbot.vibemake.service.fork.GitSnapshotCopier; import java.time.Duration; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.mock; diff --git a/community-service/src/test/java/com/linkerbot/community/service/oss/OssPostSignerTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssPostSignerTest.java similarity index 97% rename from community-service/src/test/java/com/linkerbot/community/service/oss/OssPostSignerTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssPostSignerTest.java index 436c9c8..56fb94f 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/oss/OssPostSignerTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssPostSignerTest.java @@ -1,12 +1,12 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; import static org.assertj.core.api.Assertions.*; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.Contracts.CoverUploadSignature; -import com.linkerbot.community.service.config.OssProperties; +import com.linkerbot.vibemake.bean.Contracts.CoverUploadSignature; +import com.linkerbot.vibemake.service.config.OssProperties; import java.time.*; import java.util.*; import org.junit.jupiter.api.Test; diff --git a/community-service/src/test/java/com/linkerbot/community/service/oss/OssPropertiesTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssPropertiesTest.java similarity index 75% rename from community-service/src/test/java/com/linkerbot/community/service/oss/OssPropertiesTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssPropertiesTest.java index fe69787..bd4cb5d 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/oss/OssPropertiesTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssPropertiesTest.java @@ -1,8 +1,8 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; import static org.assertj.core.api.Assertions.*; -import com.linkerbot.community.service.config.OssProperties; +import com.linkerbot.vibemake.service.config.OssProperties; import org.junit.jupiter.api.Test; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -17,12 +17,12 @@ class OssPropertiesTest { private ApplicationContextRunner enabled() { return runner.withPropertyValues( - "community.oss.enabled=true", - "community.oss.region=cn-hangzhou", - "community.oss.bucket=examplebucket", - "community.oss.access-key-id=UnitTestAccessKey", - "community.oss.access-key-secret=unit-test-secret", - "community.oss.root-directory=vibemake_dev"); + "vibemake.oss.enabled=true", + "vibemake.oss.region=cn-hangzhou", + "vibemake.oss.bucket=examplebucket", + "vibemake.oss.access-key-id=UnitTestAccessKey", + "vibemake.oss.access-key-secret=unit-test-secret", + "vibemake.oss.root-directory=vibemake_dev"); } @Test @@ -31,10 +31,10 @@ class OssPropertiesTest { assertThat(context).hasNotFailed(); assertThat(context.getBean(OssProperties.class).isEnabled()).isFalse(); }); - runner.withPropertyValues("community.oss.enabled=true").run(context -> assertThat(context).hasFailed()); + runner.withPropertyValues("vibemake.oss.enabled=true").run(context -> assertThat(context).hasFailed()); enabled().run(context -> assertThat(context).hasNotFailed()); for (String property : new String[] {"region", "bucket", "access-key-id", "access-key-secret", "root-directory"}) - enabled().withPropertyValues("community.oss." + property + "=") + enabled().withPropertyValues("vibemake.oss." + property + "=") .run(context -> assertThat(context).hasFailed()); } @@ -46,13 +46,13 @@ class OssPropertiesTest { assertThat(properties.uploadUrl()).isEqualTo("https://examplebucket.oss-cn-hangzhou.aliyuncs.com"); assertThat(properties.publicBaseUrl()).isEqualTo(properties.uploadUrl()); }); - enabled().withPropertyValues("community.oss.region=cn-beijing", "community.oss.endpoint=") + enabled().withPropertyValues("vibemake.oss.region=cn-beijing", "vibemake.oss.endpoint=") .run(context -> { assertThat(context).hasNotFailed(); assertThat(context.getBean(OssProperties.class).uploadUrl()) .isEqualTo("https://examplebucket.oss-cn-beijing.aliyuncs.com"); }); - enabled().withPropertyValues("community.oss.endpoint=https://oss-accelerate.aliyuncs.com/") + enabled().withPropertyValues("vibemake.oss.endpoint=https://oss-accelerate.aliyuncs.com/") .run(context -> { assertThat(context).hasNotFailed(); assertThat(context.getBean(OssProperties.class).uploadUrl()) @@ -71,24 +71,24 @@ class OssPropertiesTest { "public-base-url=https://images.example.com/#fragment", "region=oss-cn-beijing", "root-directory=../vibemake", "bucket=vibemake_dev"}) - enabled().withPropertyValues("community.oss." + property) + enabled().withPropertyValues("vibemake.oss." + property) .run(context -> assertThat(context).hasFailed()); } @Test void bindsLegacyBasesAndValidatesThemEvenWhenUploadsAreDisabled() { - runner.withPropertyValues("community.oss.legacy-public-base-urls=") + runner.withPropertyValues("vibemake.oss.legacy-public-base-urls=") .run(context -> { assertThat(context).hasNotFailed(); assertThat(context.getBean(OssProperties.class).getLegacyPublicBaseUrls()).isEmpty(); }); - runner.withPropertyValues("community.oss.legacy-public-base-urls=https://old.example.com/assets,https://old-bucket.example.com") + runner.withPropertyValues("vibemake.oss.legacy-public-base-urls=https://old.example.com/assets,https://old-bucket.example.com") .run(context -> { assertThat(context).hasNotFailed(); assertThat(context.getBean(OssProperties.class).getLegacyPublicBaseUrls()).hasSize(2); }); for (String invalid : new String[] {"http://old.example.com", "https://old.example.com?token=example", "https://user:pass@old.example.com"}) - runner.withPropertyValues("community.oss.legacy-public-base-urls=" + invalid) + runner.withPropertyValues("vibemake.oss.legacy-public-base-urls=" + invalid) .run(context -> assertThat(context).hasFailed()); } } diff --git a/community-service/src/test/java/com/linkerbot/community/service/oss/OssResourcePathsTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssResourcePathsTest.java similarity index 96% rename from community-service/src/test/java/com/linkerbot/community/service/oss/OssResourcePathsTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssResourcePathsTest.java index 73e2937..009dd46 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/oss/OssResourcePathsTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssResourcePathsTest.java @@ -1,9 +1,9 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; import static org.assertj.core.api.Assertions.*; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.OssProperties; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.OssProperties; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/community-service/src/test/java/com/linkerbot/community/service/oss/UrdfResourcesTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/UrdfResourcesTest.java similarity index 94% rename from community-service/src/test/java/com/linkerbot/community/service/oss/UrdfResourcesTest.java rename to vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/UrdfResourcesTest.java index bdc613e..a5a9b3c 100644 --- a/community-service/src/test/java/com/linkerbot/community/service/oss/UrdfResourcesTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/UrdfResourcesTest.java @@ -1,14 +1,14 @@ -package com.linkerbot.community.service.oss; +package com.linkerbot.vibemake.service.oss; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import com.fasterxml.jackson.databind.ObjectMapper; -import com.linkerbot.community.bean.Contracts.UrdfFile; -import com.linkerbot.community.bean.entity.Project; -import com.linkerbot.community.common.BusinessException; -import com.linkerbot.community.service.config.OssProperties; -import com.linkerbot.community.service.config.UrdfProperties; +import com.linkerbot.vibemake.bean.Contracts.UrdfFile; +import com.linkerbot.vibemake.bean.entity.Project; +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.config.UrdfProperties; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/RedisStartupTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/RedisStartupTest.java new file mode 100644 index 0000000..0fa592b --- /dev/null +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/RedisStartupTest.java @@ -0,0 +1,63 @@ +package com.linkerbot.vibemake.service.state; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.common.state.TransientStateStore; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.DefaultApplicationArguments; +import org.springframework.boot.test.context.runner.WebApplicationContextRunner; +import org.springframework.context.event.ContextRefreshedEvent; + +import java.util.concurrent.atomic.AtomicInteger; + +class RedisStartupTest { + @Test + void failedProbeStopsRefreshBeforeScheduledTasksCanStart() { + TransientStateStore state = mock(TransientStateStore.class); + doThrow(new BusinessException(503, "REDIS_UNAVAILABLE", "unavailable")) + .when(state) + .verify(); + AtomicInteger refreshed = new AtomicInteger(); + runner(state, new DefaultApplicationArguments()) + .withInitializer( + context -> + context.addApplicationListener( + event -> { + if (event instanceof ContextRefreshedEvent) + refreshed.incrementAndGet(); + })) + .run( + context -> { + assertThat(context).hasFailed(); + assertThat(refreshed.get()).isZero(); + assertThat(context.getStartupFailure()) + .isInstanceOf(BusinessException.class); + }); + } + + @Test + void bootstrapSkipsRedisButNormalStartupVerifiesIt() { + TransientStateStore bootstrap = mock(TransientStateStore.class); + runner( + bootstrap, + new DefaultApplicationArguments("--bootstrap-admin-user-code=111111111111")) + .run(context -> assertThat(context).hasNotFailed()); + verifyNoInteractions(bootstrap); + TransientStateStore online = mock(TransientStateStore.class); + runner(online, new DefaultApplicationArguments()) + .run(context -> assertThat(context).hasNotFailed()); + verify(online).verify(); + } + + private WebApplicationContextRunner runner( + TransientStateStore state, ApplicationArguments arguments) { + return new WebApplicationContextRunner() + .withUserConfiguration(RedisStateConfiguration.class) + .withBean(TransientStateStore.class, () -> state) + .withBean(ApplicationArguments.class, () -> arguments); + } +} diff --git a/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/RedisStateStoreTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/RedisStateStoreTest.java new file mode 100644 index 0000000..d4ac0a2 --- /dev/null +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/RedisStateStoreTest.java @@ -0,0 +1,43 @@ +package com.linkerbot.vibemake.service.state; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.service.config.RedisStateProperties; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.springframework.data.redis.RedisConnectionFailureException; +import org.springframework.data.redis.core.StringRedisTemplate; + +import java.time.Duration; + +class RedisStateStoreTest { + static java.util.stream.Stream backendFailures() { + return java.util.stream.Stream.of( + new RedisConnectionFailureException("secret-must-not-leak"), + new org.springframework.dao.QueryTimeoutException("secret-must-not-leak"), + new org.springframework.dao.PermissionDeniedDataAccessException( + "secret-must-not-leak", new IllegalStateException())); + } + + @ParameterizedTest + @MethodSource("backendFailures") + void unavailableRedisIsReportedWithoutCredentialsAndNoFallback(RuntimeException failure) { + StringRedisTemplate redis = mock(StringRedisTemplate.class); + when(redis.opsForValue()).thenThrow(failure); + RedisStateStore store = new RedisStateStore(redis, new RedisStateProperties()); + assertThatThrownBy(() -> store.get("session:hidden")) + .isInstanceOfSatisfying( + BusinessException.class, + error -> { + assertThat(error.status()).isEqualTo(503); + assertThat(error.code()).isEqualTo("REDIS_UNAVAILABLE"); + assertThat(error.getMessage()).doesNotContain("secret-must-not-leak"); + }); + assertThatThrownBy( + () -> store.putIfAbsent("session:hidden", "value", Duration.ofMinutes(1))) + .isInstanceOf(BusinessException.class); + } +} diff --git a/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/SafetyTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/SafetyTest.java new file mode 100644 index 0000000..4feb33a --- /dev/null +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/state/SafetyTest.java @@ -0,0 +1,209 @@ +package com.linkerbot.vibemake.service.state; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.linkerbot.vibemake.common.*; +import com.linkerbot.vibemake.common.state.TransientStateStore; +import com.linkerbot.vibemake.service.config.LimitProperties; +import com.linkerbot.vibemake.testing.InMemoryStateStore; + +import org.junit.jupiter.api.Test; +import org.springframework.mock.web.*; + +import java.time.Duration; +import java.util.List; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +class SafetyTest { + @org.junit.jupiter.params.ParameterizedTest + @org.junit.jupiter.params.provider.ValueSource( + strings = { + "/api/community/projects/111111111111/files", + "/api/workspace/projects/111111111111/files", + "/admin-api/projects/111111111111/files" + }) + void headAndGetShareFileQuotaInBothApplications(String path) throws Exception { + LimitProperties properties = new LimitProperties(); + properties.getPerMinute().put("file-read", 1); + HttpSafetyFilter filter = + new HttpSafetyFilter( + properties, + new RateLimits(new InMemoryStateStore(), properties), + new ClientAddresses(properties), + new ObjectMapper()); + MockHttpServletResponse first = new MockHttpServletResponse(); + filter.doFilter(new MockHttpServletRequest("HEAD", path), first, (request, response) -> {}); + assertThat(first.getStatus()).isEqualTo(200); + MockHttpServletResponse second = new MockHttpServletResponse(); + filter.doFilter( + new MockHttpServletRequest("GET", path), + second, + (request, response) -> fail("HEAD 不能绕过文件读取额度")); + assertThat(second.getStatus()).isEqualTo(429); + assertThat(second.getHeader("Retry-After")).isNotBlank(); + } + + @Test + void independentForkAndUrdfLimitsAreAtomicAndExpire() throws Exception { + InMemoryStateStore state = new InMemoryStateStore(); + RateLimits limits = new RateLimits(state, new LimitProperties()); + for (int i = 0; i < 10; i++) limits.operation("fork", 1); + assertThatThrownBy(() -> limits.operation("fork", 1)) + .isInstanceOfSatisfying( + RateLimitedException.class, + error -> { + assertThat(error.code()).isEqualTo("RATE_LIMITED"); + assertThat(error.retryAfterSeconds()).isBetween(1L, 60L); + }); + for (int i = 0; i < 20; i++) limits.operation("urdf-sign", 1); + assertThatThrownBy(() -> limits.operation("urdf-sign", 1)) + .isInstanceOf(RateLimitedException.class); + limits.operation("fork", 2); + AtomicInteger accepted = new AtomicInteger(); + try (ExecutorService pool = Executors.newVirtualThreadPerTaskExecutor()) { + for (int i = 0; i < 100; i++) + pool.submit( + () -> { + try { + limits.check( + "concurrent", + "same", + 7, + Duration.ofMinutes(1), + "RATE_LIMITED", + "limited"); + accepted.incrementAndGet(); + } catch (RateLimitedException expected) { + } + }); + } + assertThat(accepted.get()).isEqualTo(7); + limits.check("expiry", "same", 1, Duration.ofMillis(20), "RATE_LIMITED", "limited"); + Thread.sleep(35); + limits.check("expiry", "same", 1, Duration.ofMillis(20), "RATE_LIMITED", "limited"); + } + + @Test + void onlyTrustedForwardingChainsAreAccepted() { + LimitProperties properties = new LimitProperties(); + properties.setTrustedProxies(List.of("10.0.0.0/8", "::1/128")); + ClientAddresses addresses = new ClientAddresses(properties); + MockHttpServletRequest request = new MockHttpServletRequest(); + request.setRemoteAddr("203.0.113.10"); + request.addHeader("X-Forwarded-For", "1.1.1.1"); + assertThat(addresses.resolve(request)).isEqualTo("203.0.113.10"); + request.setRemoteAddr("10.0.0.2"); + request.removeHeader("X-Forwarded-For"); + request.addHeader("X-Forwarded-For", "1.1.1.1, 203.0.113.10, 10.0.0.3"); + assertThat(addresses.resolve(request)).isEqualTo("203.0.113.10"); + request.removeHeader("X-Forwarded-For"); + request.addHeader("X-Forwarded-For", "host.example"); + assertThat(addresses.resolve(request)).isEqualTo("10.0.0.2"); + request.setRemoteAddr("::1"); + request.removeHeader("X-Forwarded-For"); + request.addHeader("X-Forwarded-For", "2001:db8::1"); + String compressed = addresses.resolve(request); + request.removeHeader("X-Forwarded-For"); + request.addHeader("X-Forwarded-For", "2001:db8:0:0:0:0:0:1"); + assertThat(addresses.resolve(request)) + .isEqualTo(compressed) + .isEqualTo("2001:db8:0:0:0:0:0:1"); + } + + @Test + void declaredAndChunkedBodiesAreBoundedWithoutBuffering() throws Exception { + LimitProperties properties = new LimitProperties(); + properties.setJsonBytes(8); + HttpSafetyFilter filter = + new HttpSafetyFilter( + properties, + new RateLimits(new InMemoryStateStore(), properties), + new ClientAddresses(properties), + new ObjectMapper()); + MockHttpServletRequest declared = new MockHttpServletRequest("POST", "/api/auth/login"); + declared.setContentType("application/json"); + declared.setContent("123456789".getBytes()); + MockHttpServletResponse response = new MockHttpServletResponse(); + filter.doFilter(declared, response, (request, output) -> fail("正文超限不能到达业务")); + assertThat(response.getStatus()).isEqualTo(413); + MockHttpServletRequest chunked = + new MockHttpServletRequest("POST", "/api/auth/login") { + @Override + public long getContentLengthLong() { + return -1; + } + + @Override + public int getContentLength() { + return -1; + } + }; + chunked.setContentType("application/json"); + chunked.setContent("123456789".getBytes()); + MockHttpServletResponse chunkedResponse = new MockHttpServletResponse(); + filter.doFilter( + chunked, + chunkedResponse, + (request, output) -> request.getInputStream().readAllBytes()); + assertThat(chunkedResponse.getStatus()).isEqualTo(413); + assertThat(chunkedResponse.getContentAsString()).contains("REQUEST_TOO_LARGE"); + } + + @Test + void concurrentFilesRejectImmediatelyAndReleaseAfterFailure() throws Exception { + LimitProperties properties = new LimitProperties(); + properties.setFileConcurrent(1); + HttpSafetyFilter filter = + new HttpSafetyFilter( + properties, + new RateLimits(new InMemoryStateStore(), properties), + new ClientAddresses(properties), + new ObjectMapper()); + MockHttpServletResponse busy = new MockHttpServletResponse(); + filter.doFilter( + new MockHttpServletRequest("GET", "/api/community/projects/111111111111/files"), + new MockHttpServletResponse(), + (request, response) -> { + filter.doFilter( + new MockHttpServletRequest( + "GET", "/api/community/projects/222222222222/files"), + busy, + (inner, output) -> fail("不应排队或执行")); + }); + assertThat(busy.getStatus()).isEqualTo(429); + assertThat(busy.getContentAsString()).contains("FILE_BUSY"); + filter.doFilter( + new MockHttpServletRequest("GET", "/api/community/projects/111111111111/files"), + new MockHttpServletResponse(), + (request, response) -> response.getWriter().write("released")); + } + + @Test + void redisFailureDoesNotPassThroughAndOptionsDoNotConsumeQuota() throws Exception { + TransientStateStore state = mock(TransientStateStore.class); + when(state.increment(anyString(), any(), anyBoolean())) + .thenThrow(new BusinessException(503, "REDIS_UNAVAILABLE", "unavailable")); + LimitProperties properties = new LimitProperties(); + HttpSafetyFilter filter = + new HttpSafetyFilter( + properties, + new RateLimits(state, properties), + new ClientAddresses(properties), + new ObjectMapper()); + MockHttpServletResponse response = new MockHttpServletResponse(); + filter.doFilter( + new MockHttpServletRequest("GET", "/api/auth/captcha"), + response, + (request, output) -> fail("Redis 故障不能绕过检查")); + assertThat(response.getStatus()).isEqualTo(503); + clearInvocations(state); + filter.doFilter( + new MockHttpServletRequest("OPTIONS", "/api/auth/captcha"), + new MockHttpServletResponse(), + (request, output) -> {}); + verifyNoInteractions(state); + } +}