From 489b1215ef878acd125e32c35da679adcf336b95 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 12 Jun 2020 12:00:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java | 18 ++++++++
kidgrow-config/src/main/resources/application.properties | 3 +
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java | 37 ++++++++++++++++++
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java | 35 +++++++++++++++++
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java | 4 ++
5 files changed, 96 insertions(+), 1 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
new file mode 100644
index 0000000..1e3ff69
--- /dev/null
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
@@ -0,0 +1,35 @@
+package com.kidgrow.filecenter.feign;
+
+import com.kidgrow.common.constant.ServiceNameConstants;
+import com.kidgrow.filecenter.feign.fallback.FileServiceFallbackFactory;
+import com.kidgrow.filecenter.model.FileInfo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: <br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/2/22 14:33 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@FeignClient(name = ServiceNameConstants.FILE_CENTER_SERVER, fallbackFactory = FileServiceFallbackFactory.class, decode404 = true)
+public interface FileService {
+ /**
+ * 根据条件查询
+ * @param file
+ */
+ @PostMapping(value = "/files-anon",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ FileInfo upload(@RequestPart("file") MultipartFile file);
+
+ /**
+ * 根据条件查询
+ * @param file
+ */
+ @PostMapping(value = "/files-upload",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ FileInfo feignUpload(MultipartFile file);
+}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
new file mode 100644
index 0000000..d516700
--- /dev/null
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
@@ -0,0 +1,37 @@
+package com.kidgrow.filecenter.feign.fallback;
+
+
+import com.kidgrow.filecenter.feign.FileService;
+import com.kidgrow.filecenter.model.FileInfo;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: <br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/2/22 14:33 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@Slf4j
+@Component
+public class FileServiceFallbackFactory implements FallbackFactory<FileService> {
+
+ @Override
+ public FileService create(Throwable throwable) {
+ return new FileService() {
+ @Override
+ public FileInfo upload(@RequestParam("file") MultipartFile file) {
+ return null;
+ }
+ @Override
+ public FileInfo feignUpload(MultipartFile file) {
+ return null;
+ }
+ };
+ }
+}
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 fce1698..f92bf09 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
@@ -4,6 +4,7 @@
import com.kidgrow.common.model.Result;
import com.kidgrow.filecenter.model.FileInfo;
import com.kidgrow.filecenter.service.IFileService;
+import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -31,11 +32,26 @@
* @return
* @throws Exception
*/
- @PostMapping("/files-anon")
+ @PostMapping(value="/files-anon",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public FileInfo upload(@RequestParam("file") MultipartFile file) throws Exception {
return fileService.upload(file);
}
+
+ /**
+ * 文件上传
+ * 根据fileType选择上传方式
+ *
+ * @param file
+ * @return
+ * @throws Exception
+ */
+ @PostMapping(value="/files-upload",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public FileInfo feignUpload(MultipartFile file) throws Exception {
+ return fileService.upload(file);
+ }
+
+
/**
* 文件删除
*
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
index 464774f..550749a 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
@@ -37,4 +37,8 @@
* 短信服务名
*/
String SMS_SERVICE_SERVER = "sms-service-server";
+ /**
+ * 文件服务名
+ */
+ String FILE_CENTER_SERVER="filecenter-server";
}
diff --git a/kidgrow-config/src/main/resources/application.properties b/kidgrow-config/src/main/resources/application.properties
index 1dffc9a..4038b2e 100644
--- a/kidgrow-config/src/main/resources/application.properties
+++ b/kidgrow-config/src/main/resources/application.properties
@@ -94,4 +94,7 @@
# \u539F\u751F\u914D\u7F6E
mybatis-plus.configuration.map-underscore-to-camel-case=true
mybatis-plus.configuration.cache-enabled=false
+#\u6587\u4EF6\u4E0A\u4F20\u5927\u5C0F\u8BBE\u7F6E
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=1000MB
--
Gitblit v1.8.0