From 249d316e0b8c79b71b779b5716bc488e1d08a9b3 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 14:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev

---
 src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java b/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
index 87b8024..4ccc300 100644
--- a/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
+++ b/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
@@ -195,18 +195,24 @@
      */
     public static File downloadFile(String fileUrl) {
         File downloadedFile = null;
+
         try {
             URL url = new URL(fileUrl);
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("GET");
-            downloadedFile = new File(File.createTempFile("temp", ".jpeg").toURI());
-            InputStream inputStream = connection.getInputStream();
-            OutputStream outputStream = new FileOutputStream(downloadedFile);
-            byte[] buffer = new byte[1024];
-            int bytesRead;
-            while ((bytesRead = inputStream.read(buffer)) != -1) {
-                outputStream.write(buffer, 0, bytesRead);
 
+            // 创建临时文件
+            File tempFile = File.createTempFile("temp", ".jpeg");
+            downloadedFile = tempFile;
+
+            // 使用 try-with-resources 确保流被关闭
+            try (InputStream inputStream = connection.getInputStream();
+                 OutputStream outputStream = new FileOutputStream(downloadedFile)) {
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
             }
         } catch (IOException e) {
             e.printStackTrace();

--
Gitblit v1.9.3