clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

默认使用minio 作为文件服务

This commit is contained in:
陈云志 2020-12-29 17:59:09 +08:00
parent d0e85a00f8
commit 494668ea37
4 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
publish.sh
View File

@ -3,25 +3,25 @@
# 使用方法: ./publish.sh 版本号. # 使用方法: ./publish.sh 版本号.
# git pull; git add . ;git commit -m " 发布版本 $*" ; git push # 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-common/ruoyi-common-core/build.gradle
gradle $gradleArgs -b ./ruoyi-api/ruoyi-api-system/build.gradle -s gradle $gradleArgs -b ./ruoyi-api/ruoyi-api-system/build.gradle
gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-redis/build.gradle -s gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-redis/build.gradle
gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-security/build.gradle -s gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-security/build.gradle
gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-log/build.gradle -s gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-log/build.gradle
gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-datascope/build.gradle -s gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-datascope/build.gradle
gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-swagger/build.gradle -s gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-swagger/build.gradle
### 六个 微服务依赖， monitor 不需要发布。 ### 六个 微服务依赖， monitor 不需要发布。
gradle $gradleArgs -b ./ruoyi-auth/build.gradle -s gradle $gradleArgs -b ./ruoyi-auth/build.gradle
gradle $gradleArgs -b ./ruoyi-gateway/build.gradle -s gradle $gradleArgs -b ./ruoyi-gateway/build.gradle
gradle $gradleArgs -b ./ruoyi-modules/ruoyi-system/build.gradle -s gradle $gradleArgs -b ./ruoyi-modules/ruoyi-system/build.gradle
gradle $gradleArgs -b ./ruoyi-modules/ruoyi-file/build.gradle -s gradle $gradleArgs -b ./ruoyi-modules/ruoyi-file/build.gradle
gradle $gradleArgs -b ./ruoyi-modules/ruoyi-gen/build.gradle -s gradle $gradleArgs -b ./ruoyi-modules/ruoyi-gen/build.gradle
gradle $gradleArgs -b ./ruoyi-modules/ruoyi-job/build.gradle -s gradle $gradleArgs -b ./ruoyi-modules/ruoyi-job/build.gradle
gradle $gradleArgs -b ./ruoyi-visual/ruoyi-monitor/build.gradle

13
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.system.api; 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.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile; 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;
/** /**
* 文件服务 * 文件服务
@ -16,8 +16,7 @@ import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
* @author ruoyi * @author ruoyi
*/ */
@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
public interface RemoteFileService public interface RemoteFileService {
{
/** /**
* 上传文件 * 上传文件
* *
@ -25,5 +24,5 @@ public interface RemoteFileService
* @return 结果 * @return 结果
*/ */
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file); R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
} }

23
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
View File

@ -1,13 +1,11 @@
package com.ruoyi.system.api.factory; package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteFileService;
import feign.hystrix.FallbackFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; 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;
/** /**
* 文件服务降级处理 * 文件服务降级处理
@ -15,21 +13,12 @@ import feign.hystrix.FallbackFactory;
* @author ruoyi * @author ruoyi
*/ */
@Component @Component
public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService> public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService> {
{
private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class); private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
@Override @Override
public RemoteFileService create(Throwable throwable) public RemoteFileService create(Throwable throwable) {
{
log.error("文件服务调用失败:{}", throwable.getMessage()); log.error("文件服务调用失败:{}", throwable.getMessage());
return new RemoteFileService() return file -> R.fail("上传文件失败:" + throwable.getMessage());
{
@Override
public R<SysFile> upload(MultipartFile file)
{
return R.fail("上传文件失败:" + throwable.getMessage());
}
};
} }
} }

1
ruoyi-modules/ruoyi-file/publish.sh Symbolic link
View File

@ -0,0 +1 @@
../../build-config/publish.sh