From bd6c08aece8375ad1785f63b7311227dc9e80543 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期四, 12 十月 2023 14:43:18 +0800
Subject: [PATCH] 测试自动部署17
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 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 16033c1..b581239 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
@@ -111,14 +111,14 @@
* 閫氱敤涓婁紶璇锋眰锛堝崟涓級
*/
@PostMapping("/upload")
- public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file) throws Exception
+ public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file,String fname) throws Exception
{
try
{
// 涓婁紶鏂囦欢璺緞
String filePath = RuoYiConfig.getUploadPath();
// 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
- String fileName = FileUploadUtils.upload(filePath, file);
+ String fileName = FileUploadUtils.upload(filePath, file,fname);
String url = serverConfig.getUrl() + fileName;
AjaxResult ajax = AjaxResult.success();
@@ -139,42 +139,42 @@
}
}
- /**
- * 閫氱敤涓婁紶璇锋眰锛堝涓級
- */
- @PostMapping("/uploads")
- public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
- {
- try
- {
- // 涓婁紶鏂囦欢璺緞
- String filePath = RuoYiConfig.getUploadPath();
- List<String> urls = new ArrayList<String>();
- List<String> fileNames = new ArrayList<String>();
- List<String> newFileNames = new ArrayList<String>();
- List<String> originalFilenames = new ArrayList<String>();
- for (MultipartFile file : files)
- {
- // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
- String fileName = FileUploadUtils.upload(filePath, file);
- String url = serverConfig.getUrl() + fileName;
- urls.add(url);
- fileNames.add(fileName);
- newFileNames.add(FileUtils.getName(fileName));
- originalFilenames.add(file.getOriginalFilename());
- }
- AjaxResult ajax = AjaxResult.success();
- ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
- ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
- ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
- ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
- return ajax;
- }
- catch (Exception e)
- {
- return AjaxResult.error(e.getMessage());
- }
- }
+// /**
+// * 閫氱敤涓婁紶璇锋眰锛堝涓級
+// */
+// @PostMapping("/uploads")
+// public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
+// {
+// try
+// {
+// // 涓婁紶鏂囦欢璺緞
+// String filePath = RuoYiConfig.getUploadPath();
+// List<String> urls = new ArrayList<String>();
+// List<String> fileNames = new ArrayList<String>();
+// List<String> newFileNames = new ArrayList<String>();
+// List<String> originalFilenames = new ArrayList<String>();
+// for (MultipartFile file : files)
+// {
+// // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+// String fileName = FileUploadUtils.upload(filePath, file);
+// String url = serverConfig.getUrl() + fileName;
+// urls.add(url);
+// fileNames.add(fileName);
+// newFileNames.add(FileUtils.getName(fileName));
+// originalFilenames.add(file.getOriginalFilename());
+// }
+// AjaxResult ajax = AjaxResult.success();
+// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+// ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
+// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+// return ajax;
+// }
+// catch (Exception e)
+// {
+// return AjaxResult.error(e.getMessage());
+// }
+// }
/**
* 鏈湴璧勬簮閫氱敤涓嬭浇
--
Gitblit v1.9.1