From b38d6e5318e75a85ecb11e8e962be571e47d79fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E8=B0=A6?= Date: Tue, 27 Feb 2024 14:08:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=B4=E9=9C=B2=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=88=B0obs=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/controller/WebFileController.java | 1 + .../axzo/oss/http/api/WebFileServiceApi.java | 36 +++++++++++++++++++ .../axzo/oss/http/model}/WebFileUploadVo.java | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 oss-http-api/src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java rename {oss-client/src/main/java/cn/axzo/oss/client/vo => oss-http-api/src/main/java/cn/axzo/oss/http/model}/WebFileUploadVo.java (90%) 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 a466ff5..88b8003 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 @@ -11,6 +11,7 @@ import cn.axzo.oss.common.enums.FileUploadTypeEnum; import cn.axzo.oss.common.enums.StorageUnitEnum; import cn.axzo.oss.common.exception.BizException; import cn.axzo.oss.common.utils.BeanConvertUtil; +import cn.axzo.oss.http.model.WebFileUploadVo; import cn.axzo.oss.manager.api.dto.request.*; import cn.axzo.oss.manager.api.dto.response.*; import cn.axzo.oss.service.api.FileService; diff --git a/oss-http-api/src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java b/oss-http-api/src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java new file mode 100644 index 0000000..1df9347 --- /dev/null +++ b/oss-http-api/src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java @@ -0,0 +1,36 @@ +package cn.axzo.oss.http.api; + +import cn.axzo.oss.http.model.WebFileUploadVo; +import cn.azxo.framework.common.model.CommonResponse; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.Valid; + +import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE; + +/** + * @author wangsiqian + * @since 2024/02/27 + */ +@FeignClient( + name = "oss", + url = "http://oss:9123" +) +public interface WebFileServiceApi { + /** + * OBS：文件上传（断点续传） + * + * @param appCode 应用编码 + * @param bizScene 业务场景 + * @param file MultipartFile + * @return WebFileUploadVo + */ + @PostMapping(value = "/v1/file2", consumes = MULTIPART_FORM_DATA_VALUE) + CommonResponse uploadObs(@Valid @RequestParam("appCode") String appCode, + @Valid @RequestParam("bizScene") String bizScene, + @Valid @RequestPart MultipartFile file); +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/vo/WebFileUploadVo.java b/oss-http-api/src/main/java/cn/axzo/oss/http/model/WebFileUploadVo.java similarity index 90% rename from oss-client/src/main/java/cn/axzo/oss/client/vo/WebFileUploadVo.java rename to oss-http-api/src/main/java/cn/axzo/oss/http/model/WebFileUploadVo.java index 4ffa7f5..82ea3dc 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/vo/WebFileUploadVo.java +++ b/oss-http-api/src/main/java/cn/axzo/oss/http/model/WebFileUploadVo.java @@ -1,4 +1,4 @@ -package cn.axzo.oss.client.vo; +package cn.axzo.oss.http.model; import lombok.Data; From a90b5deba927b276362de42406fe8f50879d8da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E8=B0=A6?= Date: Tue, 27 Feb 2024 14:55:05 +0800 Subject: [PATCH 2/2] fix bugs --- .../src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oss-http-api/src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java b/oss-http-api/src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java index 1df9347..e23de25 100644 --- a/oss-http-api/src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java +++ b/oss-http-api/src/main/java/cn/axzo/oss/http/api/WebFileServiceApi.java @@ -29,7 +29,7 @@ public interface WebFileServiceApi { * @param file MultipartFile * @return WebFileUploadVo */ - @PostMapping(value = "/v1/file2", consumes = MULTIPART_FORM_DATA_VALUE) + @PostMapping(value = "/webApi/v1/file2", consumes = MULTIPART_FORM_DATA_VALUE) CommonResponse uploadObs(@Valid @RequestParam("appCode") String appCode, @Valid @RequestParam("bizScene") String bizScene, @Valid @RequestPart MultipartFile file);