From 2359d3d39ec6af70657a5683eaaf34f495215992 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期日, 19 三月 2023 21:29:30 +0800
Subject: [PATCH] 222
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 922c03d..237495c 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
@@ -6,10 +6,13 @@
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
+import com.ruoyi.domain.PathParams;
+import com.ruoyi.service.DownLoadFileService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -34,6 +37,9 @@
@Autowired
private ServerConfig serverConfig;
+ @Autowired
+ private DownLoadFileService downLoadFileService;
+
private static final String FILE_DELIMETER = ",";
/**
@@ -43,7 +49,7 @@
* @param delete 鏄惁鍒犻櫎
*/
@GetMapping("/download")
- public void fileDownload(@PathParam("fileName") String fileName,@PathParam("delete") Boolean delete, HttpServletResponse response, HttpServletRequest request)
+ public void fileDownload(@PathParam("fileName") String fileName, @PathParam("delete") Boolean delete, HttpServletResponse response, HttpServletRequest request)
{
try
{
@@ -68,11 +74,17 @@
}
}
+ @GetMapping("/downLoadFile")
+ public AjaxResult downLoadFile(@PathParam("path") String path, HttpServletResponse response) throws Exception {
+ return downLoadFileService.downLoadFile(path,response);
+ }
+
+
/**
* 閫氱敤涓婁紶璇锋眰锛堝崟涓級
*/
@PostMapping("/upload")
- public AjaxResult uploadFile(@RequestParam("uploadFile")MultipartFile file) throws Exception
+ public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file) throws Exception
{
try
{
--
Gitblit v1.9.1