修改了bug

feige

2024-11-05 72f21494ba48e573e68007eab2296f8c25ecc4b7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -111,14 +111,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 +143,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 +154,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 +172,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)