Merge remote-tracking branch 'origin/master'

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/FileDownService.java

@@ -0,0 +1,34 @@
+package com.css.simulation.resource.feign;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.param.MinioParameter;
+import com.css.simulation.resource.common.config.FeignConfiguration;
+import com.css.simulation.resource.feign.fallback.RedisServiceFallback;
+import feign.Response;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+
+//@FeignClient(name = "test", url = "http://10.15.12.72:8001", fallback = RedisServiceFallback.class, configuration = FeignConfiguration.class)
+@FeignClient(
+        contextId = "file",
+        value = "simulation-resource-common",
+        path = "/simulation/resource/common",
+        fallback = RedisServiceFallback.class,
+        configuration = FeignConfiguration.class
+)
+public interface FileDownService {
+
+    @PostMapping(value = "/minio/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    ResponseBodyVO<String> upload(@RequestPart("file") MultipartFile file,
+                                  @RequestParam("objectName") String objectName);
+
+    @PostMapping("/minio/download")
+    Response download(@RequestBody @Validated MinioParameter minioParameter);
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/FileDownServiceFallback.java

@@ -0,0 +1,32 @@
+package com.css.simulation.resource.feign.fallback;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.param.MinioParameter;
+import com.css.simulation.resource.feign.FileDownService;
+import com.css.simulation.resource.feign.RedisService;
+import feign.Response;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+@Slf4j
+@Service
+public class FileDownServiceFallback implements FileDownService {
+
+
+    @Override
+    public ResponseBodyVO<String> upload(@RequestPart("file") MultipartFile file,
+                                         @RequestParam("objectName") String objectName) {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
+    }
+
+    @Override
+    public Response download(@RequestBody @Validated MinioParameter minioParameter) {
+        log.error("------- 下载错误：" + minioParameter.getObjectName());
+        return null;
+    }
+}