zqy
5 天以前 b02beccf4567068cb47a3f1181a00039456c872d
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.service.DownLoadFileService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -100,6 +101,7 @@
//            log.error("下载文件失败", e);
//        }
//    }
@Anonymous
    @GetMapping("/downLoadFile")
    public void downLoadFile(@PathParam("path") String path, HttpServletResponse response) throws Exception {
@@ -111,14 +113,14 @@
     * 通用上传请求(单个)
     */
    @PostMapping("/upload")
    public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file) throws Exception
    public AjaxResult uploadFile(@RequestParam("uploadFile") MultipartFile file,String fname) throws Exception
    {
        try
        {
            // 上传文件路径
            String filePath = RuoYiConfig.getUploadPath();
            // 上传并返回新文件名称
            String fileName = FileUploadUtils.upload(filePath, file);
            String fileName = FileUploadUtils.upload(filePath, file,fname);
            String url = serverConfig.getUrl() + fileName;
            AjaxResult ajax = AjaxResult.success();
@@ -143,8 +145,9 @@
     * 通用上传请求(多个)
     */
    @PostMapping("/uploads")
    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
    public AjaxResult uploadFiles(@RequestParam("files")  List<MultipartFile> files) throws Exception
    {
        //System.out.println("99999999999999999999999990000000000000000");
        try
        {
            // 上传文件路径
@@ -153,10 +156,17 @@
            List<String> fileNames = new ArrayList<String>();
            List<String> newFileNames = new ArrayList<String>();
            List<String> originalFilenames = new ArrayList<String>();
           // System.out.println("99999999999999999999999990000000000000000");
          //  System.out.println(files);
          //  System.out.println(files.size());
            for (MultipartFile file : files)
            {
                // 上传并返回新文件名称
                String fileName = FileUploadUtils.upload(filePath, file);
                String filename = "";
             //   System.out.println("1122123330+++++++++++++++++++++++++++++");
                String fileName = FileUploadUtils.upload(filePath, file, filename);
                String url = serverConfig.getUrl() + fileName;
                urls.add(url);
                fileNames.add(fileName);
@@ -164,10 +174,13 @@
                originalFilenames.add(file.getOriginalFilename());
            }
            AjaxResult ajax = AjaxResult.success();
          //  System.out.println("99999999999999999999999990000000000000000");
            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));
          //  System.out.println("1122123330+++++++++++++++++++++++++++++");
            return ajax;
        }
        catch (Exception e)