From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/all/CommonsFileuploadService.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/CommonsFileuploadService.java b/src/main/java/com/lf/server/service/all/CommonsFileuploadService.java
index 95c3b69..e86abd4 100644
--- a/src/main/java/com/lf/server/service/all/CommonsFileuploadService.java
+++ b/src/main/java/com/lf/server/service/all/CommonsFileuploadService.java
@@ -1,15 +1,14 @@
package com.lf.server.service.all;
-import com.lf.server.entity.ctrl.FileInfo;
-import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.entity.ctrl.FileInfoEntity;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload.servlet.ServletRequestContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.tomcat.util.http.fileupload.FileItem;
-import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
-import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload;
-import org.apache.tomcat.util.http.fileupload.servlet.ServletRequestContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,10 +31,10 @@
private final static Log log = LogFactory.getLog(CommonsFileuploadService.class);
- public Object fileUpload(UserEntity ue, HttpServletRequest req, HttpServletResponse res) throws Exception {
+ public Object fileUpload(HttpServletRequest req, HttpServletResponse res) throws Exception {
List<FileItem> items = getFileItem(req, res);
- return copeFileItems(ue, items, req);
+ return copeFileItems(items, req);
}
/**
@@ -70,11 +69,11 @@
/**
* 澶勭悊瑙ｆ瀽鍐呭锛氬鐞嗘櫘閫氳〃鍗曞煙鍜屾枃浠惰〃鍗曞煙
*/
- private Object copeFileItems(UserEntity ue, List<FileItem> items, HttpServletRequest req) throws Exception {
+ private Object copeFileItems(List<FileItem> items, HttpServletRequest req) throws Exception {
Map<String, String> map = new HashMap<String, String>(3);
- List<FileInfo> list = new ArrayList<FileInfo>();
+ List<FileInfoEntity> list = new ArrayList<FileInfoEntity>();
- String path = pathHelper.getTempPath(ue.getId());
+ String path = pathHelper.getTempPath();
for (FileItem item : items) {
if (item.isFormField()) {
String key = item.getFieldName();
@@ -83,7 +82,7 @@
continue;
}
- FileInfo fi = copeFile(item, path, req);
+ FileInfoEntity fi = copeFile(item, path, req);
if (fi != null) {
list.add(fi);
}
@@ -95,10 +94,10 @@
/**
* 澶勭悊鏂囦欢
*/
- private FileInfo copeFile(FileItem item, String path, HttpServletRequest req) {
+ private FileInfoEntity copeFile(FileItem item, String path, HttpServletRequest req) {
try {
// 鑾峰彇鏂囦欢鍚嶏紝鍒ゆ柇鏄惁鍚堟硶
- FileInfo fi = new FileInfo(item.getName());
+ FileInfoEntity fi = new FileInfoEntity(item.getName());
if (StringHelper.isEmpty(fi.getFileName())) {
return null;
}
@@ -109,7 +108,7 @@
return fi;
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage(), ex);
return null;
}
}
--
Gitblit v1.9.3