From e395159a34f973fce6ba08fb22ab2d0b09f64d3a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 29 一月 2026 17:41:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
index 9174fd2..10f4271 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -466,7 +466,7 @@
}
private ResponseEntity<org.springframework.core.io.Resource> downloadFile(UserFile userFile) throws IOException {
- InputStreamResource resource =resolveResource(userFile);
+ InputStreamResource resource =userFileService.resolveResource(userFile);
var fileSize = userFile.getSize();
// if(resource == null) {
// resource = new InputStreamResource(getClass().getClassLoader().getResourceAsStream("images/wukong.png"));
@@ -482,15 +482,6 @@
.body(resource);
}
- public InputStreamResource resolveResource(UserFile userFile) throws IOException {
- var filePath = fileLocation.resolve(userFile.getName() + "." + userFile.getExtension()).normalize();
- if(!Files.exists(filePath)){
- return null;
- }
- return new InputStreamResource(Files.newInputStream(filePath));
- }
-
- private Path fileLocation;
@@ -498,14 +489,14 @@
private String UPLOAD_DIR;
- @PostConstruct
- void init(){
- fileLocation = Path.of(UPLOAD_DIR).toAbsolutePath().normalize();
- try {
- Files.createDirectories(this.fileLocation);
- } catch (Exception ex) {
- throw new RuntimeException("Could not create the directory where the uploaded files will be stored.", ex);
- }
- }
+// @PostConstruct
+// void init(){
+// fileLocation = Path.of(UPLOAD_DIR).toAbsolutePath().normalize();
+// try {
+// Files.createDirectories(this.fileLocation);
+// } catch (Exception ex) {
+// throw new RuntimeException("Could not create the directory where the uploaded files will be stored.", ex);
+// }
+// }
}
--
Gitblit v1.7.1