huminmin
2026-04-25 3804a77bf599e619426255cbaff100e2d4cf4e73
src/main/java/com/ruoyi/project/common/CommonController.java
@@ -3,10 +3,9 @@
import com.ruoyi.basic.service.StorageBlobService;
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.slf4j.Logger;
@@ -29,16 +28,13 @@
 *
 * @author ruoyi
 */
@Api(tags = "通用接口")
@Tag(name = "通用接口")
@AllArgsConstructor
@RestController
@RequestMapping("/common")
public class CommonController {
    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
    private ServerConfig serverConfig;
    private static final String FILE_DELIMETER = ",";
    private final StorageBlobService storageBlobService;
    private final FileUtil fileUtil;
@@ -77,16 +73,6 @@
//    }
//
//    /**
//     * minio通用上传请求(多个)
//     */
//    @PostMapping("/minioUploads")
//    @ApiOperation(value = "minio通用上传请求")
//    public AjaxResult minioUploadFiles(List<MultipartFile> files, String bucketName, Long type) throws Exception
//    {
//        return AjaxResult.success();
//    }
//
//    /**
//     * 通用上传请求(单个)
//     */
//    @PostMapping("/upload")
@@ -104,43 +90,6 @@
//            ajax.put("fileName", fileName);
//            ajax.put("newFileName", FileUtils.getName(fileName));
//            ajax.put("originalFilename", file.getOriginalFilename());
//            return ajax;
//        }
//        catch (Exception e)
//        {
//            return AjaxResult.error(e.getMessage());
//        }
//    }
//
//    /**
//     * 通用上传请求(多个)
//     */
//    @PostMapping("/uploads")
//    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
//    {
//        try
//        {
//            // 上传文件路径
//            String filePath = RuoYiConfig.getUploadPath();
//            List<String> urls = new ArrayList<String>();
//            List<String> fileNames = new ArrayList<String>();
//            List<String> newFileNames = new ArrayList<String>();
//            List<String> originalFilenames = new ArrayList<String>();
//            for (MultipartFile file : files)
//            {
//                // 上传并返回新文件名称
//                String fileName = FileUploadUtils.upload(filePath, file);
//                String url = serverConfig.getUrl() + fileName;
//                urls.add(url);
//                fileNames.add(fileName);
//                newFileNames.add(FileUtils.getName(fileName));
//                originalFilenames.add(file.getOriginalFilename());
//            }
//            AjaxResult ajax = AjaxResult.success();
//            ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
//            ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
//            ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
//            ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
//            return ajax;
//        }
//        catch (Exception e)
@@ -178,7 +127,7 @@
//        }
//    }
    @PostMapping({"/upload"})
    @ApiOperation(value = "文件上传")
    @Operation(summary = "文件上传")
    public R upload(@RequestParam("files") List<MultipartFile> files) throws Exception {
        return R.ok(storageBlobService.upload(files));
    }