diff --git a/docs/admin-api.md b/docs/admin-api.md index 83db4bf..60cfb93 100644 --- a/docs/admin-api.md +++ b/docs/admin-api.md @@ -919,6 +919,8 @@ async function uploadProjectResource( Fork 只复制这四类资源的八个数据库字段,复用原 OSS 对象,不对这些资源执行 HEAD、复制或下载,OSS 暂不可用也不影响该继承过程。副本与来源后续各自替换绑定,替换、清除和删除项目均保留旧对象。已有 URDF 仍使用原独立复制规则。 +所有平台资源绑定在数据库中保存不含域名及环境前缀的相对路径,历史完整 key 在项目保存或 Fork 时规范化;返回的签名对象键和公开 URL 仍包含当前环境根目录。存量转换 SQL 见 [OSS 引用规范](oss-storage-paths.md)。 + 部署前执行 [项目资源增量 SQL](admin-database.md#已有数据库增加四类项目资源字段)。RAM 用户对当前环境 `project-resources/*` 增加 `oss:PutObject` 和 `oss:GetObject` 权限;配置资源公开读取或公开 CDN,真实前端 Origin 的 OSS CORS 允许 POST、GET、HEAD,允许 Content-Type。无需为新增资源开通复制或删除权限,应用不修改 Bucket 配置。 ### 8.4 STEP 单文件上传 diff --git a/docs/cad-database.md b/docs/cad-database.md index ac5d964..a8d3c47 100644 --- a/docs/cad-database.md +++ b/docs/cad-database.md @@ -11,7 +11,8 @@ CREATE TABLE cad_project ( owner_user_id BIGINT NOT NULL COMMENT '所属用户内部主键,关联sys_user.id', name VARCHAR(100) NOT NULL COMMENT 'CAD项目名称', description VARCHAR(2000) NOT NULL DEFAULT '' COMMENT 'CAD项目描述', - document_object_key VARCHAR(512) CHARACTER SET ascii COLLATE ascii_bin NOT NULL DEFAULT '' COMMENT '当前原生设计文件的OSS对象键', + cover_url VARCHAR(2048) NULL COMMENT 'CAD项目封面,平台OSS资源存无环境前缀的相对路径', + document_object_key VARCHAR(512) CHARACTER SET ascii COLLATE ascii_bin NOT NULL DEFAULT '' COMMENT '当前设计文件环境相对路径,以斜杠开头,不含域名和环境根目录', file_name VARCHAR(255) NOT NULL DEFAULT '' COMMENT '当前原生设计文件名称', size_bytes BIGINT NOT NULL DEFAULT 0 COMMENT '当前设计文件大小,单位字节', version BIGINT NOT NULL DEFAULT 0 COMMENT '当前保存版本,空项目为0,每次成功保存递增', @@ -29,7 +30,7 @@ CREATE TABLE cad_project_upload ( upload_code VARCHAR(32) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '上传批次唯一业务编码', cad_project_id BIGINT NOT NULL COMMENT '所属CAD项目内部主键,关联cad_project.id', expected_version BIGINT NOT NULL COMMENT '签发上传时的项目基础版本,用于并发保存校验', - object_key VARCHAR(512) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '本批次设计文件的OSS对象键', + object_key VARCHAR(512) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT '本批次设计文件环境相对路径,以斜杠开头,不含域名和环境根目录', file_name VARCHAR(255) NOT NULL COMMENT '本批次原生设计文件名称', size_bytes BIGINT NOT NULL COMMENT '本批次声明的文件大小,单位字节', expires_at DATETIME(3) NOT NULL COMMENT '未确认批次的截止上海时间,与上传签名一致', @@ -44,3 +45,18 @@ CREATE TABLE cad_project_upload ( ``` 保存事务锁定当前用户的未删除项目和对应批次,按 `expected_version` 条件更新当前对象键和版本,同时写入批次回执。失败整体回滚。重放已确认批次只返回首次确认的版本和时间,不重新绑定旧对象;项目删除后仍拒绝重放。首期不清理上传批次或旧 OSS 对象,不提供历史恢复接口。 + +`document_object_key` 和 `object_key` 均保存 `/cad-projects/{项目编码}/{批次编码}/design.sc`,不保存 `vibemake_dev/` 或 `vibemake/`。真实上传和读取在运行时补当前环境根目录。已有数据格式转换 SQL 见 [数据库 OSS 引用统一规范](oss-storage-paths.md#现有数据手工转换-sql),无需改字段结构。 + +## 已有数据库增加 CAD 项目封面 + +已有 `cad_project` 表在部署新版前手工执行一次下列 SQL;新建数据库已包含此列,不重复执行。应用不会自动修改实际数据库,现有项目封面默认为 NULL。 + +```sql +ALTER TABLE cad_project + ADD COLUMN cover_url VARCHAR(2048) NULL + COMMENT 'CAD项目封面,平台OSS资源存无环境前缀的相对路径' + AFTER description; +``` + +平台托管封面保存 `/project-covers/...` 等未编码路径,不含域名及环境根目录;接口返回时补齐当前 OSS/CDN 基础地址和环境前缀。上传复用现有封面签名,不占用设计文件上传批次,也不改变文档版本。 diff --git a/docs/database.md b/docs/database.md index ceb6109..50fe6ad 100644 --- a/docs/database.md +++ b/docs/database.md @@ -134,6 +134,8 @@ ALTER TABLE project ## 资源路径历史数据迁移 +CAD 两张表、STEP 和其他项目资源的补充转换 SQL,以及全部 OSS 绑定字段的统一存储规范,见 [数据库 OSS 引用规范](oss-storage-paths.md)。本节继续处理历史完整封面 URL 的匹配、解码和原有 URDF 数据。 + 先升级所有在线及导入写入进程,新版本兼容新旧格式,读取不修改记录。按环境分别执行以下操作;test 根目录为 `vibemake_dev`,prod 为 `vibemake`。OSS 对象不移动,`urdf_files`、`updated_at` 不变。不要在不同环境共用同一业务数据库。 迁移前备份数据库,并将候选记录的原值导出至备份目录。以下临时表仅属于当前数据库连接,不能代替持久备份。封面按每个受控公开基础地址分别执行一遍,包含 Bucket 标准域名、当前 CDN 基础地址和 `vibemake.oss.legacy-public-base-urls` 中的历史地址;基础地址不含环境根目录。不使用全局 REPLACE,不转换外链、带参数/片段地址或其他环境路径。 diff --git a/docs/frontend-cad-workspace.md b/docs/frontend-cad-workspace.md index f1898ae..b9822e8 100644 --- a/docs/frontend-cad-workspace.md +++ b/docs/frontend-cad-workspace.md @@ -6,6 +6,8 @@ CAD 与 Vibemake 共用 `/api/auth/login`、`/api/auth/logout` 和 `/api/users/m 文件沿用现有 OSS 资源规则:上传继承 Bucket 权限,读取使用 `OSS_PUBLIC_BASE_URL` 对应的普通 OSS/CDN 地址。工作空间和平台接口按用户隔离,文件直链的访问权限由现有 Bucket/CDN 配置决定;公开配置下,拿到直链即可读取文件。 +数据库的当前文件和上传批次只保存 `/cad-projects/{项目编码}/{批次编码}/design.sc`,不含环境前缀;上传签名的 `formFields.key` 和实际访问地址仍包含当前环境根目录,前端原样使用。所有资源的存储规范及历史数据转换 SQL 见 [OSS 引用规范](oss-storage-paths.md)。 + 通用响应、上海时间格式、分页和跨域规则沿用 [Vibemake 接入约定](vibemake-api.md#接入约定)。CAD 所有接口返回 `Cache-Control: no-store`。业务编码为不透明字符串,不使用数据库 ID。 ## 接口与数据 @@ -15,15 +17,15 @@ CAD 与 Vibemake 共用 `/api/auth/login`、`/api/auth/logout` 和 `/api/users/m | 方法 | 相对路径 | 请求 | 成功 data | | --- | --- | --- | --- | | GET | 空 | `page=1&size=20&keyword=名称` | 项目分页 | -| POST | 空 | `{name,description?}` | 项目 | +| POST | 空 | `{name,description?,coverUrl?}` | 项目 | | GET | `/{cadProjectCode}` | 无 | 项目 | -| PATCH | `/{cadProjectCode}` | `{name?,description?}` | 项目 | +| PATCH | `/{cadProjectCode}` | `{name?,description?,coverUrl?}` | 项目 | | DELETE | `/{cadProjectCode}` | 无 | null | | POST | `/{cadProjectCode}/uploads/signature` | `{fileName,sizeBytes,expectedVersion}` | 上传签名 | | PUT | `/{cadProjectCode}/document` | `{uploadCode}` | 保存回执 | | GET | `/{cadProjectCode}/document` | 无 | 文件读取信息 | -名称必填,去除首尾空白后 1~100 字符;描述最多 2000 字符,新建时默认空字符串。PATCH 省略或 null 表示保留,描述传 `""` 可清空,至少提供一个非 null 字段。 +名称必填,去除首尾空白后 1~100 字符;描述最多 2000 字符,新建时默认空字符串。`coverUrl` 可选,传完整 HTTPS 地址,最多 2048 字符;新建省略、null 或空白表示没有封面。PATCH 省略或 null 表示保留,描述或封面传 `""` 可清空,至少提供一个非 null 字段。 项目: @@ -32,6 +34,7 @@ interface CadProject { cadProjectCode: string; name: string; description: string; + coverUrl: string | null; // 完整 OSS/CDN 地址,无封面为 null hasDocument: boolean; version: number; fileName: string; @@ -60,7 +63,23 @@ interface CadDocument { } ``` -新项目 `hasDocument=false、version=0、fileName=""、sizeBytes=0、savedAt=null`。列表只包含本人未删除项目,按最近更新时间倒序;支持名称包含搜索。`page` 为 1~100000,`size` 为 1~100,默认 20,返回 `{items,page,size,total}`。同名项目允许存在。改名不改变文件保存版本。 +新项目 `hasDocument=false、version=0、fileName=""、sizeBytes=0、savedAt=null`,未提供封面时 `coverUrl=null`。列表和详情均包含封面。列表只包含本人未删除项目,按最近更新时间倒序;支持名称包含搜索。`page` 为 1~100000,`size` 为 1~100,默认 20,返回 `{items,page,size,total}`。同名项目允许存在。改名、描述和封面修改不改变文件保存版本或 savedAt。 + +## 项目封面 + +复用 [已有封面上传](vibemake-api.md#项目封面与-oss-直传) 的 `POST /api/uploads/project-covers/signature`,无需 CAD 项目编码,也不会创建 Git 项目。请求 `{contentType,fileSize}`,支持 JPG、PNG、WebP,最大 5 MiB;使用同一平台 Token 申请签名,取得 `uploadUrl、formFields、coverUrl`。 + +将全部 formFields 和图片通过 FormData 直传 OSS,不携带平台 Token。上传成功后,将签名返回的完整 `coverUrl` 放入新建请求,或提交 `PATCH /api/cad/workspace/projects/{cadProjectCode}`: + +```json +{"coverUrl":"https://你的OSS或CDN域名/vibemake_dev/project-covers/用户编码/日期/文件名.png"} +``` + +封面上传遵循现有 `OSS_ENABLED` 开关和 OSS 规则;CAD 的 `.sc` 独立存储开关不代替封面上传开关。可以由前端截取 CAD 画布生成图片,后台不自动生成或更新封面。 + +平台托管封面在数据库 `cad_project.cover_url` 中保存 `/project-covers/...` 等无环境前缀的未编码路径;列表、详情和创建/修改结果中的 coverUrl 自动补当前环境前缀及 OSS/CDN 地址。沿用现有封面规则接受外部 HTTPS 图片链接并原样保存,不接受直接提交数据库相对路径。 + +只修改封面不更新 `.sc` 文件或版本,保存 `.sc` 也不会清空封面。换图、清空封面和删除 CAD 项目均不删除旧 OSS 图片。已有数据库部署前先执行 [CAD 封面增量 SQL](cad-database.md#已有数据库增加-cad-项目封面)。 ## 保存和重新打开 diff --git a/docs/oss-storage-paths.md b/docs/oss-storage-paths.md new file mode 100644 index 0000000..8dff93a --- /dev/null +++ b/docs/oss-storage-paths.md @@ -0,0 +1,71 @@ +# 数据库 OSS 引用统一规范与存量转换 + +所有平台托管 OSS 资源的专用数据库字段统一保存**未进行 URL 编码、以 `/` 开头、不含域名和环境根目录的路径**。目录字段保留末尾 `/`。实际上传对象键、HEAD/复制使用的 key 和公开访问 URL 由 `vibemake.oss.root-directory` 与公开基础地址在运行时生成。 + +| 位置 | 数据库存储示例 | 实际 OSS key 示例 | +| --- | --- | --- | +| CAD 当前设计及上传批次 | `/cad-projects/{项目编码}/{批次编码}/design.sc` | `vibemake_dev/cad-projects/{项目编码}/{批次编码}/design.sc` | +| 平台托管封面(含 CAD 的 cover_url) | `/project-covers/{用户编码}/{日期}/{文件名}` | `vibemake_dev/project-covers/{用户编码}/{日期}/{文件名}` | +| URDF 主文件及目录 | `/urdf/{项目编码}/{批次编码}/...` | `vibemake_dev/urdf/{项目编码}/{批次编码}/...` | +| STEP、GLB、零件、拼装步骤、行走资源 | `/project-resources/{项目编码}/{类型}/{批次编码}/...` | `vibemake_dev/project-resources/{项目编码}/{类型}/{批次编码}/...` | + +生产环境真实对象键使用 `vibemake/`;数据库格式相同。托管图片作为封面时,也可以引用 README 图片或其他受控资源目录,均按相同规则保存。外部 HTTPS 链接、带查询参数或片段的链接保持原有访问语义,不通过截断 URL 去掉参数或改写到其他环境。原始 Git README 内容、外部仓库来源地址不属于 OSS 绑定字段,不做全文替换。 + +新写入的 CAD 批次和保存确认已采用此格式。项目完整保存、Fork 和导入工具状态回写统一规范资源引用;普通资源签名和确认继续使用已有相对路径。应用兼容读取当前环境的历史完整 key,但读取不自动迁移数据库。升级前签发的 CAD 批次仍可确认,确认时同时规范项目和该批次的引用。幂等重放保持原有回执规则。 + +## 现有数据手工转换 SQL + +无需修改字段结构。先升级所有在线写入进程与导入工具,再暂停资源写入并备份业务库。在对应环境的业务数据库连接中执行;test 使用 `vibemake_dev`,prod 将 `@oss_root` 改为 `vibemake`。不会移动、复制或删除 OSS 对象,也不修改项目版本、保存时间、上传回执和业务更新时间。 + +仅当字段精确以当前环境和对应资源目录开头时转换,使用二进制前缀比较避免大小写或下划线通配符误匹配,不使用全局 REPLACE。已经是相对路径的记录、空值和其他环境路径不变;本转换可重复执行。 + +```sql +-- resource-path-all-bindings-migrate +SET @oss_root = 'vibemake_dev'; +START TRANSACTION; +-- 仅去掉当前环境前缀,保留开头的 /;空绑定和其他环境不匹配。 +UPDATE cad_project +SET document_object_key = SUBSTRING(document_object_key, CHAR_LENGTH(@oss_root) + 1) +WHERE BINARY LEFT(document_object_key, CHAR_LENGTH(@oss_root) + 14) = BINARY CONCAT(@oss_root, '/cad-projects/'); + +UPDATE cad_project_upload +SET object_key = SUBSTRING(object_key, CHAR_LENGTH(@oss_root) + 1) +WHERE BINARY LEFT(object_key, CHAR_LENGTH(@oss_root) + 14) = BINARY CONCAT(@oss_root, '/cad-projects/'); + +-- 项目资源的原始 key 与目录,统一为已有的环境相对格式。 +UPDATE project +SET urdf_main_object_key = CASE WHEN BINARY LEFT(urdf_main_object_key, CHAR_LENGTH(@oss_root) + 6) = BINARY CONCAT(@oss_root, '/urdf/') + THEN SUBSTRING(urdf_main_object_key, CHAR_LENGTH(@oss_root) + 1) ELSE urdf_main_object_key END, + urdf_prefix = CASE WHEN BINARY LEFT(urdf_prefix, CHAR_LENGTH(@oss_root) + 6) = BINARY CONCAT(@oss_root, '/urdf/') + THEN SUBSTRING(urdf_prefix, CHAR_LENGTH(@oss_root) + 1) ELSE urdf_prefix END, + step_object_key = CASE WHEN BINARY LEFT(step_object_key, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + THEN SUBSTRING(step_object_key, CHAR_LENGTH(@oss_root) + 1) ELSE step_object_key END, + model_glb_object_key = CASE WHEN BINARY LEFT(model_glb_object_key, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + THEN SUBSTRING(model_glb_object_key, CHAR_LENGTH(@oss_root) + 1) ELSE model_glb_object_key END, + model_parts_prefix = CASE WHEN BINARY LEFT(model_parts_prefix, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + THEN SUBSTRING(model_parts_prefix, CHAR_LENGTH(@oss_root) + 1) ELSE model_parts_prefix END, + assembly_json_object_key = CASE WHEN BINARY LEFT(assembly_json_object_key, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + THEN SUBSTRING(assembly_json_object_key, CHAR_LENGTH(@oss_root) + 1) ELSE assembly_json_object_key END, + walking_resources_prefix = CASE WHEN BINARY LEFT(walking_resources_prefix, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + THEN SUBSTRING(walking_resources_prefix, CHAR_LENGTH(@oss_root) + 1) ELSE walking_resources_prefix END +WHERE BINARY LEFT(urdf_main_object_key, CHAR_LENGTH(@oss_root) + 6) = BINARY CONCAT(@oss_root, '/urdf/') + OR BINARY LEFT(urdf_prefix, CHAR_LENGTH(@oss_root) + 6) = BINARY CONCAT(@oss_root, '/urdf/') + OR BINARY LEFT(step_object_key, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + OR BINARY LEFT(model_glb_object_key, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + OR BINARY LEFT(model_parts_prefix, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + OR BINARY LEFT(assembly_json_object_key, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/') + OR BINARY LEFT(walking_resources_prefix, CHAR_LENGTH(@oss_root) + 19) = BINARY CONCAT(@oss_root, '/project-resources/'); +COMMIT; +``` + +`project.cover_url` 的历史完整 HTTPS 地址还需要域名匹配和 URL 解码,不能直接用上述 SUBSTRING 处理。标准托管封面的预览、备份、转换和回退 SQL 见 [封面及 URDF 历史迁移](database.md#资源路径历史数据迁移)。按当前 OSS/CDN 及已配置历史基础地址逐个执行;非标准、编码或带参数的历史图片先核验,正常重新保存时应用会按受控资源规则转换,不盲目截断成路径。 + +## 验证和回退 + +- 抽查 CAD 两张表和 project 的资源字段均为 `/cad-projects/`、`/urdf/`、`/project-resources/` 等相对路径。 +- 通过 API 重新获取的下载地址与转换前指向同一个真实对象,仍包含当前环境前缀。 +- 核验升级前未确认 CAD 批次、重复确认、重新保存、Fork 继承和项目资源列表。 +- 未转换的其他环境或异常路径单独核验,不能通过任意删除路径第一段重新定位对象。 +- 旧 CAD 后端的 HEAD 使用完整 key,回滚前需同时恢复该次迁移备份中的 CAD 原值;不能只回滚代码。保留上线后的有效写入,不用旧备份覆盖新保存。 + +应用不会自动执行这些 SQL,本仓库不修改任何 `.sql` 文件。 diff --git a/docs/vibemake-api.md b/docs/vibemake-api.md index edbd960..ccd1545 100644 --- a/docs/vibemake-api.md +++ b/docs/vibemake-api.md @@ -613,7 +613,7 @@ 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 环境变量。特殊域名场景可显式设置 `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 的调用方式不变,不允许客户端改为提交相对路径。 +公开基础地址可以是 OSS 或 CDN 域名,可带基础路径;最终地址为 `{公开基础地址}/{objectKey}`,CDN 路径需正确映射到同一对象。留空时为 `https://{Bucket}.{Endpoint 主机名}/{objectKey}`。API 的 `coverUrl` 继续接收和返回完整 HTTPS URL;数据库对本平台当前环境资源保存 `/project-covers/...` 等未编码的环境相对路径(也支持来自 README 和项目资源目录的托管图片),域名和环境根目录由后端配置补齐,外链原样保存。创建、PATCH、清除封面及 Fork 的调用方式不变,不允许客户端改为提交相对路径。CAD、URDF、STEP 和其他资源绑定字段均不保存环境前缀,完整规范与存量转换见 [OSS 引用规范](oss-storage-paths.md)。 历史完整平台 URL 及当前环境的 URDF key 均兼容读取,读取不自动迁移。更换域名时,在 `vibemake.oss.legacy-public-base-urls` 配置历史公开基础地址(可带 CDN 基础路径,不含环境根目录、凭据、查询参数及片段),或通过 `OSS_LEGACY_PUBLIC_BASE_URLS` 使用英文逗号分隔。后端按域名、端口和完整路径边界匹配当前环境;带查询参数或片段的封面继续按外链保留。迁移 SQL 与回退步骤见 [资源路径迁移](database.md#资源路径历史数据迁移)。 diff --git a/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/CadWorkspaceController.java b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/CadWorkspaceController.java index 824fad3..be52dde 100644 --- a/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/CadWorkspaceController.java +++ b/vibemake-api/src/main/java/com/linkerbot/vibemake/api/controller/CadWorkspaceController.java @@ -46,7 +46,7 @@ public class CadWorkspaceController { } @PatchMapping("/{cadProjectCode}") - @Operation(summary = "修改 CAD 项目名称和描述") + @Operation(summary = "修改 CAD 项目名称、描述和封面") public ApiResponse update(@PathVariable String cadProjectCode, @Valid @RequestBody CadUpdateProjectInput input) { return ApiResponse.success(projects.update(CurrentUser.required(), cadProjectCode, input)); } diff --git a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CadAiTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CadAiTest.java index 8e2bdb2..d4b93cd 100644 --- a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CadAiTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CadAiTest.java @@ -188,10 +188,10 @@ class CadAiTest { } @Test void validatesProjectOwnerAndDeletionBeforeCallingModel() throws Exception { - String code = projects.create(userId, new CadCreateProjectInput("我的项目", "")).cadProjectCode(); + String code = projects.create(userId, new CadCreateProjectInput("我的项目", "", null)).cadProjectCode(); finish(start(input(code, input().history()))); User other = users.login("cad-other@example.invalid"); - String otherCode = projects.create(other.getId(), new CadCreateProjectInput("别人的项目", "")).cadProjectCode(); + String otherCode = projects.create(other.getId(), new CadCreateProjectInput("别人的项目", "", null)).cadProjectCode(); mvc.perform(postInput(input(otherCode, input().history()))).andExpect(status().isNotFound()); projects.delete(userId, code); mvc.perform(postInput(input(code, input().history()))).andExpect(status().isNotFound()); @@ -217,7 +217,7 @@ class CadAiTest { } @Test void deletedDuringInferenceDoesNotDeliverToolCalls() throws Exception { - String code = projects.create(userId, new CadCreateProjectInput("删除中的项目", "")).cadProjectCode(); + String code = projects.create(userId, new CadCreateProjectInput("删除中的项目", "", null)).cadProjectCode(); model.handler = (input, text, cancellation) -> { projects.delete(userId, code); return new CadAiModelClient.Result(List.of(CadAiHistoryItem.call("call_1", "undo", json.createObjectNode())), null); diff --git a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CadWorkspaceTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CadWorkspaceTest.java index 1432a5d..1a010a4 100644 --- a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CadWorkspaceTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/CadWorkspaceTest.java @@ -219,7 +219,9 @@ class CadWorkspaceTest { assertThat(detail.path("savedAt").asText()).doesNotEndWith("Z"); assertThat(detail.has("documentObjectKey")).isFalse(); assertThat(jdbc.queryForObject("SELECT document_object_key FROM cad_project WHERE cad_project_code=?", - String.class, code)).isEqualTo(second.path("formFields").path("key").asText()); + String.class, code)).isEqualTo("/cad-projects/" + code + "/" + second.path("uploadCode").asText() + "/design.sc"); + assertThat(jdbc.queryForObject("SELECT object_key FROM cad_project_upload WHERE upload_code=?", String.class, + second.path("uploadCode").asText())).isEqualTo("/cad-projects/" + code + "/" + second.path("uploadCode").asText() + "/design.sc"); perform(body(auth(patch(BASE + "/" + code)), Map.of("name", "重命名", "description", "参数化支架")), 200); assertThat(perform(auth(get(BASE + "?keyword=重命")), 200).path("data").path("total").asInt()).isEqualTo(1); @@ -227,6 +229,89 @@ class CadWorkspaceTest { assertThat(store.objects).hasSize(2); } + @Test + void legacyKeysKeepSameOssLocationAndPendingConfirmationStoresRelativeReferences() throws Exception { + String code = create("历史路径兼容"); + JsonNode signature = upload(code, 0, new byte[] {80, 75, 3, 4}); + String uploadCode = signature.path("uploadCode").asText(); + String key = signature.path("formFields").path("key").asText(); + String path = "/cad-projects/" + code + "/" + uploadCode + "/design.sc"; + assertThat(jdbc.queryForObject("SELECT object_key FROM cad_project_upload WHERE upload_code=?", String.class, uploadCode)).isEqualTo(path); + // 模拟升级前签发但尚未确认的批次,OSS 对象仍使用原来的完整 key。 + jdbc.update("UPDATE cad_project_upload SET object_key=? WHERE upload_code=?", key, uploadCode); + confirm(code, signature, 200); + assertThat(jdbc.queryForObject("SELECT object_key FROM cad_project_upload WHERE upload_code=?", String.class, uploadCode)).isEqualTo(path); + assertThat(jdbc.queryForObject("SELECT document_object_key FROM cad_project WHERE cad_project_code=?", String.class, code)).isEqualTo(path); + jdbc.update("UPDATE cad_project SET document_object_key=? WHERE cad_project_code=?", key, code); + JsonNode document = perform(auth(get(BASE + "/" + code + "/document")), 200).path("data"); + assertThat(document.path("downloadUrl").asText()).isEqualTo(oss.publicBaseUrl() + "/" + key); + assertThat(confirm(code, signature, 200).path("data").path("version").asLong()).isEqualTo(1); + JsonNode next = upload(code, 1, new byte[] {80, 75, 3, 4, 5}); + confirm(code, next, 200); + assertThat(jdbc.queryForObject("SELECT document_object_key FROM cad_project WHERE cad_project_code=?", String.class, code)) + .startsWith("/cad-projects/").doesNotContain(oss.getRootDirectory()); + } + + @Test + void cadCoverRoundTripsThroughCreationListingUpdateClearAndDocumentSave() throws Exception { + String path = "/project-covers/" + "a".repeat(12) + "/20261104/" + "b".repeat(32) + ".png"; + String url = oss.publicBaseUrl() + "/" + oss.getRootDirectory() + path; + JsonNode created = perform(body(auth(post(BASE)), Map.of("name", "带封面的 CAD", "description", "参数化设计", "coverUrl", url)), 200).path("data"); + String code = created.path("cadProjectCode").asText(); + assertThat(created.path("coverUrl").asText()).isEqualTo(url); + assertThat(created.path("version").asLong()).isZero(); + assertThat(jdbc.queryForObject("SELECT cover_url FROM cad_project WHERE cad_project_code=?", String.class, code)).isEqualTo(path); + assertThat(perform(auth(get(BASE)), 200).path("data").path("items").get(0).path("coverUrl").asText()).isEqualTo(url); + assertThat(perform(auth(get(BASE + "/" + code)), 200).path("data").path("coverUrl").asText()).isEqualTo(url); + + JsonNode receipt = confirm(code, upload(code, 0, new byte[] {80, 75, 3, 4}), 200).path("data"); + String nextPath = path.replace(".png", ".webp"); + String nextUrl = oss.publicBaseUrl() + "/" + oss.getRootDirectory() + nextPath; + JsonNode changed = perform(body(auth(patch(BASE + "/" + code)), Map.of("coverUrl", nextUrl)), 200).path("data"); + assertThat(changed.path("coverUrl").asText()).isEqualTo(nextUrl); + assertThat(changed.path("name").asText()).isEqualTo("带封面的 CAD"); + assertThat(changed.path("description").asText()).isEqualTo("参数化设计"); + assertThat(changed.path("version").asLong()).isEqualTo(1); + assertThat(changed.path("savedAt")).isEqualTo(receipt.path("savedAt")); + assertThat(jdbc.queryForObject("SELECT cover_url FROM cad_project WHERE cad_project_code=?", String.class, code)).isEqualTo(nextPath); + + JsonNode preserved = perform(body(auth(patch(BASE + "/" + code)), + json.createObjectNode().put("name", "改名").putNull("coverUrl")), 200).path("data"); + assertThat(preserved.path("coverUrl").asText()).isEqualTo(nextUrl); + confirm(code, upload(code, 1, new byte[] {80, 75, 3, 4, 5}), 200); + assertThat(perform(auth(get(BASE + "/" + code)), 200).path("data").path("coverUrl").asText()).isEqualTo(nextUrl); + + String ownerToken = token; + User other = users.login("cad-cover-other@example.invalid"); + token = tokens.issue(other.getId(), other.getSessionVersion()); + perform(body(auth(patch(BASE + "/" + code)), Map.of("coverUrl", "")), 404); + token = ownerToken; + JsonNode cleared = perform(body(auth(patch(BASE + "/" + code)), Map.of("coverUrl", "")), 200).path("data"); + assertThat(cleared.path("coverUrl").isNull()).isTrue(); + assertThat(cleared.path("version").asLong()).isEqualTo(2); + assertThat(jdbc.queryForObject("SELECT cover_url FROM cad_project WHERE cad_project_code=?", String.class, code)).isNull(); + } + + @Test + void optionalAndExternalCoversFollowExistingCoverRules() throws Exception { + String code = create("无封面"); + assertThat(perform(auth(get(BASE + "/" + code)), 200).path("data").path("coverUrl").isNull()).isTrue(); + String external = "https://images.example.com/cad.png"; + JsonNode view = perform(body(auth(patch(BASE + "/" + code)), Map.of("coverUrl", external)), 200).path("data"); + assertThat(view.path("coverUrl").asText()).isEqualTo(external); + assertThat(jdbc.queryForObject("SELECT cover_url FROM cad_project WHERE cad_project_code=?", String.class, code)).isEqualTo(external); + } + + @ParameterizedTest + @ValueSource(strings = {"http://images.example.com/cad.png", "https://user:password@images.example.com/cad.png", + "/project-covers/user/cad.png", "data:image/png;base64,abcd"}) + void invalidCoverAddressesAreRejectedWithoutChangingProject(String invalid) throws Exception { + String code = create("封面验证"); + perform(body(auth(patch(BASE + "/" + code)), Map.of("coverUrl", invalid)), 400); + perform(body(auth(post(BASE)), Map.of("name", "非法封面", "coverUrl", invalid)), 400); + assertThat(jdbc.queryForObject("SELECT cover_url FROM cad_project WHERE cad_project_code=?", String.class, code)).isNull(); + } + @Test void confirmedBatchReplayReturnsOriginalReceiptEvenAfterLaterSaveExpiryAndOssFailure() throws Exception { String code = create("幂等"); @@ -423,6 +508,9 @@ class CadWorkspaceTest { // 避免 CAD 和 Git 项目的同名 DTO 污染彼此的 OpenAPI 模型。 JsonNode schemas = spec.path("components").path("schemas"); assertThat(schemas.path("CadProjectView").path("properties").has("cadProjectCode")).isTrue(); + assertThat(schemas.path("CadProjectView").path("properties").has("coverUrl")).isTrue(); + assertThat(schemas.path("CadCreateProjectInput").path("properties").has("coverUrl")).isTrue(); + assertThat(schemas.path("CadUpdateProjectInput").path("properties").has("coverUrl")).isTrue(); assertThat(schemas.path("CadProjectView").path("properties").has("projectCode")).isFalse(); assertThat(schemas.path("ProjectView").path("properties").has("projectCode")).isTrue(); assertThat(schemas.path("ProjectView").path("properties").has("cadProjectCode")).isFalse(); diff --git a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/ResourcePathMigrationTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/ResourcePathMigrationTest.java index 0a7c7e1..cb1a7ff 100644 --- a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/ResourcePathMigrationTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/ResourcePathMigrationTest.java @@ -7,6 +7,7 @@ import com.linkerbot.vibemake.service.oss.OssResourcePaths; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.junit.jupiter.api.AfterEach; @@ -102,7 +103,7 @@ class ResourcePathMigrationTest { } private void insert(String code, String cover, String main, String prefix) { - jdbc.update("INSERT INTO project VALUES (?, ?, ?, ?)", code, cover, main, prefix); + jdbc.update("INSERT INTO project(project_code,cover_url,urdf_main_object_key,urdf_prefix) VALUES (?, ?, ?, ?)", code, cover, main, prefix); } @Test @@ -120,6 +121,54 @@ class ResourcePathMigrationTest { assertThat(row(CODE).get("URDF_PREFIX")).isEqualTo(PREFIX); } + @Test + void allOssBindingsMigrateIdempotentlyWithoutMovingObjectsOrChangingVersions() throws Exception { + List resourceColumns = List.of("step_object_key", "model_glb_object_key", "model_parts_prefix", + "assembly_json_object_key", "walking_resources_prefix"); + for (String column : resourceColumns) + jdbc.execute("ALTER TABLE project ADD " + column + " VARCHAR(512) DEFAULT '' NOT NULL"); + jdbc.execute("CREATE TABLE cad_project (cad_project_code VARCHAR(32) PRIMARY KEY, document_object_key VARCHAR(512)," + + " version BIGINT DEFAULT 3, updated_at TIMESTAMP DEFAULT '2026-10-01 12:34:56.789')"); + jdbc.execute("CREATE TABLE cad_project_upload (upload_code VARCHAR(32) PRIMARY KEY, object_key VARCHAR(512)," + + " saved_version BIGINT DEFAULT 3)"); + insert(CODE, COVER, ROOT + MAIN, ROOT + PREFIX); + insert("other", "https://external.example.com/a.png", "vibemake" + MAIN, "vibemake" + PREFIX); + insert("empty", null, "", ""); + for (String column : resourceColumns) { + String path = "/project-resources/" + CODE + "/" + column + "/"; + jdbc.update("UPDATE project SET " + column + "=? WHERE project_code=?", ROOT + path, CODE); + jdbc.update("UPDATE project SET " + column + "=? WHERE project_code=?", "vibemake" + path, "other"); + } + String cadPath = "/cad-projects/" + CODE + "/" + "a".repeat(32) + "/design.sc"; + for (String prefix : List.of(ROOT, "vibemake", "VIBEMAKE_DEV", "vibemake_dev-extra", "")) { + jdbc.update("INSERT INTO cad_project(cad_project_code,document_object_key) VALUES (?,?)", "cad-" + prefix, prefix + cadPath); + jdbc.update("INSERT INTO cad_project_upload(upload_code,object_key) VALUES (?,?)", "upload-" + prefix, prefix + cadPath); + } + Map unchanged = row("other"); + Map empty = row("empty"); + Map cadBefore = jdbc.queryForMap("SELECT * FROM cad_project WHERE cad_project_code=?", "cad-" + ROOT); + String publicUrl = paths.publicUrl(ROOT + cadPath); + document = Files.readString(Path.of("../docs/oss-storage-paths.md")); + execute("all-bindings-migrate"); + assertThat(row(CODE)).containsEntry("URDF_MAIN_OBJECT_KEY", MAIN).containsEntry("URDF_PREFIX", PREFIX).containsEntry("COVER_URL", COVER); + for (String column : resourceColumns) + assertThat(row(CODE).get(column.toUpperCase())).isEqualTo("/project-resources/" + CODE + "/" + column + "/"); + assertThat(row("other")).isEqualTo(unchanged); + assertThat(row("empty")).isEqualTo(empty); + Map cadAfter = jdbc.queryForMap("SELECT * FROM cad_project WHERE cad_project_code=?", "cad-" + ROOT); + assertThat(cadAfter.get("DOCUMENT_OBJECT_KEY")).isEqualTo(cadPath); + assertThat(cadAfter.get("VERSION")).isEqualTo(cadBefore.get("VERSION")); + assertThat(cadAfter.get("UPDATED_AT")).isEqualTo(cadBefore.get("UPDATED_AT")); + assertThat(paths.publicUrl(cadAfter.get("DOCUMENT_OBJECT_KEY").toString())).isEqualTo(publicUrl); + assertThat(jdbc.queryForObject("SELECT object_key FROM cad_project_upload WHERE upload_code=?", String.class, "upload-" + ROOT)).isEqualTo(cadPath); + for (String prefix : List.of("vibemake", "VIBEMAKE_DEV", "vibemake_dev-extra", "")) { + assertThat(jdbc.queryForObject("SELECT document_object_key FROM cad_project WHERE cad_project_code=?", String.class, "cad-" + prefix)).isEqualTo(prefix + cadPath); + assertThat(jdbc.queryForObject("SELECT object_key FROM cad_project_upload WHERE upload_code=?", String.class, "upload-" + prefix)).isEqualTo(prefix + cadPath); + } + execute("all-bindings-migrate"); + assertThat(jdbc.queryForMap("SELECT * FROM cad_project WHERE cad_project_code=?", "cad-" + ROOT)).isEqualTo(cadAfter); + } + private Map row(String code) { return jdbc.queryForMap("SELECT * FROM project WHERE project_code = ?", code); } @@ -133,6 +182,7 @@ class ResourcePathMigrationTest { .replace("DROP TEMPORARY TABLE", "DROP TABLE") .replace("START TRANSACTION", "SET AUTOCOMMIT FALSE") .replace("SET NAMES utf8mb4", "") + .replace("BINARY ", "") .replace("<=>", "IS NOT DISTINCT FROM") .replace("[[:cntrl:]:]", "[\\p{Cntrl}:]"); for (String statement : sql.split(";")) { diff --git a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/WorkflowTest.java b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/WorkflowTest.java index 27b594c..a138737 100644 --- a/vibemake-api/src/test/java/com/linkerbot/vibemake/api/WorkflowTest.java +++ b/vibemake-api/src/test/java/com/linkerbot/vibemake/api/WorkflowTest.java @@ -19,6 +19,7 @@ import com.linkerbot.vibemake.service.config.UrdfProperties; import org.junit.jupiter.api.*; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.junit.jupiter.params.provider.CsvSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrint; @@ -1045,8 +1046,8 @@ class WorkflowTest { } @ParameterizedTest - @ValueSource(booleans = {false, true}) - void newProjectResourcesAreReturnedInDetailsAndForkedWithoutAnyOssAccess(boolean ossEnabled) throws Exception { + @CsvSource({"false,false", "true,false", "false,true", "true,true"}) + void newProjectResourcesAreReturnedInDetailsAndForkedWithoutAnyOssAccess(boolean ossEnabled, boolean legacy) throws Exception { String owner = login("resource-source@example.com"); String other = login("resource-fork@example.com"); String code = create(owner, "资源来源"); @@ -1077,6 +1078,11 @@ class WorkflowTest { assertThat(source.path("stepSizeBytes").asLong()).isEqualTo(524288000L); String sha = head(owner, code); publish(owner, code, sha); + if (legacy) { + for (String column : List.of("step_object_key", "model_glb_object_key", "model_parts_prefix", + "assembly_json_object_key", "walking_resources_prefix")) + jdbc.update("UPDATE project SET " + column + "=CONCAT(?, " + column + ") WHERE project_code=?", oss.getRootDirectory(), code); + } JsonNode publicDetail = perform(get("/api/community/projects/" + code), 200).path("data"); assertThat(publicDetail.path("modelPartsFiles")).isEqualTo(source.path("modelPartsFiles")); assertThat(publicDetail.path("assemblyJsonUrl")).isEqualTo(source.path("assemblyJsonUrl")); @@ -1099,8 +1105,9 @@ class WorkflowTest { for (String column : List.of("model_glb_object_key", "model_glb_size_bytes", "model_parts_prefix", "model_parts_files", "assembly_json_object_key", "assembly_json_size_bytes", "walking_resources_prefix", "walking_resources_files", "step_object_key", "step_file_name", "step_size_bytes")) { - assertThat(jdbc.queryForObject("SELECT " + column + " FROM project WHERE project_code=?", String.class, target)) - .isEqualTo(jdbc.queryForObject("SELECT " + column + " FROM project WHERE project_code=?", String.class, code)); + String expected = jdbc.queryForObject("SELECT " + column + " FROM project WHERE project_code=?", String.class, code); + if (expected.startsWith(oss.getRootDirectory() + "/")) expected = expected.substring(oss.getRootDirectory().length()); + assertThat(jdbc.queryForObject("SELECT " + column + " FROM project WHERE project_code=?", String.class, target)).isEqualTo(expected); } // 模拟来源资源被管理员替换,副本仍持有原批次。 jdbc.update("UPDATE project SET model_glb_object_key=? WHERE project_code=?", glb.replace(batch, "b".repeat(32)), code); diff --git a/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/CadContracts.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/CadContracts.java index b007fef..9a95814 100644 --- a/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/CadContracts.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/CadContracts.java @@ -15,11 +15,13 @@ public final class CadContracts { public record CadCreateProjectInput( @NotBlank @Size(max = 100) String name, - @Size(max = 2000) String description) {} + @Size(max = 2000) String description, + @Size(max = 2048) String coverUrl) {} public record CadUpdateProjectInput( @Size(min = 1, max = 100) String name, - @Size(max = 2000) String description) {} + @Size(max = 2000) String description, + @Size(max = 2048) String coverUrl) {} public record CadUploadInput( @NotBlank @Size(max = 255) String fileName, @@ -29,7 +31,7 @@ public final class CadContracts { public record CadConfirmInput(@NotBlank @Size(max = 32) String uploadCode) {} public record CadProjectView( - String cadProjectCode, String name, String description, boolean hasDocument, + String cadProjectCode, String name, String description, String coverUrl, boolean hasDocument, long version, String fileName, long sizeBytes, LocalDateTime savedAt, LocalDateTime createdAt, LocalDateTime updatedAt) {} diff --git a/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/CadProject.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/CadProject.java index c9c7927..eea19c3 100644 --- a/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/CadProject.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/CadProject.java @@ -13,6 +13,9 @@ public class CadProject extends BaseEntity { private Long ownerUserId; private String name; private String description; + /** 平台 OSS 封面保存无环境前缀的相对路径,对外返回完整 URL。 */ + private String coverUrl; + /** 环境相对路径,以 /cad-projects/ 开头;访问 OSS 时再补当前环境根目录。 */ private String documentObjectKey; private String fileName; private Long sizeBytes; diff --git a/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/CadProjectUpload.java b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/CadProjectUpload.java index 4b31123..3791b33 100644 --- a/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/CadProjectUpload.java +++ b/vibemake-bean/src/main/java/com/linkerbot/vibemake/bean/entity/CadProjectUpload.java @@ -12,6 +12,7 @@ public class CadProjectUpload extends BaseEntity { private String uploadCode; private Long cadProjectId; private Long expectedVersion; + /** 环境相对路径,不保存 Bucket、域名或环境根目录。 */ private String objectKey; private String fileName; private Long sizeBytes; diff --git a/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportCoordinator.java b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportCoordinator.java index fdc1772..b442c05 100644 --- a/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportCoordinator.java +++ b/vibemake-import/src/main/java/com/linkerbot/vibemake/importer/ImportCoordinator.java @@ -283,6 +283,7 @@ public final class ImportCoordinator { project.setGiteaRepoId(remote.id()); project.setRepoStatus("READY"); project.setUpdatedAt(ProjectSupport.now()); + resourcePaths.normalizeProjectReferences(project); if (projects.updateById(project) != 1) throw new ImportFailure("DATABASE_UPDATE_FAILED", "项目仓库关联写入失败"); store.phase(entry, Phase.LINKED); @@ -345,6 +346,7 @@ public final class ImportCoordinator { project.setRepoStatus(review ? "CREATING" : "FAILED"); project.setUpdatedAt(ProjectSupport.now()); try { + resourcePaths.normalizeProjectReferences(project); projects.updateById(project); } catch (RuntimeException databaseFailure) { log.error( diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/cad/CadObjectStore.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/cad/CadObjectStore.java index 0977bce..47a0af0 100644 --- a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/cad/CadObjectStore.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/cad/CadObjectStore.java @@ -4,7 +4,7 @@ import java.time.Duration; import java.time.LocalDateTime; import java.util.Map; -/** CAD 沿用现有 OSS 上传与资源 URL 规则,文件权限由 Bucket/CDN 配置决定。 */ +/** 入参为包含环境根目录的真实 OSS key;数据库引用由业务层通过 OssResourcePaths 转换。权限由 Bucket/CDN 决定。 */ public interface CadObjectStore { record SignedUpload(String uploadUrl, Map formFields, LocalDateTime expiresAt) {} diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/cad/CadProjectService.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/cad/CadProjectService.java index d0329b6..a28b553 100644 --- a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/cad/CadProjectService.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/cad/CadProjectService.java @@ -11,7 +11,7 @@ import com.linkerbot.vibemake.bean.entity.CadProject; import com.linkerbot.vibemake.bean.entity.CadProjectUpload; import com.linkerbot.vibemake.common.*; import com.linkerbot.vibemake.service.config.CadProperties; -import com.linkerbot.vibemake.service.config.OssProperties; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; import com.linkerbot.vibemake.service.mapper.CadProjectMapper; import com.linkerbot.vibemake.service.mapper.CadProjectUploadMapper; import com.linkerbot.vibemake.service.state.RateLimits; @@ -32,7 +32,7 @@ public class CadProjectService { private final CadProjectMapper projects; private final CadProjectUploadMapper uploads; private final CadProperties properties; - private final OssProperties oss; + private final OssResourcePaths paths; private final CadObjectStore storage; private final TransactionTemplate transactions; private final RateLimits limits; @@ -54,6 +54,7 @@ public class CadProjectService { project.setOwnerUserId(userId); project.setName(name(input.name())); project.setDescription(input.description() == null ? "" : input.description().trim()); + project.setCoverUrl(paths.coverStorage(input.coverUrl())); project.setDocumentObjectKey(""); project.setFileName(""); project.setSizeBytes(0L); @@ -79,18 +80,21 @@ public class CadProjectService { } public CadProjectView update(long userId, String code, CadUpdateProjectInput input) { - if (input.name() == null && input.description() == null) throw BusinessException.badRequest("请提供名称或描述"); + if (input.name() == null && input.description() == null && input.coverUrl() == null) + throw BusinessException.badRequest("请提供名称、描述或封面"); CadProjectView result = transactions.execute(status -> { CadProject project = lockedOwner(userId, code); if (input.name() != null) project.setName(name(input.name())); if (input.description() != null) project.setDescription(input.description().trim()); + if (input.coverUrl() != null) project.setCoverUrl(paths.coverStorage(input.coverUrl())); project.setUpdatedAt(now()); projects.update(null, new LambdaUpdateWrapper().eq(CadProject::getId, project.getId()) .set(CadProject::getName, project.getName()).set(CadProject::getDescription, project.getDescription()) + .set(input.coverUrl() != null, CadProject::getCoverUrl, project.getCoverUrl()) .set(CadProject::getUpdatedAt, project.getUpdatedAt())); return view(project); }); - log.info("修改 CAD 项目信息 cadProjectCode={}", code); + log.info("修改 CAD 项目信息 cadProjectCode={} coverChanged={}", code, input.coverUrl() != null); return result; } @@ -109,8 +113,8 @@ public class CadProjectService { checkFile(input); checkVersion(project, input.expectedVersion()); String uploadCode = Codes.next(); - String key = oss.getRootDirectory() + "/cad-projects/" + code + "/" + uploadCode + "/design.sc"; - CadObjectStore.SignedUpload signature = storage.signUpload(key, input.fileName(), input.sizeBytes(), properties.getUploadValidity()); + String path = "/cad-projects/" + code + "/" + uploadCode + "/design.sc"; + CadObjectStore.SignedUpload signature = storage.signUpload(paths.objectKey(path), input.fileName(), input.sizeBytes(), properties.getUploadValidity()); transactions.executeWithoutResult(status -> { CadProject current = lockedOwner(userId, code); checkVersion(current, input.expectedVersion()); @@ -118,7 +122,7 @@ public class CadProjectService { upload.setUploadCode(uploadCode); upload.setCadProjectId(current.getId()); upload.setExpectedVersion(input.expectedVersion()); - upload.setObjectKey(key); + upload.setObjectKey(path); upload.setFileName(input.fileName()); upload.setSizeBytes(input.sizeBytes()); upload.setExpiresAt(signature.expiresAt()); @@ -141,7 +145,7 @@ public class CadProjectService { if (upload.getSavedVersion() == null) { checkExpiry(upload); checkVersion(project, upload.getExpectedVersion()); - if (storage.size(upload.getObjectKey()) != upload.getSizeBytes()) { + if (storage.size(paths.objectKey(upload.getObjectKey())) != upload.getSizeBytes()) { log.warn("CAD 文件大小不符 cadProjectCode={} uploadCode={} expectedBytes={}", code, uploadCode, upload.getSizeBytes()); throw new BusinessException(409, "CAD_FILE_SIZE_MISMATCH", "设计文件大小不符,请重新上传"); } @@ -156,14 +160,16 @@ public class CadProjectService { long version = Math.addExact(current.getVersion(), 1L); // 与 DATETIME(3) 一致,保证首次回执和数据库重放回执完全相同。 LocalDateTime savedAt = now().truncatedTo(ChronoUnit.MILLIS); + String path = paths.storagePath(pending.getObjectKey()); int changed = projects.update(null, new LambdaUpdateWrapper() .eq(CadProject::getId, current.getId()).eq(CadProject::getDeleted, false) .eq(CadProject::getVersion, pending.getExpectedVersion()) - .set(CadProject::getDocumentObjectKey, pending.getObjectKey()) + .set(CadProject::getDocumentObjectKey, path) .set(CadProject::getFileName, pending.getFileName()).set(CadProject::getSizeBytes, pending.getSizeBytes()) .set(CadProject::getVersion, version).set(CadProject::getSavedAt, savedAt).set(CadProject::getUpdatedAt, savedAt)); if (changed != 1) throw new BusinessException(409, "CAD_VERSION_CONFLICT", "项目已发生变化,请刷新后重试"); pending.setSavedVersion(version); + pending.setObjectKey(path); pending.setSavedAt(savedAt); pending.setUpdatedAt(savedAt); if (uploads.updateById(pending) != 1) throw new IllegalStateException("CAD 上传批次确认失败"); @@ -177,7 +183,7 @@ public class CadProjectService { CadProject project = owner(userId, code); limits.operation("cad-read", userId); if (project.getVersion() == 0) throw new BusinessException(404, "CAD_DOCUMENT_NOT_FOUND", "项目尚未保存设计文件"); - String downloadUrl = storage.documentUrl(project.getDocumentObjectKey()); + String downloadUrl = storage.documentUrl(paths.objectKey(project.getDocumentObjectKey())); log.info("读取 CAD 文件地址 cadProjectCode={} version={}", code, project.getVersion()); return new CadDocumentView(downloadUrl, null, project.getVersion(), project.getFileName(), project.getSizeBytes()); } @@ -196,7 +202,7 @@ public class CadProjectService { } private CadProjectView view(CadProject project) { - return new CadProjectView(project.getCadProjectCode(), project.getName(), project.getDescription(), project.getVersion() > 0, + return new CadProjectView(project.getCadProjectCode(), project.getName(), project.getDescription(), paths.coverUrl(project.getCoverUrl()), project.getVersion() > 0, project.getVersion(), project.getFileName(), project.getSizeBytes(), project.getSavedAt(), project.getCreatedAt(), project.getUpdatedAt()); } diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/ProjectServiceImpl.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/ProjectServiceImpl.java index 8969f9c..193d1a9 100644 --- a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/ProjectServiceImpl.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/impl/ProjectServiceImpl.java @@ -321,6 +321,7 @@ public class ProjectServiceImpl implements ProjectService { project.setWalkingResourcesPrefix(source.getWalkingResourcesPrefix()); project.setWalkingResourcesFiles(source.getWalkingResourcesFiles()); } + resourcePaths.normalizeProjectReferences(project); for (int attempt = 1; attempt <= 5; attempt++) { try { if (deadline != null) { @@ -428,7 +429,7 @@ public class ProjectServiceImpl implements ProjectService { } project.setGiteaRepoId(repo.id()); // 先保存仓库关联,再执行 Git/LFS 推送,便于中断后按项目编码核对。 - if (projects.updateById(project) != 1) throw new IllegalStateException("Fork 仓库关联回写失败"); + if (persistProject(project) != 1) throw new IllegalStateException("Fork 仓库关联回写失败"); deadline.confirmWrite(); deadline.check(); String commit = snapshot.push(repo); @@ -438,7 +439,7 @@ public class ProjectServiceImpl implements ProjectService { deadline.check(); project.setRepoStatus("READY"); project.setUpdatedAt(now()); - if (projects.updateById(project) != 1) throw new IllegalStateException("Fork 完成状态回写失败"); + if (persistProject(project) != 1) throw new IllegalStateException("Fork 完成状态回写失败"); log.info( "Fork 完成 projectCode={} sourceProjectCode={} sourceCommitSha={}" + " snapshotCommitSha={} durationMs={}", @@ -473,7 +474,7 @@ public class ProjectServiceImpl implements ProjectService { project.setRepoStatus(uncertain ? "CREATING" : "FAILED"); project.setUpdatedAt(now()); if (uncertain) locks.markUncertain(project.getProjectCode()); - if (projects.updateById(project) != 1) + if (persistProject(project) != 1) throw new IllegalStateException("Fork 失败状态回写失败"); } catch (RuntimeException persistence) { locks.markUncertain(project.getProjectCode()); @@ -503,19 +504,24 @@ public class ProjectServiceImpl implements ProjectService { } } + private int persistProject(Project project) { + resourcePaths.normalizeProjectReferences(project); + return projects.updateById(project); + } + private ProjectView createRemote(Project project) { try { GiteaClient.Repository repo = gitea.createRepository(project.getGiteaRepoName(), true); project.setGiteaRepoId(repo.id()); project.setRepoStatus("READY"); project.setUpdatedAt(now()); - projects.updateById(project); + persistProject(project); log.info("仓库创建完成 projectCode={} fork={}", project.getProjectCode(), false); return view(project, project.getOwnerUserId()); } catch (GiteaFailure error) { project.setRepoStatus(error.uncertain() ? "CREATING" : "FAILED"); project.setUpdatedAt(now()); - projects.updateById(project); + persistProject(project); if (error.uncertain()) locks.markUncertain(project.getProjectCode()); log.warn( "仓库创建异常 projectCode={} code={} uncertain={}", @@ -530,7 +536,7 @@ public class ProjectServiceImpl implements ProjectService { } catch (BusinessException error) { project.setRepoStatus("FAILED"); project.setUpdatedAt(now()); - projects.updateById(project); + persistProject(project); log.warn("项目初始化拒绝 projectCode={} code={}", project.getProjectCode(), error.code()); throw new BusinessException( error.status(), @@ -636,7 +642,7 @@ public class ProjectServiceImpl implements ProjectService { project.setDeleted(true); project.setPublishStatus("UNPUBLISHED"); project.setUpdatedAt(now()); - projects.updateById(project); + persistProject(project); log.info("删除项目 projectCode={}", code); return null; }); @@ -658,7 +664,7 @@ public class ProjectServiceImpl implements ProjectService { project.setPublishStatus("PUBLISHED"); if (project.getPublishedAt() == null) project.setPublishedAt(now()); project.setUpdatedAt(now()); - projects.updateById(project); + persistProject(project); log.info("发布社区 projectCode={} commitSha={}", code, head); return view(project, userId); }); @@ -674,7 +680,7 @@ public class ProjectServiceImpl implements ProjectService { if (!"BLOCKED".equals(project.getPublishStatus())) project.setPublishStatus("UNPUBLISHED"); project.setUpdatedAt(now()); - projects.updateById(project); + persistProject(project); log.info("撤回社区 projectCode={}", code); return null; }); diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssResourcePaths.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssResourcePaths.java index 7a6737e..0000926 100644 --- a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssResourcePaths.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/oss/OssResourcePaths.java @@ -2,6 +2,7 @@ package com.linkerbot.vibemake.service.oss; import com.linkerbot.vibemake.common.BusinessException; import com.linkerbot.vibemake.common.FilePaths; +import com.linkerbot.vibemake.bean.entity.Project; import com.linkerbot.vibemake.service.config.OssProperties; import com.linkerbot.vibemake.service.support.ProjectInputs; import java.net.URI; @@ -18,7 +19,7 @@ import org.springframework.web.util.UriUtils; public class OssResourcePaths { private final OssProperties oss; - /** 外部请求仍只接受 HTTPS URL;仅转换明确属于当前环境的托管封面。 */ + /** 外部请求仍只接受 HTTPS URL;托管图片可以来自封面、README 或项目资源目录。 */ public String coverStorage(String value) { String url = ProjectInputs.coverUrl(value); if (url == null) return null; @@ -28,7 +29,7 @@ public class OssResourcePaths { URI base = URI.create(baseValue); if (!sameOrigin(candidate, base)) continue; String prefix = base.getRawPath().replaceAll("/+$", "") - + "/" + oss.getRootDirectory() + "/project-covers/"; + + "/" + oss.getRootDirectory() + "/"; if (!candidate.getRawPath().startsWith(prefix)) continue; try { String[] segments = candidate.getRawPath().substring(prefix.length()).split("/", -1); @@ -37,7 +38,7 @@ public class OssResourcePaths { // 保留含歧义分隔符或 UTF-8 替换字符的原地址,避免引用到不同对象。 if (segments[index].contains("/") || segments[index].indexOf('\uFFFD') >= 0) return url; } - return storagePath("/project-covers/" + String.join("/", segments)); + return storagePath("/" + String.join("/", segments)); } catch (IllegalArgumentException | BusinessException error) { // 非规范地址保留原语义,不进行路径折叠或二次解码。 return url; @@ -48,13 +49,14 @@ public class OssResourcePaths { /** 内部 Fork 可以复用已持久化的路径,不走客户端 URL 校验。 */ public String coverReference(String value) { - if (value != null && value.startsWith("/project-covers/")) return storagePath(value); + if (value != null && (value.startsWith("/") || value.startsWith(oss.getRootDirectory() + "/"))) + return storagePath(value); return coverStorage(value); } public String coverUrl(String value) { String reference = coverReference(value); - return reference != null && reference.startsWith("/project-covers/") + return reference != null && reference.startsWith("/") ? publicUrl(reference) : reference; } @@ -87,6 +89,23 @@ public class OssResourcePaths { return root + path; } + /** 空绑定保持不变;非空绑定落库前统一去掉当前环境根目录。 */ + public String storageReference(String value) { + return value == null || value.isEmpty() ? value : storagePath(value); + } + + /** 全量保存或 Fork 不能把历史完整 key 再次写回数据库。文件清单只含包内相对路径,无需转换。 */ + public void normalizeProjectReferences(Project project) { + project.setCoverUrl(coverReference(project.getCoverUrl())); + project.setUrdfMainObjectKey(storageReference(project.getUrdfMainObjectKey())); + project.setUrdfPrefix(storageReference(project.getUrdfPrefix())); + project.setStepObjectKey(storageReference(project.getStepObjectKey())); + project.setModelGlbObjectKey(storageReference(project.getModelGlbObjectKey())); + project.setModelPartsPrefix(storageReference(project.getModelPartsPrefix())); + project.setAssemblyJsonObjectKey(storageReference(project.getAssemblyJsonObjectKey())); + project.setWalkingResourcesPrefix(storageReference(project.getWalkingResourcesPrefix())); + } + public String publicUrl(String value) { if (value == null || value.isEmpty()) return null; String[] segments = objectKey(value).split("/", -1); diff --git a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/write/RepositoryWrites.java b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/write/RepositoryWrites.java index c0d58f1..8c741e8 100644 --- a/vibemake-service/src/main/java/com/linkerbot/vibemake/service/write/RepositoryWrites.java +++ b/vibemake-service/src/main/java/com/linkerbot/vibemake/service/write/RepositoryWrites.java @@ -11,6 +11,7 @@ import com.linkerbot.vibemake.service.git.GitIo; import com.linkerbot.vibemake.service.gitea.*; import com.linkerbot.vibemake.service.mapper.ProjectMapper; import com.linkerbot.vibemake.service.mapper.RepositoryWriteOperationMapper; +import com.linkerbot.vibemake.service.oss.OssResourcePaths; import com.linkerbot.vibemake.service.support.ProjectActors; import com.linkerbot.vibemake.service.support.ProjectLocks; import com.linkerbot.vibemake.service.support.ProjectSupport; @@ -39,6 +40,7 @@ public class RepositoryWrites { private final ProjectLocks locks; private final GiteaClient gitea; private final TransactionTemplate transactions; + private final OssResourcePaths resourcePaths; public record Request(String code, String digest) {} @@ -271,6 +273,7 @@ public class RepositoryWrites { transaction -> { operations.insert(operation); project.setRepoWriteStatus("WRITING"); + resourcePaths.normalizeProjectReferences(project); if (projectMapper.updateById(project) != 1) throw new IllegalStateException("项目写保护保存失败"); }), diff --git a/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssResourcePathsTest.java b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssResourcePathsTest.java index 009dd46..0ec303f 100644 --- a/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssResourcePathsTest.java +++ b/vibemake-service/src/test/java/com/linkerbot/vibemake/service/oss/OssResourcePathsTest.java @@ -3,6 +3,7 @@ package com.linkerbot.vibemake.service.oss; import static org.assertj.core.api.Assertions.*; import com.linkerbot.vibemake.common.BusinessException; +import com.linkerbot.vibemake.bean.entity.Project; import com.linkerbot.vibemake.service.config.OssProperties; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -35,6 +36,15 @@ class OssResourcePathsTest { assertThat(paths.coverUrl(COVER)).isEqualTo(paths.coverUrl(original)); } + @ParameterizedTest + @ValueSource(strings = {"/readme-images/project/图片 #.png", "/project-resources/project/parts/batch/image.png", "/urdf/project/batch/texture.png"}) + void hostedImagesFromEveryManagedDirectoryAlsoUseEnvironmentRelativeStorage(String path) { + String url = paths.publicUrl(path); + assertThat(paths.coverStorage(url)).isEqualTo(path); + assertThat(paths.coverReference(path)).isEqualTo(path); + assertThat(paths.coverUrl(path)).isEqualTo(url); + } + @ParameterizedTest @ValueSource(strings = {"https://external.example.com/vibemake_dev", "https://cdn.example.com/assets/vibemake", "https://cdn.example.com.evil/assets/vibemake_dev", "https://cdn.example.com:444/assets/vibemake_dev", @@ -86,4 +96,32 @@ class OssResourcePathsTest { assertThatThrownBy(() -> paths.coverStorage(COVER)).isInstanceOf(BusinessException.class); assertThatThrownBy(() -> paths.objectKey("/urdf/../other/a.urdf")).isInstanceOf(BusinessException.class); } + + @Test + void normalizesEveryProjectBindingBeforeFullSaveWithoutChangingObjectLocations() { + Project project = new Project(); + project.setCoverUrl("https://cdn.example.com/assets/vibemake_dev" + COVER); + project.setUrdfPrefix("vibemake_dev/urdf/project/batch/"); + project.setUrdfMainObjectKey("vibemake_dev/urdf/project/batch/main.urdf"); + project.setStepObjectKey("vibemake_dev/project-resources/project/step/batch/model.step"); + project.setModelGlbObjectKey("vibemake_dev/project-resources/project/model-glb/batch/model.glb"); + project.setModelPartsPrefix("vibemake_dev/project-resources/project/model-parts/batch/"); + project.setAssemblyJsonObjectKey("vibemake_dev/project-resources/project/assembly-json/batch/steps.json"); + project.setWalkingResourcesPrefix("vibemake_dev/project-resources/project/walking-resources/batch/"); + String original = paths.publicUrl(project.getStepObjectKey()); + paths.normalizeProjectReferences(project); + assertThat(project.getCoverUrl()).isEqualTo(COVER); + assertThat(project.getUrdfMainObjectKey()).isEqualTo("/urdf/project/batch/main.urdf"); + assertThat(project.getUrdfPrefix()).isEqualTo("/urdf/project/batch/"); + assertThat(project.getStepObjectKey()).isEqualTo("/project-resources/project/step/batch/model.step"); + assertThat(project.getModelGlbObjectKey()).isEqualTo("/project-resources/project/model-glb/batch/model.glb"); + assertThat(project.getModelPartsPrefix()).isEqualTo("/project-resources/project/model-parts/batch/"); + assertThat(project.getAssemblyJsonObjectKey()).isEqualTo("/project-resources/project/assembly-json/batch/steps.json"); + assertThat(project.getWalkingResourcesPrefix()).isEqualTo("/project-resources/project/walking-resources/batch/"); + assertThat(paths.publicUrl(project.getStepObjectKey())).isEqualTo(original); + paths.normalizeProjectReferences(project); + assertThat(paths.publicUrl(project.getStepObjectKey())).isEqualTo(original); + assertThat(paths.storageReference(null)).isNull(); + assertThat(paths.storageReference("")).isEmpty(); + } }