From f4c591df7d87b6276caa9aa09602c128bedcf738 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期三, 22 三月 2023 14:52:21 +0800
Subject: [PATCH] 导入接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 237495c..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,18 +1,17 @@
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;
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;
@@ -75,8 +74,8 @@
}
@GetMapping("/downLoadFile")
- public AjaxResult downLoadFile(@PathParam("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);
}
@@ -95,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