From 494668ea37671f76a1a44478151d27028b9d7294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BA=91=E5=BF=97?= Date: Tue, 29 Dec 2020 17:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8minio=20?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish.sh | 30 +++++++++---------- .../ruoyi/system/api/RemoteFileService.java | 15 +++++----- .../factory/RemoteFileFallbackFactory.java | 25 +++++----------- ruoyi-modules/ruoyi-file/publish.sh | 1 + 4 files changed, 30 insertions(+), 41 deletions(-) create mode 120000 ruoyi-modules/ruoyi-file/publish.sh diff --git a/publish.sh b/publish.sh index ae8785ee..2d0220ae 100755 --- a/publish.sh +++ b/publish.sh @@ -3,25 +3,25 @@ # 使用方法: ./publish.sh 版本号. # git pull; git add . ;git commit -m " 发布版本 $*" ; git push -gradleArgs="clean publish -DbuildProduct=true -DreleaseVersion=$1 -DdevVersion=$1" +gradleArgs=" -s clean publish -DbuildProduct=true -DreleaseVersion=$1 -DdevVersion=$1" # 发布公共模块，必须按照下列顺序 编译发布。 -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-core/build.gradle -s -gradle $gradleArgs -b ./ruoyi-api/ruoyi-api-system/build.gradle -s -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-redis/build.gradle -s -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-security/build.gradle -s -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-log/build.gradle -s -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-datascope/build.gradle -s -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-swagger/build.gradle -s +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-core/build.gradle +gradle $gradleArgs -b ./ruoyi-api/ruoyi-api-system/build.gradle +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-redis/build.gradle +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-security/build.gradle +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-log/build.gradle +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-datascope/build.gradle +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-swagger/build.gradle ### 六个 微服务依赖， monitor 不需要发布。 -gradle $gradleArgs -b ./ruoyi-auth/build.gradle -s -gradle $gradleArgs -b ./ruoyi-gateway/build.gradle -s -gradle $gradleArgs -b ./ruoyi-modules/ruoyi-system/build.gradle -s -gradle $gradleArgs -b ./ruoyi-modules/ruoyi-file/build.gradle -s -gradle $gradleArgs -b ./ruoyi-modules/ruoyi-gen/build.gradle -s -gradle $gradleArgs -b ./ruoyi-modules/ruoyi-job/build.gradle -s - +gradle $gradleArgs -b ./ruoyi-auth/build.gradle +gradle $gradleArgs -b ./ruoyi-gateway/build.gradle +gradle $gradleArgs -b ./ruoyi-modules/ruoyi-system/build.gradle +gradle $gradleArgs -b ./ruoyi-modules/ruoyi-file/build.gradle +gradle $gradleArgs -b ./ruoyi-modules/ruoyi-gen/build.gradle +gradle $gradleArgs -b ./ruoyi-modules/ruoyi-job/build.gradle +gradle $gradleArgs -b ./ruoyi-visual/ruoyi-monitor/build.gradle diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java index ae56a54a..f5ecce10 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java @@ -1,23 +1,22 @@ package com.ruoyi.system.api; +import com.ruoyi.common.core.constant.ServiceNameConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.domain.SysFile; +import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; 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; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.SysFile; -import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; /** * 文件服务 - * + * * @author ruoyi */ @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) -public interface RemoteFileService -{ +public interface RemoteFileService { /** * 上传文件 * @@ -25,5 +24,5 @@ public interface RemoteFileService * @return 结果 */ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R upload(@RequestPart(value = "file") MultipartFile file); + R upload(@RequestPart(value = "file") MultipartFile file); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java index 0654256b..c5060362 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java @@ -1,35 +1,24 @@ package com.ruoyi.system.api.factory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.RemoteFileService; -import com.ruoyi.system.api.domain.SysFile; import feign.hystrix.FallbackFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; /** * 文件服务降级处理 - * + * * @author ruoyi */ @Component -public class RemoteFileFallbackFactory implements FallbackFactory -{ +public class RemoteFileFallbackFactory implements FallbackFactory { private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class); @Override - public RemoteFileService create(Throwable throwable) - { + public RemoteFileService create(Throwable throwable) { log.error("文件服务调用失败:{}", throwable.getMessage()); - return new RemoteFileService() - { - @Override - public R upload(MultipartFile file) - { - return R.fail("上传文件失败:" + throwable.getMessage()); - } - }; + return file -> R.fail("上传文件失败:" + throwable.getMessage()); } } diff --git a/ruoyi-modules/ruoyi-file/publish.sh b/ruoyi-modules/ruoyi-file/publish.sh new file mode 120000 index 00000000..81b8b74d --- /dev/null +++ b/ruoyi-modules/ruoyi-file/publish.sh @@ -0,0 +1 @@ +../../build-config/publish.sh \ No newline at end of file