From 06ce85fcdabc441a0d86a510b176920f25365c35 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 21 八月 2024 19:28:23 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 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 8dbfbd0..4120034 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;
@@ -13,7 +14,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "cos-down")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "cos-down")
 public interface SFileService {
 
     /**
@@ -27,6 +28,18 @@
     Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName);
 
     /**
+     *涓婁紶鍥剧墖锛堣浆鍖栧疄浣揊ileUpdateDto锛�
+     * @param file 鏂囦欢
+     * @param folderCode 瀛樺偍鏂囦欢澶�,姣斿鍟嗗搧杞挱鍥�:/goods/banner
+     * @param bucketName 瀛樺偍妗跺悕绉�
+     * @param fileName 鏂囦欢鍚嶇О锛堝惈鍚庣紑锛�,濡傦細test.xml
+     * @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("fileName")String fileName);
+
+
+    /**
      *涓嬭浇鍥剧墖
      * 鍙互浣跨敤 FileDownUtil.downToFile()鏂规硶杞寲涓烘枃浠�
      * @param cosDownDto 瀵硅薄
@@ -35,4 +48,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