zheng/blog-backEnd
1
0
Fork 0
Code Issues 5 Pull Requests 12 Actions Packages Projects Releases Wiki Activity

refactor: 修改FileResponse属性bucket为type

Browse Source
This commit is contained in:
禾几海
2020-10-17 00:12:37 +08:00
parent b3b3a7a908
commit c0687b4776
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/celess/blog/entity/model/FileResponse.java
View File

@@ -8,6 +8,6 @@ package cn.celess.blog.entity.model;
public class FileResponse { public class FileResponse {
public String key; public String key;
public String hash; public String hash;
public String bucket; public String type;
public long size; public long size;
} }

2
src/main/java/cn/celess/blog/service/fileserviceimpl/LocalFileServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class LocalFileServiceImpl implements FileManager {
fos.close(); fos.close();
is.close(); is.close();
fileResponse.key = URLEncoder.encode(fileName, "UTF-8"); fileResponse.key = URLEncoder.encode(fileName, "UTF-8");
fileResponse.bucket = "local"; fileResponse.type = "local";
return fileResponse; return fileResponse;
} }

2
src/main/java/cn/celess/blog/service/fileserviceimpl/QiniuFileServiceImpl.java
View File

@@ -66,7 +66,7 @@ public class QiniuFileServiceImpl implements FileManager {
StringMap stringMap = response.jsonToMap(); StringMap stringMap = response.jsonToMap();
fileResponse.key = (String) stringMap.get("key"); fileResponse.key = (String) stringMap.get("key");
fileResponse.bucket = "qiniu"; fileResponse.type = "qiniu";
fileResponse.size = 0; fileResponse.size = 0;
fileResponse.hash = (String) stringMap.get("hash"); fileResponse.hash = (String) stringMap.get("hash");

2
src/test/java/cn/celess/blog/BaseTest.java
View File

@@ -334,7 +334,7 @@ public class BaseTest {
log.debug("上传文件请求，[fileName:{}]", fileName); log.debug("上传文件请求，[fileName:{}]", fileName);
response.key = "key"; response.key = "key";
response.bucket = "bucket"; response.type = "test";
response.hash = "hash"; response.hash = "hash";
response.size = 1; response.size = 1;
return response; return response;

2
src/test/java/cn/celess/blog/service/fileserviceimpl/FileManagerTest.java
View File

@@ -83,7 +83,7 @@ public class FileManagerTest extends BaseTest {
File file = createFile(); File file = createFile();
FileResponse fileResponse = fileManager.uploadFile(new FileInputStream(file), file.getName()); FileResponse fileResponse = fileManager.uploadFile(new FileInputStream(file), file.getName());
assertEquals(file.getName(), fileResponse.key); 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); // assertNotNull(fileResponse.hash);
fileName = fileResponse.key; fileName = fileResponse.key;