diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/QiniuKodoConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/QiniuKodoConfig.java index bbca1850..25f28b39 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/QiniuKodoConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/QiniuKodoConfig.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ConfigurationProperties(prefix = QiniuKodoConfig.PREFIX) public class QiniuKodoConfig { - public static final String PREFIX = "file.qiniu"; + public static final String PREFIX = "file.qiniu-kodo"; /** * AccessKey 简称ak * 申请地址=>登录七牛云:https://portal.qiniu.com/user/key diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/WebMvcConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/WebMvcConfig.java index e72118f0..4a58cf5b 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/WebMvcConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/WebMvcConfig.java @@ -5,8 +5,6 @@ import com.qcloud.cos.COSClient; import com.ruoyi.file.service.*; import io.minio.MinioClient; 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.context.properties.ConfigurationProperties; 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 @Description("dfs bean.....") @ConditionalOnMissingBean @Bean(name = "ISysFileService") + @RefreshScope public ISysFileService registFileBean(FastFileStorageClient fastFileStorageClient, FastDfsConfig fastDfsConfig, FtpConfig ftpConfig, AliyunOssConfig aliyunOssConfig, diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java index d93595c5..d0c25605 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java @@ -45,7 +45,7 @@ public interface ISysFileService * @see LocalSysFileServiceImpl * 2014-07-06 */ - DEFAULT, + LOCAL_FILE, /** * ftp, 如:iis、linux ftp、vsftpd、FileZilla Server,需要自己搭建服务 * 这里的FTP要求和主项目在同一个服务器,并且访问路径完全同DEFAULT ,只是DEFAULT: tomcat处理、ftp: 使用 其他ftp工具处理