From 2b4f7b70965326f9bfdd794add2b1d1c542d6fb7 Mon Sep 17 00:00:00 2001
From: fzhang5 <fzhang5@amarsoft>
Date: Mon, 14 Jul 2025 18:17:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                             | 2 +-
 pom.xml                                                | 8 +-------
 src/main/java/com/rabbiter/em/service/FileService.java | 5 ++++-
 src/main/resources/application-dev.yml                 | 4 ++--
 src/main/resources/application.yml                     | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00697e1..e6ebc35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-。idea/
+.idea/
 target/
 *.iml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index efa49a5..07b9b11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,7 @@
                     <!--指定打包的配置文件，且用filtering设置开启过滤-->
                     <include>application*.yml</include><!--这里使用占位符进行动态引用以确定具体的打包文件-->
                     <include>application.yml</include><!--主配置文件必须打包-->
+                    <include>**/*.xml</include>  <!-- 包含所有 XML -->
                 </includes>
                 <filtering>true</filtering><!--开启过滤，在打包时application.yml中配置的@env@将被确定到底是什么变量-->
             </resource>
@@ -166,13 +167,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.sun.xml.fastinfoset</groupId>
-            <artifactId>FastInfoset</artifactId>
-            <version>1.2.18</version>
-        </dependency>
-
-
     </dependencies>
 
     <repositories>
diff --git a/src/main/java/com/rabbiter/em/service/FileService.java b/src/main/java/com/rabbiter/em/service/FileService.java
index 1832dd5..a1d38d3 100644
--- a/src/main/java/com/rabbiter/em/service/FileService.java
+++ b/src/main/java/com/rabbiter/em/service/FileService.java
@@ -92,9 +92,12 @@ public class FileService extends ServiceImpl<FileMapper, MyFile> {
             throw new ServiceException(constants.CODE_500,"文件不存在");
         }
         try {
-            ServletOutputStream os = response.getOutputStream();
+            response.reset();
             response.addHeader("Content-Disposition","attachment;filename="+ URLEncoder.encode(fileName,"UTF-8"));
             response.setContentType("application/octet-stream");
+
+            ServletOutputStream os = response.getOutputStream();
+
             os.write(FileUtil.readBytes(file));
             os.flush();
             os.close();
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 5b31922..c968283 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -23,5 +23,5 @@ spring:
     connect-timeout: 30000ms
 
 file:
-  file: /home/fzhang5/file/file/
-  avatar: /home/fzhang5/file/avatar/
+  file: D:/devWorkSpace/file/
+  avatar: D:/devWorkSpace/avatar/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3a386da..4e88f27 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,4 +7,4 @@ mybatis:
     map-underscore-to-camel-case: true
 spring:
   profiles:
-    active: @profile@
+    active: test