From a7a946b8720345bc25c6626a7e5a2298cc16d67e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 31 一月 2024 11:34:48 +0800
Subject: [PATCH] Merge branch 'master-fwq优惠券增加平台限制信息' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index fa00de5..5a4670b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.file.FileDownDto;
+import com.hz.his.dto.file.FileSignVo;
import feign.Response;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
@@ -26,7 +27,6 @@
@RequestMapping(value = "/cos/upload-multipart",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName);
-
/**
*涓婁紶鍥剧墖锛堣浆鍖栧疄浣揊ileUpdateDto锛�
* @param file 鏂囦欢
@@ -34,8 +34,10 @@
* @param bucketName 瀛樺偍妗跺悕绉�
* @return
*/
- @RequestMapping(value = "/cos/upload-file")
- Result upload(@RequestParam("file") File file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName);
+ @RequestMapping(value = "/cos/upload-multipart/name",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName,@RequestParam("fileName")String fileName);
+
+
/**
*涓嬭浇鍥剧墖
* 鍙互浣跨敤 FileDownUtil.downToFile()鏂规硶杞寲涓烘枃浠�
@@ -45,4 +47,20 @@
@PostMapping(value = "/cos/download-file")
Response downloadFile(@RequestBody FileDownDto cosDownDto);
+ /**
+ *鐢熸垚绛惧悕璁块棶URL
+ * @param fileSignVo 瀵硅薄
+ * @return 浣跨敤FileSignReturnVo杞寲
+ */
+ @PostMapping(value = "/cos/signUrl")
+ Result signUrl(@RequestBody FileSignVo fileSignVo);
+
+ /**
+ *鐢熸垚涓婁紶绛惧悕
+ * @param fileSignVo 瀵硅薄
+ * @return 浣跨敤FileSignReturnVo杞寲
+ */
+ @PostMapping(value = "/cos/policy")
+ Result policy(@RequestBody FileSignVo fileSignVo);
+
}
\ No newline at end of file
--
Gitblit v1.8.0