wangli/oss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文件上传支持app端请求方式

Browse Source
This commit is contained in:
tianliyong 2022-12-09 16:27:59 +08:00
parent 5c2b68be76
commit a8df2633fd
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java
View File

@ -25,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
@ -78,7 +79,7 @@ public class WebFileController {
public CommonResponse<FileInformationVo> uploadV2(@Valid @RequestParam("appCode") String appCode, public CommonResponse<FileInformationVo> uploadV2(@Valid @RequestParam("appCode") String appCode,
@Valid @RequestParam("bizScene") String bizScene, @Valid @RequestParam("bizScene") String bizScene,
@Valid @RequestParam("serviceName") String serviceName, @Valid @RequestParam("serviceName") String serviceName,
@Valid @RequestParam("file") MultipartFile file) { @Valid @RequestPart("file") MultipartFile file) {
//获取用户信息 //获取用户信息
ContextInfo.LiteSaasContext liteSaasContext = null; ContextInfo.LiteSaasContext liteSaasContext = null;
ContextInfo contextInfo = ContextInfoHolder.get(); ContextInfo contextInfo = ContextInfoHolder.get();

18
oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java
View File

@ -226,11 +226,19 @@ public class FileServiceImpl implements FileService {
// 做兼容处理，如果List<String> fileKey如果存在url取出url，不做查询处理 // 做兼容处理，如果List<String> fileKey如果存在url取出url，不做查询处理
List<String> urlList = new ArrayList<>(); List<String> urlList = new ArrayList<>();
List<String> fileKeyList = new ArrayList<>(); List<String> fileKeyList = new ArrayList<>();
List<String> fileKeyStyleList = new ArrayList<>();
for (String fileKey : dto.getFileKey()) { for (String fileKey : dto.getFileKey()) {
if (fileKey.contains("http")) { if (fileKey.contains("http")) {
urlList.add(fileKey); urlList.add(fileKey);
} else { } else {
fileKeyList.add(fileKey); //对fileKey带图片样式进行处理
if (fileKey.contains("?")) {
String[] fileKeyArr = fileKey.split("\\?");
fileKeyList.add(fileKeyArr[0]);
fileKeyStyleList.add(fileKey);
} else {
fileKeyList.add(fileKey);
}
} }
} }
@ -239,7 +247,7 @@ public class FileServiceImpl implements FileService {
log.warn("find file url is null,key = {}", Arrays.toString(dto.getFileKey().toArray())); log.warn("find file url is null,key = {}", Arrays.toString(dto.getFileKey().toArray()));
return new ArrayList<>(); return new ArrayList<>();
} }
return setFileUrlRes(urlList, fileList); return setFileUrlRes(urlList, fileKeyStyleList, fileList);
} }
@Override @Override
@ -326,7 +334,7 @@ public class FileServiceImpl implements FileService {
private List<FindFileUrlResponse> setFileUrlRes(List<String> urlList, List<File> fileList) { private List<FindFileUrlResponse> setFileUrlRes(List<String> urlList, List<String> fileKeyStyleList, List<File> fileList) {
List<FindFileUrlResponse> resList = new ArrayList<>(); List<FindFileUrlResponse> resList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(urlList)) { if (CollectionUtil.isNotEmpty(urlList)) {
urlList.stream().forEach(url -> { urlList.stream().forEach(url -> {
@ -336,6 +344,10 @@ public class FileServiceImpl implements FileService {
resList.add(response); resList.add(response);
}); });
} }
if (CollectionUtil.isNotEmpty(fileKeyStyleList)) {
// TODO: 2022/12/9
}
fileList.stream().forEach(file -> { fileList.stream().forEach(file -> {
FindFileUrlResponse response = new FindFileUrlResponse(); FindFileUrlResponse response = new FindFileUrlResponse();
response.setUrl(file.getFileUrl()); response.setUrl(file.getFileUrl());