RuoYi лет назад: 5
Родитель
Сommit
6b36b32e39

+ 8 - 0
pom.xml

@@ -24,6 +24,7 @@
24
         <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
24
         <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
25
         <swagger.fox.version>2.9.2</swagger.fox.version>
25
         <swagger.fox.version>2.9.2</swagger.fox.version>
26
         <swagger.core.version>1.5.24</swagger.core.version>
26
         <swagger.core.version>1.5.24</swagger.core.version>
27
+        <tobato.version>1.26.5</tobato.version>
27
         <kaptcha.version>2.3.2</kaptcha.version>
28
         <kaptcha.version>2.3.2</kaptcha.version>
28
         <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
29
         <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
29
         <commons.io.version>2.5</commons.io.version>
30
         <commons.io.version>2.5</commons.io.version>
@@ -72,6 +73,13 @@
72
                 <version>${spring-boot-admin.version}</version>
73
                 <version>${spring-boot-admin.version}</version>
73
             </dependency>
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
             <!-- Mybatis 依赖配置 -->
83
             <!-- Mybatis 依赖配置 -->
76
             <dependency>
84
             <dependency>
77
                 <groupId>org.mybatis.spring.boot</groupId>
85
                 <groupId>org.mybatis.spring.boot</groupId>

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

@@ -52,16 +52,15 @@
52
         <dependency>
52
         <dependency>
53
             <groupId>com.github.tobato</groupId>
53
             <groupId>com.github.tobato</groupId>
54
             <artifactId>fastdfs-client</artifactId>
54
             <artifactId>fastdfs-client</artifactId>
55
-            <version>1.26.5</version>
56
         </dependency>
55
         </dependency>
57
         
56
         
58
-        <!-- Ruoyi Common Security -->
57
+        <!-- RuoYi Api System -->
59
         <dependency>
58
         <dependency>
60
             <groupId>com.ruoyi</groupId>
59
             <groupId>com.ruoyi</groupId>
61
-            <artifactId>ruoyi-common-security</artifactId>
60
+            <artifactId>ruoyi-api-system</artifactId>
62
         </dependency>
61
         </dependency>
63
         
62
         
64
-        <!-- Ruoyi Common Swagger -->
63
+        <!-- RuoYi Common Swagger -->
65
         <dependency>
64
         <dependency>
66
             <groupId>com.ruoyi</groupId>
65
             <groupId>com.ruoyi</groupId>
67
             <artifactId>ruoyi-common-swagger</artifactId>
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
 import org.springframework.boot.autoconfigure.SpringBootApplication;
4
 import org.springframework.boot.autoconfigure.SpringBootApplication;
5
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
5
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
6
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
6
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
7
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
8
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
7
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
9
 
8
 
10
 /**
9
 /**
@@ -13,7 +12,6 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
13
  * @author ruoyi
12
  * @author ruoyi
14
  */
13
  */
15
 @EnableCustomSwagger2
14
 @EnableCustomSwagger2
16
-@EnableRyFeignClients
17
 @EnableDiscoveryClient
15
 @EnableDiscoveryClient
18
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
16
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
19
 public class RuoYFileApplication
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
 import org.slf4j.Logger;
3
 import org.slf4j.Logger;
4
 import org.slf4j.LoggerFactory;
4
 import org.slf4j.LoggerFactory;
5
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
6
-import org.springframework.beans.factory.annotation.Value;
7
 import org.springframework.web.bind.annotation.PostMapping;
6
 import org.springframework.web.bind.annotation.PostMapping;
8
 import org.springframework.web.bind.annotation.RestController;
7
 import org.springframework.web.bind.annotation.RestController;
9
 import org.springframework.web.multipart.MultipartFile;
8
 import org.springframework.web.multipart.MultipartFile;
@@ -22,12 +21,6 @@ public class SysFileController
22
 {
21
 {
23
     private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
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
     @Autowired
24
     @Autowired
32
     private ISysFileService sysFileService;
25
     private ISysFileService sysFileService;
33
 
26
 
@@ -40,7 +33,7 @@ public class SysFileController
40
         try
33
         try
41
         {
34
         {
42
             // 上传并返回访问地址
35
             // 上传并返回访问地址
43
-            String url = sysFileService.uploadFile(file, localFilePath);
36
+            String url = sysFileService.uploadFile(file);
44
             SysFile sysFile = new SysFile();
37
             SysFile sysFile = new SysFile();
45
             sysFile.setName(FileUtils.getName(url));
38
             sysFile.setName(FileUtils.getName(url));
46
             sysFile.setUrl(url);
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
      * FastDfs文件上传接口
29
      * FastDfs文件上传接口
30
      * 
30
      * 
31
      * @param file 上传的文件
31
      * @param file 上传的文件
32
-     * @param baseDir 相对应用的基目录
33
      * @return 访问地址
32
      * @return 访问地址
34
      * @throws Exception
33
      * @throws Exception
35
      */
34
      */
36
     @Override
35
     @Override
37
-    public String uploadFile(MultipartFile file, String baseDir) throws Exception
36
+    public String uploadFile(MultipartFile file) throws Exception
38
     {
37
     {
39
         StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(),
38
         StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(),
40
                 FilenameUtils.getExtension(file.getOriginalFilename()), null);
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
      * @param file 上传的文件
15
      * @param file 上传的文件
16
-     * @param baseDir 相对应用的基目录
17
      * @return 访问地址
16
      * @return 访问地址
18
      * @throws Exception
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
     @Value("${file.domain}")
27
     @Value("${file.domain}")
28
     public String domain;
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
      * @return 访问地址
41
      * @return 访问地址
36
      * @throws Exception
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
         String url = domain + localFilePrefix + name;
47
         String url = domain + localFilePrefix + name;
42
         return url;
48
         return url;
43
     }
49
     }

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

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

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

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

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

@@ -54,35 +54,23 @@
54
             <artifactId>mysql-connector-java</artifactId>
54
             <artifactId>mysql-connector-java</artifactId>
55
         </dependency>
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
         <dependency>
58
         <dependency>
65
             <groupId>com.ruoyi</groupId>
59
             <groupId>com.ruoyi</groupId>
66
             <artifactId>ruoyi-common-datascope</artifactId>
60
             <artifactId>ruoyi-common-datascope</artifactId>
67
         </dependency>
61
         </dependency>
68
         
62
         
69
-        <!-- Ruoyi Common Log -->
63
+        <!-- RuoYi Common Log -->
70
         <dependency>
64
         <dependency>
71
             <groupId>com.ruoyi</groupId>
65
             <groupId>com.ruoyi</groupId>
72
             <artifactId>ruoyi-common-log</artifactId>
66
             <artifactId>ruoyi-common-log</artifactId>
73
         </dependency>
67
         </dependency>
74
         
68
         
75
-        <!-- Ruoyi Common Swagger -->
69
+        <!-- RuoYi Common Swagger -->
76
         <dependency>
70
         <dependency>
77
             <groupId>com.ruoyi</groupId>
71
             <groupId>com.ruoyi</groupId>
78
             <artifactId>ruoyi-common-swagger</artifactId>
72
             <artifactId>ruoyi-common-swagger</artifactId>
79
         </dependency>
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
     </dependencies>
75
     </dependencies>
88
 
76