From 5698fef448d17df14055d2b64cedf20f46bac205 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 29 Sep 2020 11:17:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
index 6f3e736..7aea84d 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
@@ -54,8 +54,11 @@
*/
@PostMapping(value = "/baseDownLoad",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
ResultBody baseDownLoad(@RequestBody Map<String,Object> map) throws Exception;
-
- @PostMapping(value="byteUplaod",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestParam("byte[]") byte[] bytes);
+ /**
+ * byte数组模式上传 到 oss
+ * @param fileName bytes
+ */
+ @PostMapping(value="byteUplaod")
+ FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes);
}
--
Gitblit v1.8.0