diff --git a/src/main/java/cn/celess/blog/entity/model/FileResponse.java b/src/main/java/cn/celess/blog/entity/model/FileResponse.java index 8e3d7a3..13fc33e 100644 --- a/src/main/java/cn/celess/blog/entity/model/FileResponse.java +++ b/src/main/java/cn/celess/blog/entity/model/FileResponse.java @@ -8,6 +8,6 @@ package cn.celess.blog.entity.model; public class FileResponse { public String key; public String hash; - public String bucket; + public String type; public long size; } diff --git a/src/main/java/cn/celess/blog/service/fileserviceimpl/LocalFileServiceImpl.java b/src/main/java/cn/celess/blog/service/fileserviceimpl/LocalFileServiceImpl.java index b7ebe7f..66aa66a 100644 --- a/src/main/java/cn/celess/blog/service/fileserviceimpl/LocalFileServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/fileserviceimpl/LocalFileServiceImpl.java @@ -48,7 +48,7 @@ public class LocalFileServiceImpl implements FileManager { fos.close(); is.close(); fileResponse.key = URLEncoder.encode(fileName, "UTF-8"); - fileResponse.bucket = "local"; + fileResponse.type = "local"; return fileResponse; } diff --git a/src/main/java/cn/celess/blog/service/fileserviceimpl/QiniuFileServiceImpl.java b/src/main/java/cn/celess/blog/service/fileserviceimpl/QiniuFileServiceImpl.java index b3c48f7..f5c6f4f 100644 --- a/src/main/java/cn/celess/blog/service/fileserviceimpl/QiniuFileServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/fileserviceimpl/QiniuFileServiceImpl.java @@ -66,7 +66,7 @@ public class QiniuFileServiceImpl implements FileManager { StringMap stringMap = response.jsonToMap(); fileResponse.key = (String) stringMap.get("key"); - fileResponse.bucket = "qiniu"; + fileResponse.type = "qiniu"; fileResponse.size = 0; fileResponse.hash = (String) stringMap.get("hash"); diff --git a/src/test/java/cn/celess/blog/BaseTest.java b/src/test/java/cn/celess/blog/BaseTest.java index 7fa4e18..edd13d7 100644 --- a/src/test/java/cn/celess/blog/BaseTest.java +++ b/src/test/java/cn/celess/blog/BaseTest.java @@ -334,7 +334,7 @@ public class BaseTest { log.debug("上传文件请求,[fileName:{}]", fileName); response.key = "key"; - response.bucket = "bucket"; + response.type = "test"; response.hash = "hash"; response.size = 1; return response; diff --git a/src/test/java/cn/celess/blog/service/fileserviceimpl/FileManagerTest.java b/src/test/java/cn/celess/blog/service/fileserviceimpl/FileManagerTest.java index 646f80d..82d44a7 100644 --- a/src/test/java/cn/celess/blog/service/fileserviceimpl/FileManagerTest.java +++ b/src/test/java/cn/celess/blog/service/fileserviceimpl/FileManagerTest.java @@ -83,7 +83,7 @@ public class FileManagerTest extends BaseTest { File file = createFile(); FileResponse fileResponse = fileManager.uploadFile(new FileInputStream(file), file.getName()); assertEquals(file.getName(), fileResponse.key); - assertEquals(System.getProperty(ConfigKeyEnum.FILE_TYPE.getKey()), fileResponse.bucket); + assertEquals(System.getProperty(ConfigKeyEnum.FILE_TYPE.getKey()), fileResponse.type); // assertNotNull(fileResponse.hash); fileName = fileResponse.key;