diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FilesController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FilesController.java index 69844d85b..885fc5381 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FilesController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FilesController.java @@ -71,7 +71,8 @@ public class FilesController { if(StringUtils.isNotBlank(model.getFilename())){ filename = model.getFilename(); } - GridFSInputFile gridFSInputFile = fileDao.saveToGridFs(file.getInputStream(), filename, contentType); + String type = model.getType(); + GridFSInputFile gridFSInputFile = fileDao.saveToGridFs(file.getInputStream(), filename, contentType, type); UniversalDto dto = UniversalDto.newDto(); if(OpenConfig.getConfig().isProductionEnvironment()){ dto.append("link", "http://static.fangjia.com/stc/files/" + gridFSInputFile.get("_id").toString()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FilesModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FilesModel.java index 50bd904cd..30908c9dd 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/FilesModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/FilesModel.java @@ -7,6 +7,10 @@ public class FilesModel extends FangjiaApiModel { private MultipartFile file; private String contentType; private String filename; + /** + * ÎļþÀàÐÍ + */ + private String type; public MultipartFile getFile() { return file; @@ -31,4 +35,12 @@ public class FilesModel extends FangjiaApiModel { public void setFilename(String filename) { this.filename = filename; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/FileDao.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/FileDao.java index be6fa3e75..76cc1dbbf 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/FileDao.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/FileDao.java @@ -8,6 +8,7 @@ import com.mongodb.gridfs.GridFS; import com.mongodb.gridfs.GridFSDBFile; import com.mongodb.gridfs.GridFSInputFile; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang3.StringUtils; import org.bson.types.ObjectId; import java.io.InputStream; @@ -70,6 +71,18 @@ public class FileDao { return fsInputFile; } + public GridFSInputFile saveToGridFs(InputStream inputStream, String filename, String contentType, String type){ + GridFSInputFile fsInputFile = gridFs.createFile(inputStream, filename); + fsInputFile.put("contentType", contentType); + if (StringUtils.isNotBlank(type)){ + fsInputFile.put("type", type); + } else { + fsInputFile.put("type", "default"); + } + fsInputFile.save(); + return fsInputFile; + } + public GridFSDBFile findByIdInGridFS(String id){ return gridFs.findOne(new ObjectId(id)); }