添加多运行环境支持 #14

Open
xiaohai2271 wants to merge 36 commits from feat-multlyEnv#13 into master-old
5 changed files with 5 additions and 5 deletions
Showing only changes of commit c0687b4776 - Show all commits

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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");

View File

@@ -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;

View File

@@ -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;