THENG
/
a-ruoyi-file
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: THENG:main
Branches Tags
THENG:main
THENG:test
THENG:dev
..
compare: THENG:test
Branches Tags
THENG:main
THENG:test
THENG:dev

No commits in common. "main" and "test" have entirely different histories.
main ... test

6 changed files with 53 additions and 82 deletions
Show Stats Expand all files Collapse all files

1
readme.md
View File

@ -0,0 +1 @@
dda

52
src/main/java/com/ruoyi/file/controller/SysFileController.java
View File

@ -1,10 +1,5 @@
package com.ruoyi.file.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.file.FileUtils;
import com.ruoyi.file.service.ISysFileService;
import com.ruoyi.system.api.domain.SysFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,14 +7,20 @@ import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.file.FileUtils;
import com.ruoyi.file.service.ISysFileService;
import com.ruoyi.system.api.domain.SysFile;
/**
* 文件请求处理
*
*
* @author ruoyi
*/
@RestController
public class SysFileController {
public class SysFileController
{
private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
@Autowired
@ -29,15 +30,19 @@ public class SysFileController {
* 文件上传请求
*/
@PostMapping("upload")
public R<SysFile> upload(MultipartFile file) {
try {
public R<SysFile> upload(MultipartFile file)
{
try
{
// 上传并返回访问地址
String url = sysFileService.uploadFile(file);
SysFile sysFile = new SysFile();
sysFile.setName(FileUtils.getName(url));
sysFile.setUrl(url);
return R.ok(sysFile);
} catch (Exception e) {
}
catch (Exception e)
{
log.error("上传文件失败", e);
return R.fail(e.getMessage());
}
@ -47,30 +52,21 @@ public class SysFileController {
* 文件删除请求
*/
@DeleteMapping("delete")
public R<Boolean> delete(String fileUrl) {
try {
if (!FileUtils.validateFilePath(fileUrl)) {
public R<Boolean> delete(String fileUrl)
{
try
{
if (!FileUtils.validateFilePath(fileUrl))
{
throw new Exception(StringUtils.format("资源文件({})非法，不允许删除。 ", fileUrl));
}
sysFileService.deleteFile(fileUrl);
return R.ok();
} catch (Exception e) {
}
catch (Exception e)
{
log.error("删除文件失败", e);
return R.fail(e.getMessage());
}
}
/**
* 文件流上传请求
*/
@PostMapping("uploadStream")
public R<String> uploadFileByStream(String filename, String extension, String data) {
try {
return R.ok(sysFileService.uploadFileByData(filename, extension, data));
} catch (Exception e) {
log.error("上传文件失败", e);
return R.fail(e.getMessage());
}
}
}

4
src/main/java/com/ruoyi/file/service/ISysFileService.java
View File

@ -2,6 +2,8 @@ package com.ruoyi.file.service;
import org.springframework.web.multipart.MultipartFile;
import java.io.ByteArrayOutputStream;
/**
* 文件上传接口
*
@ -34,5 +36,5 @@ public interface ISysFileService {
* @param out 上传的流
* @return 访问地址
*/
String uploadFileByData(String filename, String extension, String out) throws Exception;
String uploadFileByStream(String filename, String extension, ByteArrayOutputStream out) throws Exception;
}

8
src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.file.FileUtils;
import com.ruoyi.file.utils.FileUploadUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@ -16,8 +16,8 @@ import java.io.ByteArrayOutputStream;
*
* @author ruoyi
*/
@Primary
@Service
@ConditionalOnProperty(name = "file.storage", havingValue = "local")
public class LocalSysFileServiceImpl implements ISysFileService {
/**
* 资源映射路径 前缀
@ -71,8 +71,8 @@ public class LocalSysFileServiceImpl implements ISysFileService {
* @return 访问地址
*/
@Override
public String uploadFileByData(String filename, String extension, String out) throws Exception {
try (ByteArrayInputStream in = new ByteArrayInputStream(out.getBytes())) {
public String uploadFileByStream(String filename, String extension, ByteArrayOutputStream out) throws Exception {
try (ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) {
String fileName = FileUploadUtils.extractFilename(filename, extension);
return FileUploadUtils.uploadByStream(localFilePath, fileName, in);
} catch (Exception e) {

14
src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
View File

@ -8,7 +8,6 @@ import io.minio.MinioClient;
import io.minio.PutObjectArgs;
import io.minio.RemoveObjectArgs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@ -22,7 +21,6 @@ import java.io.InputStream;
* @author ruoyi
*/
@Service
@ConditionalOnProperty(name = "file.storage", havingValue = "minio", matchIfMissing = true)
public class MinioSysFileServiceImpl implements ISysFileService {
@Autowired
private MinioConfig minioConfig;
@ -75,18 +73,10 @@ public class MinioSysFileServiceImpl implements ISysFileService {
}
@Override
public String uploadFileByData(String filename, String extension, String out) throws Exception {
try (ByteArrayInputStream in = new ByteArrayInputStream(out.getBytes())) {
public String uploadFileByStream(String filename, String extension, ByteArrayOutputStream out) throws Exception {
try (ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) {
String fileName = FileUploadUtils.extractFilename(filename, extension);
System.out.println("========== MinIO Upload Debug ==========");
System.out.println("原始文件名: " + filename);
System.out.println("传入的扩展名: [" + extension + "]");
System.out.println("生成的文件名: " + fileName);
String contentType = FileUploadUtils.getContentType(extension); // 获取文件类型
System.out.println("获取到的 ContentType: " + contentType);
System.out.println("========================================");
PutObjectArgs args = PutObjectArgs.builder()
.bucket(minioConfig.getBucketName())
.object(fileName)

56
src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
View File

@ -175,73 +175,55 @@ public class FileUploadUtils {
public static String getContentType(String FilenameExtension) {
System.out.println("---------- getContentType Debug ----------");
System.out.println("传入的扩展名参数: [" + FilenameExtension + "]");
System.out.println("扩展名长度: " + (FilenameExtension != null ? FilenameExtension.length() : "null"));
// 统一处理：如果没有点，自动添加点
String extension = FilenameExtension;
if (extension != null && !extension.startsWith(".")) {
extension = "." + extension;
System.out.println("扩展名没有点，自动添加后: [" + extension + "]");
}
if (extension.equalsIgnoreCase(".bmp")) {
if (FilenameExtension.equalsIgnoreCase(".bmp")) {
return "image/bmp";
}
if (extension.equalsIgnoreCase(".gif")) {
if (FilenameExtension.equalsIgnoreCase(".gif")) {
return "image/gif";
}
if (extension.equalsIgnoreCase(".jpeg") ||
extension.equalsIgnoreCase(".jpg") ||
extension.equalsIgnoreCase(".png")) {
if (FilenameExtension.equalsIgnoreCase(".jpeg") ||
FilenameExtension.equalsIgnoreCase(".jpg") ||
FilenameExtension.equalsIgnoreCase(".png")) {
return "image/jpeg";
}
if (extension.equalsIgnoreCase(".html")) {
if (FilenameExtension.equalsIgnoreCase(".html")) {
return "text/html";
}
if (extension.equalsIgnoreCase(".txt")) {
if (FilenameExtension.equalsIgnoreCase(".txt")) {
return "text/plain";
}
if (extension.equalsIgnoreCase(".vsd")) {
if (FilenameExtension.equalsIgnoreCase(".vsd")) {
return "application/vnd.visio";
}
if (extension.equalsIgnoreCase(".pptx") ||
extension.equalsIgnoreCase(".ppt")) {
if (FilenameExtension.equalsIgnoreCase(".pptx") ||
FilenameExtension.equalsIgnoreCase(".ppt")) {
return "application/vnd.ms-powerpoint";
}
if (extension.equalsIgnoreCase(".docx") ||
extension.equalsIgnoreCase(".doc")) {
if (FilenameExtension.equalsIgnoreCase(".docx") ||
FilenameExtension.equalsIgnoreCase(".doc")) {
return "application/msword";
}
if (extension.equalsIgnoreCase(".xml")) {
if (FilenameExtension.equalsIgnoreCase(".xml")) {
return "text/xml";
}
//PDF
if (extension.equalsIgnoreCase(".pdf")) {
if (FilenameExtension.equalsIgnoreCase(".pdf")) {
return "application/pdf";
}
//excel
if (".xls".equalsIgnoreCase(extension)) {
if (".xls".equalsIgnoreCase(FilenameExtension)) {
return "application/vnd.ms-excel";
}
if (".xlsx".equalsIgnoreCase(extension)) {
if (".xlsx".equalsIgnoreCase(FilenameExtension)) {
return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
}
//waypoints 拓恒+大疆的航线文件类型
System.out.println("检查 waypoints 匹配:");
System.out.println(" 与 '.waypoints' 比较: " + extension.equalsIgnoreCase(".waypoints"));
System.out.println(" 与 '.kmz' 比较: " + extension.equalsIgnoreCase(".kmz"));
if (extension.equalsIgnoreCase(".waypoints") ||
extension.equalsIgnoreCase(".kmz")) {
System.out.println("匹配成功! 返回 application/octet-stream");
if (FilenameExtension.equalsIgnoreCase(".waypoints") ||
FilenameExtension.equalsIgnoreCase(".kmz")) {
return "application/octet-stream";
}
System.out.println("未匹配任何类型，返回默认值 application/octet-stream");
System.out.println("------------------------------------------");
return "application/octet-stream";
return "image/jpeg";
}