From 2bcbf32c439a5d7fbb20234b86e410347d5b806f Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 15 四月 2023 16:04:48 +0800
Subject: [PATCH] 456
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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..6c13276 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;
@@ -11,7 +12,6 @@
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;
@@ -74,8 +74,8 @@
}
@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 +94,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