From 7291e1bf54748fc8043d98263b3a15ea5a3a4da3 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 15 Apr 2024 09:34:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9D=90=E6=96=99=E6=A0=A1=E9=AA=8C?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hyp/web/controller/reward/FileRelationController.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/reward/FileRelationController.java b/hyp-admin/src/main/java/com/hyp/web/controller/reward/FileRelationController.java
index 7249768..4ff144b 100644
--- a/hyp-admin/src/main/java/com/hyp/web/controller/reward/FileRelationController.java
+++ b/hyp-admin/src/main/java/com/hyp/web/controller/reward/FileRelationController.java
@@ -12,6 +12,7 @@ import com.hyp.web.controller.manager.FileRelationManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -51,7 +52,7 @@ public class FileRelationController extends BaseController {
@PostMapping("/upload")
public AjaxResult uploadFile(MultipartFile file,
@RequestParam String applyId,
- @RequestParam String filename,
+ @RequestParam(required = false) String filename,
@RequestParam String fileCode) {
try {
// 上传文件路径
@@ -59,6 +60,9 @@ public class FileRelationController extends BaseController {
// 上传并返回新文件名称
String fileNames = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileNames;
+ if(StringUtils.isBlank(filename)){
+ filename = fileNames;
+ }
String originalFilename = FileUtils.getNameNotSuffix(file.getOriginalFilename()) ;
return AjaxResult.success(fileRelationManager.save(applyId,filename,fileCode,url,originalFilename));
} catch (Exception e) {