From f31ae0176ba124a2a39121584f5c39c3de932157 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 12:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 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 a83202d..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;
@@ -34,7 +35,7 @@
      * @return
      */
     @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("bucketName")String fileName);
+    Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName,@RequestParam("fileName")String fileName);
 
 
     /**
@@ -46,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