From 98fb4b2802f949a730b87f55a8d100272817ac3e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 07 Aug 2020 18:46:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

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
index 18e53b8..e58d115 100644
--- 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
@@ -1,13 +1,17 @@
 package com.kidgrow.filecenter.feign.fallback;
 
 
+import com.kidgrow.common.model.ResultBody;
 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.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -28,7 +32,19 @@
             public FileInfo upload(@RequestParam("file") MultipartFile file) {
                 return null;
             }
+            @Override
+            public FileInfo feignUpload(@RequestPart("file") MultipartFile file,@RequestParam String imgType) {
+                return null;
+            }
+            @Override
+            public FileInfo baseUplaod(String file, String imgType) {
+                return null;
+            }
 
+            @Override
+            public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
+                return null;
+            }
         };
     }
 }

--
Gitblit v1.8.0