Merge remote-tracking branch 'origin/master'

无关风月

2026-01-29 e395159a34f973fce6ba08fb22ab2d0b09f64d3a

 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;