From 6b36b32e39a38fc4c9fd59ec7425fc3750e5ae59 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 25 Nov 2020 18:22:57 +0800
Subject: [PATCH] 删除多余的依赖
---
ruoyi-modules/ruoyi-file/pom.xml | 7 +--
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java | 9 ----
ruoyi-modules/ruoyi-gen/pom.xml | 10 +----
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java | 3 -
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java | 10 ++++-
ruoyi-modules/ruoyi-job/pom.xml | 10 +----
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYFileApplication.java | 2 -
ruoyi-modules/ruoyi-system/pom.xml | 18 +-------
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java | 3 -
pom.xml | 8 ++++
10 files changed, 29 insertions(+), 51 deletions(-)
diff --git a/pom.xml b/pom.xml
index f0e6547..037f1c3 100644
--- a/pom.xml
+++ b/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>
diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml
index 612f4a2..cd9be27 100644
--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/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>
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 ab6efd5..c2c2914 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.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 @@
* @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 0f5375d..318db41 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 @@
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 @@
{
private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
- /**
- * 上传文件存储在本地的根路径
- */
- @Value("${file.path}")
- private String localFilePath;
-
@Autowired
private ISysFileService sysFileService;
@@ -40,7 +33,7 @@
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 202fdab..76ed208 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 @@
* 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 ff96253..5a35348 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 @@
* 文件上传接口
*
* @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 ca5b8b9..2350560 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 @@
*/
@Value("${file.domain}")
public String domain;
+
+ /**
+ * 上传文件存储在本地的根路径
+ */
+ @Value("${file.path}")
+ private String localFilePath;
/**
* 本地文件上传接口
@@ -35,9 +41,9 @@
* @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 18a0378..48a089d 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -60,19 +60,13 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
- <!-- Ruoyi Common Security-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common-security</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>
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index affe40b..02718d6 100644
--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -66,19 +66,13 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
- <!-- Ruoyi Common Security-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common-security</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>
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index ee6755c..4d6fd94 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -54,34 +54,22 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
- <!-- Ruoyi Common Security -->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common-security</artifactId>
- </dependency>
-
- <!-- Ruoyi Common Datascope -->
+ <!-- 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>
--
Gitblit v1.9.3