From 27d48268c5384c8e809c2d37f3da851e92d96c3a Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 30 三月 2023 17:33:26 +0800
Subject: [PATCH] 个人模块的所有内容
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 f424327..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,16 +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.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 +35,9 @@
@Autowired
private ServerConfig serverConfig;
+
+ @Autowired
+ private DownLoadFileService downLoadFileService;
private static final String FILE_DELIMETER = ",";
@@ -69,11 +73,17 @@
}
}
+ @GetMapping("/downLoadFile")
+ public void downLoadFile(@PathParam("path") String path, HttpServletResponse response) throws Exception {
+ 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
{
@@ -84,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