From d485902ae91b906ce542e51936bd460f0a3a5b08 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 01 Sep 2020 16:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
index 205ddd3..b70149c 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
@@ -90,8 +90,8 @@
/**
* byte[]上传
*/
- @PostMapping(value="byteUplaod",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public FileInfo byteUplaod(@RequestBody String fileName,@RequestBody byte[] bytes){
+ @PostMapping(value="byteUplaod")
+ public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes){
if(bytes.length == 0){
return null;
}
--
Gitblit v1.8.0