删除多余的依赖

pom.xml

@@ -24,6 +24,7 @@
         <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
         <swagger.fox.version>2.9.2</swagger.fox.version>
         <swagger.core.version>1.5.24</swagger.core.version>
+        <tobato.version>1.26.5</tobato.version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
         <commons.io.version>2.5</commons.io.version>
@@ -72,6 +73,13 @@
                 <version>${spring-boot-admin.version}</version>
             </dependency>
 			
+            <!-- FastDFS 分布式文件系统 -->
+            <dependency>
+                <groupId>com.github.tobato</groupId>
+                <artifactId>fastdfs-client</artifactId>
+                <version>${tobato.version}</version>
+            </dependency>
+			
             <!-- Mybatis 依赖配置 -->
             <dependency>
                 <groupId>org.mybatis.spring.boot</groupId>

ruoyi-modules/ruoyi-file/pom.xml

@@ -52,16 +52,15 @@
         <dependency>
             <groupId>com.github.tobato</groupId>
             <artifactId>fastdfs-client</artifactId>
-            <version>1.26.5</version>
         </dependency>
         
-        <!-- Ruoyi Common Security -->
+        <!-- RuoYi Api System -->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
+            <artifactId>ruoyi-api-system</artifactId>
         </dependency>
         
-        <!-- Ruoyi Common Swagger -->
+        <!-- RuoYi Common Swagger -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-swagger</artifactId>

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYFileApplication.java

@@ -4,7 +4,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 
 /**
@@ -13,7 +12,6 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
  * @author ruoyi
  */
 @EnableCustomSwagger2
-@EnableRyFeignClients
 @EnableDiscoveryClient
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
 public class RuoYFileApplication

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java

@@ -3,7 +3,6 @@ package com.ruoyi.file.controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -22,12 +21,6 @@ public class SysFileController
 {
     private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
 
-    /**
-     * 上传文件存储在本地的根路径
-     */
-    @Value("${file.path}")
-    private String localFilePath;
-
     @Autowired
     private ISysFileService sysFileService;
 
@@ -40,7 +33,7 @@ public class SysFileController
         try
         {
             // 上传并返回访问地址
-            String url = sysFileService.uploadFile(file, localFilePath);
+            String url = sysFileService.uploadFile(file);
             SysFile sysFile = new SysFile();
             sysFile.setName(FileUtils.getName(url));
             sysFile.setUrl(url);

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java

@@ -29,12 +29,11 @@ public class FastDfsSysFileServiceImpl implements ISysFileService
      * FastDfs文件上传接口
      * 
      * @param file 上传的文件
-     * @param baseDir 相对应用的基目录
      * @return 访问地址
      * @throws Exception
      */
     @Override
-    public String uploadFile(MultipartFile file, String baseDir) throws Exception
+    public String uploadFile(MultipartFile file) throws Exception
     {
         StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(),
                 FilenameUtils.getExtension(file.getOriginalFilename()), null);

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

@@ -13,9 +13,8 @@ public interface ISysFileService
      * 文件上传接口
      * 
      * @param file 上传的文件
-     * @param baseDir 相对应用的基目录
      * @return 访问地址
      * @throws Exception
      */
-    public String uploadFile(MultipartFile file, String baseDir) throws Exception;
+    public String uploadFile(MultipartFile file) throws Exception;
 }

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java

@@ -27,6 +27,12 @@ public class LocalSysFileServiceImpl implements ISysFileService
     @Value("${file.domain}")
     public String domain;
     
+    /**
+     * 上传文件存储在本地的根路径
+     */
+    @Value("${file.path}")
+    private String localFilePath;
+
     /**
      * 本地文件上传接口
      * 
@@ -35,9 +41,9 @@ public class LocalSysFileServiceImpl implements ISysFileService
      * @return 访问地址
      * @throws Exception
      */
-    public String uploadFile(MultipartFile file, String baseDir) throws Exception
+    public String uploadFile(MultipartFile file) throws Exception
     {
-        String name = FileUploadUtils.upload(baseDir, file);
+        String name = FileUploadUtils.upload(localFilePath, file);
         String url = domain + localFilePrefix + name;
         return url;
     }

ruoyi-modules/ruoyi-gen/pom.xml

@@ -60,19 +60,13 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
         
-        <!-- Ruoyi Common Security-->
+        <!-- RuoYi Common Log -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
-        </dependency>
-        
-        <!-- Ruoyi Common Log -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-log</artifactId>
         </dependency>
         
-        <!-- Ruoyi Common Swagger -->
+        <!-- RuoYi Common Swagger -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-swagger</artifactId>

ruoyi-modules/ruoyi-job/pom.xml

@@ -66,19 +66,13 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
         
-        <!-- Ruoyi Common Security-->
+        <!-- RuoYi Common Log -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
-        </dependency>
-        
-        <!-- Ruoyi Common Log -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-log</artifactId>
         </dependency>
         
-        <!-- Ruoyi Common Swagger -->
+        <!-- RuoYi Common Swagger -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-swagger</artifactId>

ruoyi-modules/ruoyi-system/pom.xml

@@ -54,36 +54,24 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
         
-        <!-- Ruoyi Common Security -->
+        <!-- RuoYi Common Datascope -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
-        </dependency>
-        
-        <!-- Ruoyi Common Datascope -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-datascope</artifactId>
         </dependency>
         
-        <!-- Ruoyi Common Log -->
+        <!-- RuoYi Common Log -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-log</artifactId>
         </dependency>
         
-        <!-- Ruoyi Common Swagger -->
+        <!-- RuoYi Common Swagger -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Redis-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-redis</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>