From 7e4852e4b12f5728e11e9c50caa96d3aba3786ff Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 03 二月 2023 13:04:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 7 ++++---
1 files changed, 4 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..a83202d 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
@@ -26,7 +26,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 +33,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("bucketName")String fileName);
+
+
/**
*涓嬭浇鍥剧墖
* 鍙互浣跨敤 FileDownUtil.downToFile()鏂规硶杞寲涓烘枃浠�
--
Gitblit v1.8.0