From fc4b360e4ce47c29cc96f941d37d22a225a139b1 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 29 七月 2023 10:37:32 +0800
Subject: [PATCH] 56187

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java |  107 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 70 insertions(+), 37 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 1cad5e4..16033c1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.common;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -10,8 +11,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
-import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -41,41 +42,68 @@
 
     private static final String FILE_DELIMETER = ",";
 
-    /**
-     * 閫氱敤涓嬭浇璇锋眰
-     * 
-     * @param fileName 鏂囦欢鍚嶇О
-     * @param delete 鏄惁鍒犻櫎
-     */
-    @GetMapping("/download")
-    public void fileDownload(@PathParam("fileName") String fileName, @PathParam("delete") Boolean delete, HttpServletResponse response, HttpServletRequest request)
-    {
-        try
-        {
-            if (!FileUtils.checkAllowDownload(fileName))
-            {
-                throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", fileName));
-            }
-            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
-            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+//    @GetMapping("/downloadFile")
+//    public void fileDownload(@PathParam("path") String path, HttpServletResponse response)
+//    {
+//        path=path.substring(8);
+//        try
+//        {
+//            if (!FileUtils.checkAllowDownload(path))
+//            {
+//                throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", path));
+//            }
+//            String realFileName = System.currentTimeMillis() + path.substring(path.indexOf("_") + 1);
+//            String filePath = RuoYiConfig.getProfile() + path;
+//
+//            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+//            FileUtils.setAttachmentResponseHeader(response, realFileName);
+//            FileUtils.writeBytes(filePath, response.getOutputStream());
+//
+//        }
+//        catch (Exception e)
+//        {
+//            log.error("涓嬭浇鏂囦欢澶辫触", e);
+//        }
+//    }
 
-            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-            FileUtils.setAttachmentResponseHeader(response, realFileName);
-            FileUtils.writeBytes(filePath, response.getOutputStream());
-            if (delete)
-            {
-                FileUtils.deleteFile(filePath);
-            }
-        }
-        catch (Exception e)
-        {
-            log.error("涓嬭浇鏂囦欢澶辫触", e);
-        }
-    }
+
+
+
+//    /**
+//     * 閫氱敤涓嬭浇璇锋眰
+//     *
+//     * @param fileName 鏂囦欢鍚嶇О
+//     * @param delete 鏄惁鍒犻櫎
+//     */
+//    @GetMapping("/download")
+//    public void fileDownload(@PathParam("fileName") String fileName, @PathParam("delete") Boolean delete, HttpServletResponse response)
+//    {
+//        try
+//        {
+//            if (!FileUtils.checkAllowDownload(fileName))
+//            {
+//                throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", fileName));
+//            }
+//            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+//            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+//
+//            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+//            FileUtils.setAttachmentResponseHeader(response, realFileName);
+//            FileUtils.writeBytes(filePath, response.getOutputStream());
+//            if (delete)
+//            {
+//                FileUtils.deleteFile(filePath);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            log.error("涓嬭浇鏂囦欢澶辫触", e);
+//        }
+//    }
 
     @GetMapping("/downLoadFile")
-    public AjaxResult downLoadFile(@RequestParam("path") String path,HttpServletResponse response) throws Exception {
-        return downLoadFileService.downLoadFile(path,response);
+    public void downLoadFile(@PathParam("path") String path, HttpServletResponse response) throws Exception {
+        downLoadFileService.downLoadFile(path,response);
     }
 
 
@@ -94,10 +122,15 @@
             String url = serverConfig.getUrl() + fileName;
 
             AjaxResult ajax = AjaxResult.success();
-            ajax.put("url", url);
-            ajax.put("fileName", fileName);
-            ajax.put("newFileName", FileUtils.getName(fileName));
-            ajax.put("originalFilename", file.getOriginalFilename());
+
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("url", url);
+            data.put("fileName", fileName);
+            data.put("newFileName", FileUtils.getName(fileName));
+            data.put("originalFilename", file.getOriginalFilename());
+
+            ajax.put("msg","鎿嶄綔鎴愬姛");
+            ajax.put("data",data);
             return ajax;
         }
         catch (Exception e)

--
Gitblit v1.9.1