diff --git a/oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java b/oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java index 3bdfde6..7f19ede 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java @@ -25,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.Part; import javax.validation.Valid; import java.io.InputStream; import java.io.OutputStream; @@ -78,7 +79,7 @@ public class WebFileController { public CommonResponse uploadV2(@Valid @RequestParam("appCode") String appCode, @Valid @RequestParam("bizScene") String bizScene, @Valid @RequestParam("serviceName") String serviceName, - @Valid @RequestParam("file") MultipartFile file) { + @Valid @RequestPart("file") MultipartFile file) { //获取用户信息 ContextInfo.LiteSaasContext liteSaasContext = null; ContextInfo contextInfo = ContextInfoHolder.get(); diff --git a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java index df1866b..dbeaaa0 100644 --- a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java +++ b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java @@ -226,11 +226,19 @@ public class FileServiceImpl implements FileService { // 做兼容处理,如果List fileKey如果存在url取出url,不做查询处理 List urlList = new ArrayList<>(); List fileKeyList = new ArrayList<>(); + List fileKeyStyleList = new ArrayList<>(); for (String fileKey : dto.getFileKey()) { if (fileKey.contains("http")) { urlList.add(fileKey); } 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())); return new ArrayList<>(); } - return setFileUrlRes(urlList, fileList); + return setFileUrlRes(urlList, fileKeyStyleList, fileList); } @Override @@ -326,7 +334,7 @@ public class FileServiceImpl implements FileService { - private List setFileUrlRes(List urlList, List fileList) { + private List setFileUrlRes(List urlList, List fileKeyStyleList, List fileList) { List resList = new ArrayList<>(); if (CollectionUtil.isNotEmpty(urlList)) { urlList.stream().forEach(url -> { @@ -336,6 +344,10 @@ public class FileServiceImpl implements FileService { resList.add(response); }); } + if (CollectionUtil.isNotEmpty(fileKeyStyleList)) { + // TODO: 2022/12/9 + + } fileList.stream().forEach(file -> { FindFileUrlResponse response = new FindFileUrlResponse(); response.setUrl(file.getFileUrl());