Merge remote-tracking branch 'origin/dev' into satoken

# Conflicts: # ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
2025-09-24 07:19:46 +08:00 · 2021-09-27 17:27:32 +08:00
parent 6976c7f386 99dcbe0207
commit b082da73a1
25 changed files with 100 additions and 132 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
@ -35,6 +35,7 @@ public class FileUtils extends FileUtil
                .append(percentEncodedFileName);

        response.setHeader("Content-disposition", contentDispositionValue.toString());
+        response.setHeader("download-filename", percentEncodedFileName);
    }

    /**