|
@@ -4,6 +4,9 @@ import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+
|
|
|
+import org.dromara.x.file.storage.core.FileInfo;
|
|
|
+import org.dromara.x.file.storage.core.FileStorageService;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -35,6 +38,9 @@ public class CommonController
|
|
|
@Autowired
|
|
|
private ServerConfig serverConfig;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private FileStorageService fileStorageService;
|
|
|
+
|
|
|
private static final String FILE_DELIMETER = ",";
|
|
|
|
|
|
/**
|
|
@@ -77,15 +83,16 @@ public class CommonController
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- // 上传文件路径
|
|
|
- String filePath = RuoYiConfig.getUploadPath();
|
|
|
- // 上传并返回新文件名称
|
|
|
- String fileName = FileUploadUtils.upload(filePath, file);
|
|
|
- String url = serverConfig.getUrl() + fileName;
|
|
|
+// // 上传文件路径
|
|
|
+// String filePath = RuoYiConfig.getUploadPath();
|
|
|
+// // 上传并返回新文件名称
|
|
|
+// String fileName = FileUploadUtils.upload(filePath, file);
|
|
|
+// String url = serverConfig.getUrl() + fileName;
|
|
|
+ FileInfo fileInfo = fileStorageService.of(file).upload();
|
|
|
AjaxResult ajax = AjaxResult.success();
|
|
|
- ajax.put("url", url);
|
|
|
- ajax.put("fileName", fileName);
|
|
|
- ajax.put("newFileName", FileUtils.getName(fileName));
|
|
|
+ ajax.put("url", fileInfo.getUrl());
|
|
|
+ ajax.put("fileName", fileInfo.getFilename());
|
|
|
+ ajax.put("newFileName", fileInfo.getFilename());
|
|
|
ajax.put("originalFilename", file.getOriginalFilename());
|
|
|
return ajax;
|
|
|
}
|