From 7a5df92dfb5a244ac1e5d0fdfdcdb20c38bd3b5f Mon Sep 17 00:00:00 2001
From: duandazhi <ab601026460@163.com>
Date: Fri, 10 Sep 2021 16:25:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=8D=E5=8A=A1=E7=9A=84=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/file/config/CephConfig.java  | 4 ++--
 .../main/java/com/ruoyi/file/config/FastDfsConfig.java   | 4 ++--
 .../src/main/java/com/ruoyi/file/config/MinioConfig.java | 4 ++--
 .../main/java/com/ruoyi/file/config/QiniuKodoConfig.java | 4 ++--
 .../com/ruoyi/file/controller/SysFileController.java     | 7 +++----
 .../com/ruoyi/file/service/AliyunOssDsfServiceImpl.java  | 2 +-
 ...phDfsServiceImpl.java => CephSysFileServiceImpl.java} | 5 ++---
 ...stDfsServiceImpl.java => FastSysFileServiceImpl.java} | 7 +++----
 .../java/com/ruoyi/file/service/FtpFileServiceImpl.java  | 2 +-
 .../service/{IDfsService.java => ISysFileService.java}   | 4 ++--
 .../com/ruoyi/file/service/LocalFileServiceImpl.java     | 7 +++----
 ...oDfsServiceImpl.java => MinioSysFileServiceImpl.java} | 9 +++------
 ...uDfsServiceImpl.java => QiniuSysFileServiceImpl.java} | 5 ++---
 .../com/ruoyi/file/service/TencentCosServiceImpl.java    | 3 +--
 14 files changed, 29 insertions(+), 38 deletions(-)
 rename ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/{CephDfsServiceImpl.java => CephSysFileServiceImpl.java} (98%)
 rename ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/{FastDfsServiceImpl.java => FastSysFileServiceImpl.java} (95%)
 rename ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/{IDfsService.java => ISysFileService.java} (99%)
 rename ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/{MinioDfsServiceImpl.java => MinioSysFileServiceImpl.java} (96%)
 rename ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/{QiniuDfsServiceImpl.java => QiniuSysFileServiceImpl.java} (97%)

diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/CephConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/CephConfig.java
index facb2c73..30b6ee32 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/CephConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/CephConfig.java
@@ -1,12 +1,12 @@
 package com.ruoyi.file.config;
 
-import com.ruoyi.file.service.CephDfsServiceImpl;
+import com.ruoyi.file.service.CephSysFileServiceImpl;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Configuration;
 
 /**
- * @see CephDfsServiceImpl
+ * @see CephSysFileServiceImpl
  * @author dazer
  */
 @RefreshScope
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FastDfsConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FastDfsConfig.java
index 2f328449..253568be 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FastDfsConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FastDfsConfig.java
@@ -2,7 +2,7 @@ package com.ruoyi.file.config;
 
 import com.github.tobato.fastdfs.FdfsClientConstants;
 import com.github.tobato.fastdfs.domain.conn.PooledConnectionFactory;
-import com.ruoyi.file.service.FastDfsServiceImpl;
+import com.ruoyi.file.service.FastSysFileServiceImpl;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Configuration;
@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * 阿里 fastdfs 配置
  * @author dazer
- * @see FastDfsServiceImpl
+ * @see FastSysFileServiceImpl
  *  FastDFS配置 其他参数见：{@link PooledConnectionFactory}
  *
  *  使用: Docker部署FastDFS（附示例代码） https://www.cnblogs.com/cao-lei/p/13470695.html
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
index a8c6e2ac..bdbb32ed 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
@@ -1,6 +1,6 @@
 package com.ruoyi.file.config;
 
-import com.ruoyi.file.service.MinioDfsServiceImpl;
+import com.ruoyi.file.service.MinioSysFileServiceImpl;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
  * Minio 配置信息
  *
  * @author ruoyi
- * @see MinioDfsServiceImpl 实现
+ * @see MinioSysFileServiceImpl 实现
  */
 @RefreshScope
 @Component
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 08f27fe5..1a292a6c 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
@@ -2,7 +2,7 @@ package com.ruoyi.file.config;
 
 import com.qiniu.storage.Region;
 import com.qiniu.storage.UploadManager;
-import com.ruoyi.file.service.QiniuDfsServiceImpl;
+import com.ruoyi.file.service.QiniuSysFileServiceImpl;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Configuration;
@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Configuration;
  * @see UploadManager 上传核心类
  * @see Region 区域 or endpoint 【可选】
  * @see com.qiniu.storage.Configuration 配置类，可以配置 上传区域； 【可选】
- * @see QiniuDfsServiceImpl 实现
+ * @see QiniuSysFileServiceImpl 实现
  */
 @RefreshScope
 @Configuration
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
index 2452d1d1..b3e4733a 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
@@ -1,13 +1,12 @@
 package com.ruoyi.file.controller;
 
-import com.ruoyi.file.service.IDfsService;
+import com.ruoyi.file.service.ISysFileService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -27,7 +26,7 @@ public class SysFileController {
     private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
 
     @Autowired
-    private IDfsService dfsService;
+    private ISysFileService dfsService;
 
     /**
      * 文件上传请求
@@ -90,4 +89,4 @@ public class SysFileController {
             @ApiParam("需要访问的url,字段名:fileUrl,必填;不要带有？后面的参数") @RequestParam(value = "fileUrl") String fileUrl) {
         return R.ok(dfsService.presignedUrl(fileUrl), "获取成功");
     }
-}
\ No newline at end of file
+}
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java
index 071e5bb8..25695769 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java
@@ -44,7 +44,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Primary
 @Service()
-public class AliyunOssDsfServiceImpl implements IDfsService {
+public class AliyunOssDsfServiceImpl implements ISysFileService {
     private static final Logger log = LoggerFactory.getLogger(AliyunOssDsfServiceImpl.class);
     @Autowired
     private AliyunOssConfig aliyunOssConfig;
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/CephDfsServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/CephSysFileServiceImpl.java
similarity index 98%
rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/CephDfsServiceImpl.java
rename to ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/CephSysFileServiceImpl.java
index fefd9bdc..b9c6bb5f 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/CephDfsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/CephSysFileServiceImpl.java
@@ -22,7 +22,6 @@ import java.math.BigDecimal;
 import java.net.URL;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Consumer;
 
 /**
  * @author dazer
@@ -41,8 +40,8 @@ import java.util.function.Consumer;
  * 3:使用docker 搭建 ceph 开发环境，使用aws sdk 存储数据 https://blog.csdn.net/freewebsys/article/details/79553386
  */
 @Service()
-public class CephDfsServiceImpl implements IDfsService {
-    private static final Logger log = LoggerFactory.getLogger(CephDfsServiceImpl.class);
+public class CephSysFileServiceImpl implements ISysFileService {
+    private static final Logger log = LoggerFactory.getLogger(CephSysFileServiceImpl.class);
     @Autowired
     private CephConfig cephConfig;
 
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastSysFileServiceImpl.java
similarity index 95%
rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsServiceImpl.java
rename to ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastSysFileServiceImpl.java
index 1b929fcd..b1cbf513 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastSysFileServiceImpl.java
@@ -9,7 +9,6 @@ import org.csource.fastdfs.ProtoCommon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import com.github.tobato.fastdfs.domain.fdfs.StorePath;
@@ -23,9 +22,9 @@ import com.github.tobato.fastdfs.service.FastFileStorageClient;
  */
 //@Primary
 @Service()
-public class FastDfsServiceImpl implements IDfsService
+public class FastSysFileServiceImpl implements ISysFileService
 {
-    private final Logger logger = LoggerFactory.getLogger(FastDfsServiceImpl.class);
+    private final Logger logger = LoggerFactory.getLogger(FastSysFileServiceImpl.class);
 
     @Autowired
     private FastFileStorageClient storageClient;
@@ -34,7 +33,7 @@ public class FastDfsServiceImpl implements IDfsService
 
     /**
      * FastDfs文件上传接口
-     * 
+     *
      * @param file 上传的文件
      * @return 访问地址
      * @throws Exception
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FtpFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FtpFileServiceImpl.java
index 0b6cda91..4aeaa1bc 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FtpFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FtpFileServiceImpl.java
@@ -17,7 +17,7 @@ import java.io.IOException;
  * @author dazer
  */
 @Service()
-public class FtpFileServiceImpl implements IDfsService {
+public class FtpFileServiceImpl implements ISysFileService {
     @Autowired
     private FtpConfig ftpConfig;
 
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/IDfsService.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
similarity index 99%
rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/IDfsService.java
rename to ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
index ef7f32cd..22a841a0 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/IDfsService.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
@@ -26,7 +26,7 @@ import static com.ruoyi.file.utils.FileUploadUtils.*;
  * 6: CEPH 分布式大数据文件存储系统 http://docs.ceph.org.cn/
  * @author ruoyi
  */
-public interface IDfsService
+public interface ISysFileService
 {
     /**
      * 允许上传文件存放的目录
@@ -41,7 +41,7 @@ public interface IDfsService
 
     /**
      * 文件上传接口
-     * 
+     *
      * @param file 上传的文件
      * @return 访问地址
      * @throws Exception
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalFileServiceImpl.java
index e89aa9bc..698d97d2 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalFileServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.io.FileUtil;
 import com.ruoyi.common.core.exception.CustomException;
 import com.ruoyi.file.config.LocalFileConfig;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.file.utils.FileUploadUtils;
@@ -13,11 +12,11 @@ import java.io.File;
 
 /**
  * 本地文件存储
- * 
+ *
  * @author ruoyi
  */
 @Service()
-public class LocalFileServiceImpl implements IDfsService
+public class LocalFileServiceImpl implements ISysFileService
 {
     private final LocalFileConfig localFileConfig;
 
@@ -27,7 +26,7 @@ public class LocalFileServiceImpl implements IDfsService
 
     /**
      * 本地文件上传接口
-     * 
+     *
      * @param file 上传的文件
      * @return 访问地址
      * @throws Exception
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioDfsServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
similarity index 96%
rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioDfsServiceImpl.java
rename to ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
index be2a668a..652552f0 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioDfsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
@@ -7,9 +7,6 @@ import io.minio.http.Method;
 import io.minio.messages.Item;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.file.config.MinioConfig;
@@ -24,7 +21,7 @@ import java.util.function.Consumer;
 
 /**
  * Minio 文件存储
- * 
+ *
  * @author ruoyi
  * 官网博客： http://docs.minio.org.cn/docs/master/java-client-quickstart-guidec
  * 在springboot中使用Minio8 https://springboot.io/t/topic/3109
@@ -38,7 +35,7 @@ import java.util.function.Consumer;
  */
 //@Primary
 @Service()
-public class MinioDfsServiceImpl implements IDfsService
+public class MinioSysFileServiceImpl implements ISysFileService
 {
     @Autowired
     private MinioConfig minioConfig;
@@ -47,7 +44,7 @@ public class MinioDfsServiceImpl implements IDfsService
 
     /**
      * 本地文件上传接口
-     * 
+     *
      * @param file 上传的文件
      * @return 访问地址
      * @throws Exception
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuDfsServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuSysFileServiceImpl.java
similarity index 97%
rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuDfsServiceImpl.java
rename to ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuSysFileServiceImpl.java
index b5843156..e8a3f48f 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuDfsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/QiniuSysFileServiceImpl.java
@@ -16,7 +16,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -34,8 +33,8 @@ import java.io.InputStream;
  */
 //@Primary
 @Service()
-public class QiniuDfsServiceImpl implements IDfsService {
-    private static final Logger log = LoggerFactory.getLogger(QiniuDfsServiceImpl.class);
+public class QiniuSysFileServiceImpl implements ISysFileService {
+    private static final Logger log = LoggerFactory.getLogger(QiniuSysFileServiceImpl.class);
     @Autowired
     private QiniuKodoConfig qiniuKodoConfig;
 
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/TencentCosServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/TencentCosServiceImpl.java
index 850373ae..7f6d5e81 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/TencentCosServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/TencentCosServiceImpl.java
@@ -9,7 +9,6 @@ import com.qcloud.cos.model.*;
 import com.ruoyi.common.core.exception.CustomException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.file.config.TencentCosConfig;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -25,7 +24,7 @@ import java.util.List;
  */
 //@Primary
 @Service()
-public class TencentCosServiceImpl implements IDfsService {
+public class TencentCosServiceImpl implements ISysFileService {
     private final COSClient cosClient;
     private final TencentCosConfig config;