diff --git a/pom.xml b/pom.xml index f0e654702..037f1c320 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ 2.1.3 2.9.2 1.5.24 + 1.26.5 2.3.2 1.3.0 2.5 @@ -72,6 +73,13 @@ ${spring-boot-admin.version} + + + com.github.tobato + fastdfs-client + ${tobato.version} + + org.mybatis.spring.boot diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 612f4a253..cd9be27c8 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -52,16 +52,15 @@ com.github.tobato fastdfs-client - 1.26.5 - + com.ruoyi - ruoyi-common-security + ruoyi-api-system - + com.ruoyi ruoyi-common-swagger diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYFileApplication.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYFileApplication.java index ab6efd54b..c2c291484 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYFileApplication.java +++ b/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 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 0f5375d1c..318db4169 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 @@ -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); diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java index 202fdab5c..76ed208c8 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java +++ b/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); 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 ff9625384..5a353489d 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 @@ -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; } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index ca5b8b97c..2350560f6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -26,6 +26,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; } diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 18a037898..48a089d4a 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -60,19 +60,13 @@ mysql-connector-java - - - com.ruoyi - ruoyi-common-security - - - + com.ruoyi ruoyi-common-log - + com.ruoyi ruoyi-common-swagger diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index affe40b36..02718d602 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -66,19 +66,13 @@ mysql-connector-java - - - com.ruoyi - ruoyi-common-security - - - + com.ruoyi ruoyi-common-log - + com.ruoyi ruoyi-common-swagger diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index ee6755c9e..4d6fd9426 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -54,35 +54,23 @@ mysql-connector-java - - - com.ruoyi - ruoyi-common-security - - - + com.ruoyi ruoyi-common-datascope - + com.ruoyi ruoyi-common-log - + com.ruoyi ruoyi-common-swagger - - - - com.ruoyi - ruoyi-common-redis -