diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/oss/OssStorageService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/oss/OssStorageService.java index d8d599157..67038217b 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/oss/OssStorageService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/oss/OssStorageService.java @@ -196,9 +196,7 @@ public class OssStorageService { * 服务端自己的读写走 internal-endpoint 那张 client,两者不能合用一张。 */ public String presignSoftwareVersionUpload(String objectKey, int expirySeconds) { - if (objectKey == null || !objectKey.startsWith(SOFTWARE_VERSION_PREFIX)) { - throw new IllegalArgumentException("software version objectKey must start with " + SOFTWARE_VERSION_PREFIX); - } + requirePrefixedObjectKey(objectKey, SOFTWARE_VERSION_PREFIX, "software version"); try { return presignClient().getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder() .method(Method.PUT) @@ -213,9 +211,7 @@ public class OssStorageService { /** 返回软件版本对象的字节数;对象不存在返回 -1(直传完成后由服务端核对大小是否超限)。 */ public long softwareVersionObjectSize(String objectKey) { - if (objectKey == null || !objectKey.startsWith(SOFTWARE_VERSION_PREFIX)) { - throw new IllegalArgumentException("software version objectKey must start with " + SOFTWARE_VERSION_PREFIX); - } + requirePrefixedObjectKey(objectKey, SOFTWARE_VERSION_PREFIX, "software version"); try { var stat = buildClient().statObject(StatObjectArgs.builder() .bucket(publicClientBucket()) @@ -234,9 +230,7 @@ public class OssStorageService { /** 生成软件版本对象的公开下载 URL(与历史 file_url 同构:path-style client 桶)。 */ public String getSoftwareVersionDownloadUrl(String objectKey) { - if (objectKey == null || !objectKey.startsWith(SOFTWARE_VERSION_PREFIX)) { - throw new IllegalArgumentException("software version objectKey must start with " + SOFTWARE_VERSION_PREFIX); - } + requirePrefixedObjectKey(objectKey, SOFTWARE_VERSION_PREFIX, "software version"); return softwareVersionPublicUrl(objectKey); } @@ -254,9 +248,7 @@ public class OssStorageService { /** 删除软件版本对象(client 桶);确认环节发现超限等异常时清理残留,避免公共桶悬挂大对象。 */ public void removeSoftwareVersionObject(String objectKey) { - if (objectKey == null || !objectKey.startsWith(SOFTWARE_VERSION_PREFIX)) { - throw new IllegalArgumentException("software version objectKey must start with " + SOFTWARE_VERSION_PREFIX); - } + requirePrefixedObjectKey(objectKey, SOFTWARE_VERSION_PREFIX, "software version"); try { buildClient().removeObject(RemoveObjectArgs.builder() .bucket(publicClientBucket()) @@ -324,8 +316,13 @@ public class OssStorageService { } private void requireTutorialKey(String objectKey) { - if (objectKey == null || !objectKey.startsWith(TUTORIAL_PREFIX)) { - throw new IllegalArgumentException("tutorial objectKey must start with " + TUTORIAL_PREFIX); + requirePrefixedObjectKey(objectKey, TUTORIAL_PREFIX, "tutorial"); + } + + /** objectKey 前缀守卫:软件版本族与教程族八格同款,只是前缀与文案里的名字不同。 */ + private void requirePrefixedObjectKey(String objectKey, String prefix, String what) { + if (objectKey == null || !objectKey.startsWith(prefix)) { + throw new IllegalArgumentException(what + " objectKey must start with " + prefix); } } @@ -484,18 +481,6 @@ public class OssStorageService { } } - public String uploadTaskScopePayload(String moduleType, Long taskId, String scopeHash, String content) { - String normalizedScopeHash = scopeHash == null || scopeHash.isBlank() ? UUID.randomUUID().toString() : scopeHash; - String objectKey = String.format("task-scope/%s/%s/%s.json", normalizeModuleType(moduleType), taskId, normalizedScopeHash); - return uploadText(objectKey, content); - } - - public String uploadTaskParsedPayload(String moduleType, Long taskId, String scopeHash, String content) { - String normalizedScopeHash = scopeHash == null || scopeHash.isBlank() ? UUID.randomUUID().toString() : scopeHash; - String objectKey = String.format("task-parsed/%s/%s/%s.json", normalizeModuleType(moduleType), taskId, normalizedScopeHash); - return uploadText(objectKey, content); - } - public String readObjectAsString(String value) { StorageLocation location = resolveStorageLocation(value); if (location == null) {