From 0e84067bf2455091a933330890d91141e353eeff Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 21 十月 2022 10:05:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/UploaderService.java | 93 +---------------------------------------------
1 files changed, 3 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/UploaderService.java b/src/main/java/com/lf/server/service/data/UploaderService.java
index f12f164..a29729b 100644
--- a/src/main/java/com/lf/server/service/data/UploaderService.java
+++ b/src/main/java/com/lf/server/service/data/UploaderService.java
@@ -1,6 +1,5 @@
package com.lf.server.service.data;
-import com.lf.server.entity.ctrl.FileInfo;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.FileHelper;
@@ -8,10 +7,6 @@
import com.lf.server.helper.StringHelper;
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;
import org.springframework.web.multipart.MultipartFile;
@@ -44,7 +39,7 @@
res.setContentType("application/json;charset=utf-8");
setEntity(t, req);
- List<MetaFileEntity> list = getFiles(req);
+ List<MetaFileEntity> list = getFiles(ue, req);
return list;
}
@@ -90,10 +85,10 @@
/**
* 鑾峰彇鏂囦欢
*/
- private List<MetaFileEntity> getFiles(StandardMultipartHttpServletRequest req) throws Exception {
+ private List<MetaFileEntity> getFiles(UserEntity ue, StandardMultipartHttpServletRequest req) throws Exception {
List<MetaFileEntity> list = new ArrayList<MetaFileEntity>();
- String path = pathHelper.getTempPath();
+ String path = pathHelper.getTempPath(ue.getId());
Iterator<String> iterator = req.getFileNames();
while (iterator.hasNext()) {
MultipartFile file = req.getFile(iterator.next());
@@ -114,88 +109,6 @@
}
return list;
- }
-
- public Object fileUpload(HttpServletRequest req, HttpServletResponse res) throws Exception {
- List<FileItem> items = getFileItem(req, res);
-
- return copeFileItems(items, req);
- }
-
- /**
- * 鑾峰彇鏂囦欢椤�
- */
- private List<FileItem> getFileItem(HttpServletRequest req, HttpServletResponse res) throws Exception {
- // 澶勭悊涓枃涔辩爜闂
- req.setCharacterEncoding("utf-8");
- // text/html;charset=utf-8
- res.setContentType("application/json;charset=utf-8");
-
- // 妫�鏌ヨ姹傛槸/鍚︿负multipart/form-data绫诲瀷
- if (!ServletFileUpload.isMultipartContent(req)) {
- throw new RuntimeException("琛ㄥ崟鐨別nctype灞炴�т笉鏄痬ultipart/form-data绫诲瀷");
- }
-
- // 鍒涘缓涓婁紶鎵�闇�瑕佺殑涓や釜瀵硅薄锛氱鐩樻枃浠跺璞�+鏂囦欢涓婁紶瀵硅薄
- DiskFileItemFactory factory = new DiskFileItemFactory();
- ServletFileUpload sfu = new ServletFileUpload(factory);
- ServletRequestContext ctx = new ServletRequestContext(req);
-
- // 璁剧疆缂栫爜鏂瑰紡
- sfu.setHeaderEncoding("utf-8");
- factory.setSizeThreshold(4096);
-
- // 鑾峰彇琛ㄥ崟涓殑鎵�鏈夋暟鎹俊鎭�
- List<FileItem> list = sfu.parseRequest(ctx);
-
- return list;
- }
-
- /**
- * 澶勭悊瑙ｆ瀽鍐呭锛氬鐞嗘櫘閫氳〃鍗曞煙鍜屾枃浠惰〃鍗曞煙
- */
- 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>();
-
- String path = pathHelper.getTempPath();
- for (FileItem item : items) {
- if (item.isFormField()) {
- String key = item.getFieldName();
- String value = item.getString("utf-8");
- map.put(key, value);
- continue;
- }
-
- FileInfo fi = copeFile(item, path, req);
- if (fi != null) {
- list.add(fi);
- }
- }
-
- return map;
- }
-
- /**
- * 澶勭悊鏂囦欢
- */
- private FileInfo copeFile(FileItem item, String path, HttpServletRequest req) {
- try {
- // 鑾峰彇鏂囦欢鍚嶏紝鍒ゆ柇鏄惁鍚堟硶
- FileInfo fi = new FileInfo(item.getName());
- if (StringHelper.isEmpty(fi.getFileName())) {
- return null;
- }
-
- fi.setSize(item.getSize());
- fi.setPath(path + File.separator + fi.getFileName());
- item.write(new File(fi.getPath()));
-
- return fi;
- } catch (Exception ex) {
- log.error(ex.getStackTrace());
- return null;
- }
}
/**
--
Gitblit v1.9.3