已按原有 OSS 规则统一:
- 上传继承 Bucket 权限,不再强制 private。 - 读取使用共用的 OSS/CDN 普通地址,不再生成临时下载签名,expiresAt=null。 - 保留项目归属、版本冲突和幂等保存校验。
This commit is contained in:
+2
-2
@@ -59,7 +59,7 @@ public class CadWorkspaceController {
|
||||
}
|
||||
|
||||
@PostMapping("/{cadProjectCode}/uploads/signature")
|
||||
@Operation(summary = "申请 CAD 原生设计文件私有 OSS 直传签名")
|
||||
@Operation(summary = "申请 CAD 原生设计文件 OSS 直传签名")
|
||||
public ApiResponse<CadUploadSignature> sign(@PathVariable String cadProjectCode, @Valid @RequestBody CadUploadInput input) {
|
||||
return ApiResponse.success(projects.sign(CurrentUser.required(), cadProjectCode, input));
|
||||
}
|
||||
@@ -71,7 +71,7 @@ public class CadWorkspaceController {
|
||||
}
|
||||
|
||||
@GetMapping("/{cadProjectCode}/document")
|
||||
@Operation(summary = "获取 CAD 当前设计的短期授权下载地址")
|
||||
@Operation(summary = "获取 CAD 当前设计的 OSS/CDN 文件地址")
|
||||
public ApiResponse<CadDocumentView> document(@PathVariable String cadProjectCode) {
|
||||
return ApiResponse.success(projects.document(CurrentUser.required(), cadProjectCode));
|
||||
}
|
||||
|
||||
@@ -86,7 +86,6 @@ vibemake:
|
||||
cad:
|
||||
max-file-bytes: ${CAD_MAX_FILE_BYTES:268435456}
|
||||
upload-validity: ${CAD_UPLOAD_VALIDITY:15m}
|
||||
download-validity: ${CAD_DOWNLOAD_VALIDITY:5m}
|
||||
oss:
|
||||
enabled: ${CAD_OSS_ENABLED:true}
|
||||
ai:
|
||||
|
||||
@@ -16,6 +16,7 @@ import com.linkerbot.vibemake.service.cad.CadProjectService;
|
||||
import com.linkerbot.vibemake.service.config.CadProperties;
|
||||
import com.linkerbot.vibemake.service.config.OssProperties;
|
||||
import com.linkerbot.vibemake.service.oss.OssPostSigner;
|
||||
import com.linkerbot.vibemake.service.oss.OssResourcePaths;
|
||||
import com.linkerbot.vibemake.service.support.ProjectSupport;
|
||||
import java.time.Duration;
|
||||
import java.util.List;
|
||||
@@ -41,6 +42,7 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
|
||||
"vibemake.repository-write.worker-enabled=false", "vibemake.oss.enabled=false",
|
||||
"vibemake.cad.oss.enabled=true", "vibemake.oss.bucket=shared-oss-tests",
|
||||
"vibemake.oss.access-key-id=TestCadKey", "vibemake.oss.access-key-secret=test-secret",
|
||||
"vibemake.oss.public-base-url=https://cad-cdn.example.com/resources",
|
||||
"vibemake.ai.enabled=false", "vibemake.git.enabled=false", "logging.level.org.springframework=WARN"
|
||||
})
|
||||
@ActiveProfiles("test")
|
||||
@@ -75,13 +77,12 @@ class CadWorkspaceTest {
|
||||
|
||||
private void available() {
|
||||
if (!properties.getOss().isEnabled()) throw new BusinessException(503, "CAD_STORAGE_UNAVAILABLE", "关闭");
|
||||
if (unavailable) throw new BusinessException(502, "CAD_OSS_ERROR", "不可用");
|
||||
}
|
||||
|
||||
@Override
|
||||
public SignedUpload signUpload(String key, String name, long size, Duration validity) {
|
||||
available();
|
||||
OssPostSigner.SignedPost post = signer.signPrivateObject(key, "application/octet-stream", size, validity, null);
|
||||
OssPostSigner.SignedPost post = signer.signObject(key, "application/octet-stream", size, validity, null);
|
||||
if (afterSign != null) {
|
||||
Runnable action = afterSign;
|
||||
afterSign = null;
|
||||
@@ -93,6 +94,7 @@ class CadWorkspaceTest {
|
||||
@Override
|
||||
public long size(String key) {
|
||||
available();
|
||||
if (unavailable) throw new BusinessException(502, "CAD_OSS_ERROR", "不可用");
|
||||
byte[] bytes = objects.get(key);
|
||||
if (bytes == null) throw new BusinessException(409, "CAD_FILE_MISSING", "缺文件");
|
||||
if (sizeBarrier != null) {
|
||||
@@ -111,10 +113,9 @@ class CadWorkspaceTest {
|
||||
}
|
||||
|
||||
@Override
|
||||
public SignedDownload signDownload(String key, String name, Duration validity) {
|
||||
public String documentUrl(String key) {
|
||||
available();
|
||||
return new SignedDownload(oss.uploadUrl() + "/" + key + "?signature=test",
|
||||
ProjectSupport.now().plus(validity));
|
||||
return new OssResourcePaths(oss).publicUrl(key);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,7 +137,6 @@ class CadWorkspaceTest {
|
||||
properties.getOss().setEnabled(true);
|
||||
properties.setMaxFileBytes(268435456);
|
||||
properties.setUploadValidity(Duration.ofMinutes(15));
|
||||
properties.setDownloadValidity(Duration.ofMinutes(5));
|
||||
store.objects.clear();
|
||||
store.unavailable = false;
|
||||
store.afterSign = null;
|
||||
@@ -200,10 +200,14 @@ class CadWorkspaceTest {
|
||||
.startsWith(oss.getRootDirectory() + "/cad-projects/" + code + "/");
|
||||
assertThat(first.path("formFields").path("x-oss-credential").asText())
|
||||
.startsWith(oss.getAccessKeyId() + "/");
|
||||
assertThat(first.path("formFields").has("x-oss-object-acl")).isFalse();
|
||||
assertThat(confirm(code, first, 200).path("data").path("version").asLong()).isEqualTo(1);
|
||||
JsonNode opened = perform(auth(get(BASE + "/" + code + "/document")), 200).path("data");
|
||||
assertThat(opened.path("version").asLong()).isEqualTo(1);
|
||||
assertThat(opened.path("downloadUrl").asText()).contains(first.path("formFields").path("key").asText());
|
||||
assertThat(opened.path("downloadUrl").asText())
|
||||
.isEqualTo(oss.publicBaseUrl() + "/" + first.path("formFields").path("key").asText());
|
||||
assertThat(opened.has("expiresAt")).isTrue();
|
||||
assertThat(opened.path("expiresAt").isNull()).isTrue();
|
||||
|
||||
JsonNode second = upload(code, opened.path("version").asLong(), new byte[] {80, 75, 3, 4, 2, 3});
|
||||
JsonNode saved = confirm(code, second, 200).path("data");
|
||||
@@ -233,6 +237,9 @@ class CadWorkspaceTest {
|
||||
store.unavailable = true;
|
||||
assertThat(confirm(code, first, 200).path("data")).isEqualTo(original);
|
||||
assertThat(service.detail(userId, code).version()).isEqualTo(2);
|
||||
JsonNode document = perform(auth(get(BASE + "/" + code + "/document")), 200).path("data");
|
||||
assertThat(document.path("version").asLong()).isEqualTo(2);
|
||||
assertThat(document.path("downloadUrl").asText()).startsWith(oss.publicBaseUrl() + "/");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user