From afb0fa2343163188cdfc99a9ac90cbabce63ca82 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Tue, 01 Sep 2020 14:28:01 +0800
Subject: [PATCH] 修改上传byte数组接口
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java | 4 ++--
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 4 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 4 ++--
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java | 4 ++--
4 files changed, 8 insertions(+), 8 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 88ed27e..19f9c37 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
@@ -55,7 +55,7 @@
@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(@RequestBody String fileName,@RequestBody byte[] bytes);
+ @PostMapping(value="byteUplaod")
+ FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes);
}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
index 8458501..b6c6dbb 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
@@ -325,12 +325,12 @@
newfileInfo.setName(newFileName);
newfileInfo.setId(IdUtil.fastSimpleUUID());
newfileInfo.setSize(size);
- newfileInfo.setIsImg(true);
+ newfileInfo.setIsImg(false);
newfileInfo.setContentType("byte[]");
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(houzhui);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
baseMapper.insert(newfileInfo);
return newfileInfo;
}
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;
}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index aa81bd3..c7c9be5 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,8 +1,8 @@
// var my_api_server_url = 'http://zuul.kidgrow.com/';
// var my_api_server_url = 'http://192.168.2.240:8888/';
-// var my_api_server_url = 'http://127.0.0.1:8888/';
+var my_api_server_url = 'http://127.0.0.1:8888/';
// var my_api_server_url = 'http://192.168.2.240:8888/';
-var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
+// var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
// var my_api_server_url = 'http://uat.zuul.kidgrow.cloud/';
// var my_api_server_url = 'https://zuul.kidgrow.cloud/';
//var my_api_server_url = 'http://123.57.164.62:8888/';
--
Gitblit v1.8.0