From fc468a1c83be3997f9a7f32c6f61bc2795594579 Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期一, 03 七月 2023 14:15:39 +0800
Subject: [PATCH] 版本上传异常修复
---
src/main/resources/application-guotai-uat.yml | 8 ++++----
src/main/java/com/ruoyi/project/common/CommonController.java | 37 +++++++++++++++++++++++++++----------
2 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index 7ab2607..b7af2f9 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -3,6 +3,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.velocity.runtime.directive.Foreach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,9 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartHttpServletRequest;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
/**
@@ -143,20 +147,33 @@
}
}
+ /**
+ * 客户端版本控制APP上传
+ * @param request
+ * @return AjaxResult
+ * @throws Exception
+ */
@PostMapping("/tr/upload")
@ResponseBody
- public AjaxResult uploadImgForSpread(MultipartFile file) throws Exception {
+ public AjaxResult uploadImgForSpread(HttpServletRequest request, HttpServletResponse response) throws Exception {
try {
- // 上传文件路径
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Iterator<String> iter = multipartRequest.getFileNames();
String filePath = RuoYiConfig.getUploadPath();
- // 上传并返回新文件名称
- String fileName = FileUploadUtils.upload(filePath, file);
- String url = serverConfig.getUrl() + fileName;
- AjaxResult ajax = AjaxResult.success();
- ajax.put("imageName", fileName);
- ajax.put("imageUrl", url);
-
- return ajax;
+ while (iter.hasNext()) {
+ List<MultipartFile> files = multipartRequest.getFiles(iter.next());
+ for (MultipartFile file : files) {
+ // 上传并返回新文件名称
+ String fileName = FileUploadUtils.upload(filePath, file);
+ String url = serverConfig.getUrl() + fileName;
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("imageName", fileName);
+ ajax.put("imageUrl", url);
+ return ajax;
+ }
+ }
+ return AjaxResult.error("未获取到上传文件");
+
} catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
diff --git a/src/main/resources/application-guotai-uat.yml b/src/main/resources/application-guotai-uat.yml
index bdd014a..1dd3a11 100644
--- a/src/main/resources/application-guotai-uat.yml
+++ b/src/main/resources/application-guotai-uat.yml
@@ -86,10 +86,10 @@
# redis
redis:
- host: 192.168.30.107
- port: 6362
- password: aHIAC88NB98t8bju89 # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
- database: 0 # Redis 数据库号，默认为 0
+ host: 127.0.0.1
+ port: 6379
+ #password: aHIAC88NB98t8bju89 # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
+ database: 14 # Redis 数据库号，默认为 0
timeout: 15000 # Redis 连接超时时间，单位：毫秒。
lettuce:
pool:
--
Gitblit v1.9.2