Ver código fonte

删除多余的依赖

RuoYi 5 anos atrás
pai
commit
6b36b32e39

+ 8 - 0
pom.xml

@@ -24,6 +24,7 @@
24 24
         <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
25 25
         <swagger.fox.version>2.9.2</swagger.fox.version>
26 26
         <swagger.core.version>1.5.24</swagger.core.version>
27
+        <tobato.version>1.26.5</tobato.version>
27 28
         <kaptcha.version>2.3.2</kaptcha.version>
28 29
         <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
29 30
         <commons.io.version>2.5</commons.io.version>
@@ -72,6 +73,13 @@
72 73
                 <version>${spring-boot-admin.version}</version>
73 74
             </dependency>
74 75
 			
76
+            <!-- FastDFS 分布式文件系统 -->
77
+            <dependency>
78
+                <groupId>com.github.tobato</groupId>
79
+                <artifactId>fastdfs-client</artifactId>
80
+                <version>${tobato.version}</version>
81
+            </dependency>
82
+			
75 83
             <!-- Mybatis 依赖配置 -->
76 84
             <dependency>
77 85
                 <groupId>org.mybatis.spring.boot</groupId>

+ 3 - 4
ruoyi-modules/ruoyi-file/pom.xml

@@ -52,16 +52,15 @@
52 52
         <dependency>
53 53
             <groupId>com.github.tobato</groupId>
54 54
             <artifactId>fastdfs-client</artifactId>
55
-            <version>1.26.5</version>
56 55
         </dependency>
57 56
         
58
-        <!-- Ruoyi Common Security -->
57
+        <!-- RuoYi Api System -->
59 58
         <dependency>
60 59
             <groupId>com.ruoyi</groupId>
61
-            <artifactId>ruoyi-common-security</artifactId>
60
+            <artifactId>ruoyi-api-system</artifactId>
62 61
         </dependency>
63 62
         
64
-        <!-- Ruoyi Common Swagger -->
63
+        <!-- RuoYi Common Swagger -->
65 64
         <dependency>
66 65
             <groupId>com.ruoyi</groupId>
67 66
             <artifactId>ruoyi-common-swagger</artifactId>

+ 0 - 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYFileApplication.java

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

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

@@ -3,7 +3,6 @@ package com.ruoyi.file.controller;
3 3
 import org.slf4j.Logger;
4 4
 import org.slf4j.LoggerFactory;
5 5
 import org.springframework.beans.factory.annotation.Autowired;
6
-import org.springframework.beans.factory.annotation.Value;
7 6
 import org.springframework.web.bind.annotation.PostMapping;
8 7
 import org.springframework.web.bind.annotation.RestController;
9 8
 import org.springframework.web.multipart.MultipartFile;
@@ -22,12 +21,6 @@ public class SysFileController
22 21
 {
23 22
     private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
24 23
 
25
-    /**
26
-     * 上传文件存储在本地的根路径
27
-     */
28
-    @Value("${file.path}")
29
-    private String localFilePath;
30
-
31 24
     @Autowired
32 25
     private ISysFileService sysFileService;
33 26
 
@@ -40,7 +33,7 @@ public class SysFileController
40 33
         try
41 34
         {
42 35
             // 上传并返回访问地址
43
-            String url = sysFileService.uploadFile(file, localFilePath);
36
+            String url = sysFileService.uploadFile(file);
44 37
             SysFile sysFile = new SysFile();
45 38
             sysFile.setName(FileUtils.getName(url));
46 39
             sysFile.setUrl(url);

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

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

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

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

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

@@ -26,6 +26,12 @@ public class LocalSysFileServiceImpl implements ISysFileService
26 26
      */
27 27
     @Value("${file.domain}")
28 28
     public String domain;
29
+    
30
+    /**
31
+     * 上传文件存储在本地的根路径
32
+     */
33
+    @Value("${file.path}")
34
+    private String localFilePath;
29 35
 
30 36
     /**
31 37
      * 本地文件上传接口
@@ -35,9 +41,9 @@ public class LocalSysFileServiceImpl implements ISysFileService
35 41
      * @return 访问地址
36 42
      * @throws Exception
37 43
      */
38
-    public String uploadFile(MultipartFile file, String baseDir) throws Exception
44
+    public String uploadFile(MultipartFile file) throws Exception
39 45
     {
40
-        String name = FileUploadUtils.upload(baseDir, file);
46
+        String name = FileUploadUtils.upload(localFilePath, file);
41 47
         String url = domain + localFilePrefix + name;
42 48
         return url;
43 49
     }

+ 2 - 8
ruoyi-modules/ruoyi-gen/pom.xml

@@ -60,19 +60,13 @@
60 60
             <artifactId>mysql-connector-java</artifactId>
61 61
         </dependency>
62 62
         
63
-        <!-- Ruoyi Common Security-->
64
-        <dependency>
65
-            <groupId>com.ruoyi</groupId>
66
-            <artifactId>ruoyi-common-security</artifactId>
67
-        </dependency>
68
-        
69
-        <!-- Ruoyi Common Log -->
63
+        <!-- RuoYi Common Log -->
70 64
         <dependency>
71 65
             <groupId>com.ruoyi</groupId>
72 66
             <artifactId>ruoyi-common-log</artifactId>
73 67
         </dependency>
74 68
         
75
-        <!-- Ruoyi Common Swagger -->
69
+        <!-- RuoYi Common Swagger -->
76 70
         <dependency>
77 71
             <groupId>com.ruoyi</groupId>
78 72
             <artifactId>ruoyi-common-swagger</artifactId>

+ 2 - 8
ruoyi-modules/ruoyi-job/pom.xml

@@ -66,19 +66,13 @@
66 66
             <artifactId>mysql-connector-java</artifactId>
67 67
         </dependency>
68 68
         
69
-        <!-- Ruoyi Common Security-->
70
-        <dependency>
71
-            <groupId>com.ruoyi</groupId>
72
-            <artifactId>ruoyi-common-security</artifactId>
73
-        </dependency>
74
-        
75
-        <!-- Ruoyi Common Log -->
69
+        <!-- RuoYi Common Log -->
76 70
         <dependency>
77 71
             <groupId>com.ruoyi</groupId>
78 72
             <artifactId>ruoyi-common-log</artifactId>
79 73
         </dependency>
80 74
         
81
-        <!-- Ruoyi Common Swagger -->
75
+        <!-- RuoYi Common Swagger -->
82 76
         <dependency>
83 77
             <groupId>com.ruoyi</groupId>
84 78
             <artifactId>ruoyi-common-swagger</artifactId>

+ 3 - 15
ruoyi-modules/ruoyi-system/pom.xml

@@ -54,35 +54,23 @@
54 54
             <artifactId>mysql-connector-java</artifactId>
55 55
         </dependency>
56 56
         
57
-        <!-- Ruoyi Common Security -->
58
-        <dependency>
59
-            <groupId>com.ruoyi</groupId>
60
-            <artifactId>ruoyi-common-security</artifactId>
61
-        </dependency>
62
-        
63
-        <!-- Ruoyi Common Datascope -->
57
+        <!-- RuoYi Common Datascope -->
64 58
         <dependency>
65 59
             <groupId>com.ruoyi</groupId>
66 60
             <artifactId>ruoyi-common-datascope</artifactId>
67 61
         </dependency>
68 62
         
69
-        <!-- Ruoyi Common Log -->
63
+        <!-- RuoYi Common Log -->
70 64
         <dependency>
71 65
             <groupId>com.ruoyi</groupId>
72 66
             <artifactId>ruoyi-common-log</artifactId>
73 67
         </dependency>
74 68
         
75
-        <!-- Ruoyi Common Swagger -->
69
+        <!-- RuoYi Common Swagger -->
76 70
         <dependency>
77 71
             <groupId>com.ruoyi</groupId>
78 72
             <artifactId>ruoyi-common-swagger</artifactId>
79 73
         </dependency>
80
-        
81
-        <!-- RuoYi Common Redis-->
82
-        <dependency>
83
-            <groupId>com.ruoyi</groupId>
84
-            <artifactId>ruoyi-common-redis</artifactId>
85
-        </dependency>
86 74
 
87 75
     </dependencies>
88 76