From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 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 fc724c6..4d06ec6 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,6 +1,7 @@
 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;
@@ -9,6 +10,8 @@
 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>
@@ -30,7 +33,27 @@
                 return null;
             }
             @Override
-            public FileInfo feignUpload(@RequestPart("file") MultipartFile file) {
+            public FileInfo feignUpload(@RequestPart("file") MultipartFile file,@RequestParam String imgType) {
+                return null;
+            }
+
+            @Override
+            public FileInfo baseUplaod(String file, String imgType, String hospitalId, String departmentId) {
+                return null;
+            }
+
+            @Override
+            public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
+                return null;
+            }
+
+            @Override
+            public FileInfo byteUplaod(String fileName, byte[] bytes) {
+                return null;
+            }
+
+            @Override
+            public FileInfo feignUploadHosIdAndDepId(MultipartFile file, String imgType, String hospitalId, String departmentId) {
                 return null;
             }
         };

--
Gitblit v1.8.0