From 298a420d8fa2435e2ca2fd7f4afa47118695f6bf Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 20:33:35 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/ExportController.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/ExportController.java b/src/main/java/com/lf/server/controller/show/ExportController.java
index abd0c49..5bf50b2 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -114,12 +114,14 @@
         try {
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue == null) {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�"));
+                writeInfo(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�", res);
+                return;
             }
 
             DownloadEntity de = downloadService.selectByGuid(guid);
             if (de == null) {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�"));
+                writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
+                return;
             }
 
             de.setDcount(de.getDcount() + 1);
@@ -129,11 +131,15 @@
             String filePath = exportService.getDownloadFilePath(de);
             WebHelper.download(filePath, de.getName(), res);
         } catch (Exception ex) {
-            try {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, ex.getMessage()));
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-            }
+            writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
+        }
+    }
+
+    private void writeInfo(HttpStatus status, String info, HttpServletResponse res) {
+        try {
+            WebHelper.write2Page(res, WebHelper.getErrJson(status, info));
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
         }
     }
 }

--
Gitblit v1.9.3