From 12c67514040dc45b01a3ab39cc64effb1bf3e95b Mon Sep 17 00:00:00 2001
From: duandazhi <ab601026460@163.com>
Date: Thu, 21 Apr 2022 21:09:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=9A=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=EF=BC=9A=E6=9E=9A=E4=B8=BE=E5=92=8C?=
 =?UTF-8?q?config=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/file/config/QiniuKodoConfig.java | 2 +-
 .../src/main/java/com/ruoyi/file/config/WebMvcConfig.java    | 5 ++---
 .../main/java/com/ruoyi/file/service/ISysFileService.java    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

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工具处理