From b3ef4adfed7b59480714819ee58a328e9bcc26a2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 07 Nov 2024 22:25:48 +0800
Subject: [PATCH] 支持自定义显示Excel属性列
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 deletions(-)
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 968cdc7..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,11 +3,11 @@
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;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.file.FileUtils;
import com.ruoyi.file.service.ISysFileService;
import com.ruoyi.system.api.domain.SysFile;
@@ -21,24 +21,6 @@
{
private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
- /**
- * 上传文件存储在本地的根路径
- */
- @Value("${file.path}")
- private String localFilePath;
-
- /**
- * 资源映射路径 前缀
- */
- @Value("${file.prefix}")
- public String localFilePrefix;
-
- /**
- * 域名或本机访问地址
- */
- @Value("${file.domain}")
- public String domain;
-
@Autowired
private ISysFileService sysFileService;
@@ -50,11 +32,10 @@
{
try
{
- // 上传并返回新文件名称
- String fileName = sysFileService.uploadFile(file, localFilePath);
- String url = domain + localFilePrefix + fileName;
+ // 上传并返回访问地址
+ String url = sysFileService.uploadFile(file);
SysFile sysFile = new SysFile();
- sysFile.setName(fileName);
+ sysFile.setName(FileUtils.getName(url));
sysFile.setUrl(url);
return R.ok(sysFile);
}
--
Gitblit v1.9.3