Commit 880587ce authored by nie'hong's avatar nie'hong

修改上传互动内容上传图片处能够上传视频

parent 5dba414f
...@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
...@@ -94,7 +95,7 @@ public class FileUploadController extends BaseController { ...@@ -94,7 +95,7 @@ public class FileUploadController extends BaseController {
}) })
@PostMapping(value = "/datum/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @PostMapping(value = "/datum/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@ApiOperation(value = "展板资料上传", notes = "展板资料上传") @ApiOperation(value = "展板资料上传", notes = "展板资料上传")
public Map<String, Object> uploadDatum(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException { public Map<String, Object> uploadDatum(@RequestPart(value = "file", required = false) MultipartFile[] files, HttpServletRequest request) throws IOException {
if (files == null || files.length == 0) { if (files == null || files.length == 0) {
return getFailResult("没有文件可供上传"); return getFailResult("没有文件可供上传");
} }
...@@ -127,6 +128,16 @@ public class FileUploadController extends BaseController { ...@@ -127,6 +128,16 @@ public class FileUploadController extends BaseController {
continue; continue;
} }
String image = request.getParameter("image");
if (image != null && image.equals("1")) {
String extension = FilenameUtils.getExtension(originalFilename);
boolean anyMatch1 = Arrays.stream(IMAGE_TYPE).anyMatch(s -> Objects.equals(s, extension.toUpperCase()));
if (!anyMatch1) {
return getFailResult("文件格式不支持");
}
}
String baseName = FilenameUtils.getBaseName(originalFilename); String baseName = FilenameUtils.getBaseName(originalFilename);
String extName = FilenameUtils.getExtension(originalFilename); String extName = FilenameUtils.getExtension(originalFilename);
String finalExtName = extName; String finalExtName = extName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment