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

实现：动态切换文件服务器，统一：枚举和config前缀

This commit is contained in:
duandazhi 2022-04-21 21:09:41 +08:00
parent cfb590a039
commit 12c6751404
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/QiniuKodoConfig.java
View File

@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
@ConfigurationProperties(prefix = QiniuKodoConfig.PREFIX) @ConfigurationProperties(prefix = QiniuKodoConfig.PREFIX)
public class QiniuKodoConfig { public class QiniuKodoConfig {
public static final String PREFIX = "file.qiniu"; public static final String PREFIX = "file.qiniu-kodo";
/** /**
* AccessKey 简称ak * AccessKey 简称ak
* 申请地址=>登录七牛云：https://portal.qiniu.com/user/key * 申请地址=>登录七牛云：https://portal.qiniu.com/user/key

5
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/WebMvcConfig.java
View File

@ -5,8 +5,6 @@ import com.qcloud.cos.COSClient;
import com.ruoyi.file.service.*; import com.ruoyi.file.service.*;
import io.minio.MinioClient; import io.minio.MinioClient;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.cloud.context.config.annotation.RefreshScope;
@ -46,12 +44,13 @@ public class WebMvcConfig implements WebMvcConfigurer, ApplicationContextAware {
/*** /***
* 指定文件服务器类型 * 指定文件服务器类型
*/ */
protected ISysFileService.DfsTypeEnum fileServerType = ISysFileService.DfsTypeEnum.DEFAULT; protected ISysFileService.DfsTypeEnum fileServerType = ISysFileService.DfsTypeEnum.LOCAL_FILE;
@Primary @Primary
@Description("dfs bean.....") @Description("dfs bean.....")
@ConditionalOnMissingBean @ConditionalOnMissingBean
@Bean(name = "ISysFileService") @Bean(name = "ISysFileService")
@RefreshScope
public ISysFileService registFileBean(FastFileStorageClient fastFileStorageClient, FastDfsConfig fastDfsConfig, public ISysFileService registFileBean(FastFileStorageClient fastFileStorageClient, FastDfsConfig fastDfsConfig,
FtpConfig ftpConfig, FtpConfig ftpConfig,
AliyunOssConfig aliyunOssConfig, AliyunOssConfig aliyunOssConfig,

2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
View File

@ -45,7 +45,7 @@ public interface ISysFileService
* @see LocalSysFileServiceImpl * @see LocalSysFileServiceImpl
* 2014-07-06 * 2014-07-06
*/ */
DEFAULT, LOCAL_FILE,
/** /**
* ftp, 如：iis、linux ftp、vsftpd、FileZilla Server，需要自己搭建服务 * ftp, 如：iis、linux ftp、vsftpd、FileZilla Server，需要自己搭建服务
* 这里的FTP要求和主项目在同一个服务器，并且访问路径完全同DEFAULT ,只是DEFAULT: tomcat处理、ftp: 使用 其他ftp工具处理 * 这里的FTP要求和主项目在同一个服务器，并且访问路径完全同DEFAULT ,只是DEFAULT: tomcat处理、ftp: 使用 其他ftp工具处理