From 2c81a68b6162482637ebb5726df0b227a9d616f5 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 10 十月 2023 18:51:50 +0800
Subject: [PATCH] 237846
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 76 ++++++++++++------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 46 +++++++-------
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 17 +++--
3 files changed, 71 insertions(+), 68 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());
+// }
+// }
/**
* 鏈湴璧勬簮閫氱敤涓嬭浇
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 87a6e60..29ab531 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -115,27 +115,27 @@
return error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- /**
- * 澶村儚涓婁紶
- */
- @Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
- @PostMapping("/avatar")
- public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
- {
- if (!file.isEmpty())
- {
- LoginUser loginUser = getLoginUser();
- String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
- if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("imgUrl", avatar);
- // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
- loginUser.getUser().setAvatar(avatar);
- tokenService.setLoginUser(loginUser);
- return ajax;
- }
- }
- return error("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
+// /**
+// * 澶村儚涓婁紶
+// */
+// @Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
+// @PostMapping("/avatar")
+// public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
+// {
+// if (!file.isEmpty())
+// {
+// LoginUser loginUser = getLoginUser();
+// String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
+// if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+// {
+// AjaxResult ajax = AjaxResult.success();
+// ajax.put("imgUrl", avatar);
+// // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
+// loginUser.getUser().setAvatar(avatar);
+// tokenService.setLoginUser(loginUser);
+// return ajax;
+// }
+// }
+// return error("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
+// }
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index b1a5698..3e9f99a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -54,11 +54,11 @@
* @return 鏂囦欢鍚嶇О
* @throws Exception
*/
- public static final String upload(MultipartFile file) throws IOException
+ public static final String upload(MultipartFile file,String fname) throws IOException
{
try
{
- return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION,fname);
}
catch (Exception e)
{
@@ -74,11 +74,11 @@
* @return 鏂囦欢鍚嶇О
* @throws IOException
*/
- public static final String upload(String baseDir, MultipartFile file) throws IOException
+ public static final String upload(String baseDir, MultipartFile file,String fname) throws IOException
{
try
{
- return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION,fname);
}
catch (Exception e)
{
@@ -98,7 +98,7 @@
* @throws IOException 姣斿璇诲啓鏂囦欢鍑洪敊鏃�
* @throws InvalidExtensionException 鏂囦欢鏍￠獙寮傚父
*/
- public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
+ public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension,String fname)
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
InvalidExtensionException
{
@@ -110,7 +110,7 @@
assertAllowed(file, allowedExtension);
- String fileName = extractFilename(file);
+ String fileName = extractFilename(file,fname);
String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
file.transferTo(Paths.get(absPath));
@@ -120,8 +120,11 @@
/**
* 缂栫爜鏂囦欢鍚�
*/
- public static final String extractFilename(MultipartFile file)
+ public static final String extractFilename(MultipartFile file,String fname)
{
+ if (StringUtils.isNotEmpty(fname)){
+ return fname+'.'+getExtension(file);
+ }
return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
}
--
Gitblit v1.9.1