springboot2+avue
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wujianwei
2025-12-23 9f41c41fc1c60e572c137cd93a6b45b0e05f34e2 
 admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java


@@ -13,6 +13,7 @@


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.http.MediaType;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


@@ -42,6 +43,9 @@


    private ServerConfig serverConfig;




    private static final String FILE_DELIMETER = ",";




    @Value("${custom.upload.network-path}")


    private String networkPath;




    @Autowired


    private RedisCache redisCache;


@@ -111,7 +115,7 @@


            String filePath = RuoYiConfig.getUploadPath();


            // 上传并返回新文件名称


            String fileName = FileUploadUtils.upload(filePath, file);


            String url = serverConfig.getUrl() + fileName;


            String url = networkPath + fileName;


            AjaxResult ajax = AjaxResult.success();


            ajax.put("url", url);


            ajax.put("fileName", fileName);


@@ -133,12 +137,12 @@


            String filePath = RuoYiConfig.getUploadPath();


            // 上传并返回新文件名称


            String fileName = FileUploadUtils.upload(filePath, file);


            String url = serverConfig.getUrl() + fileName;


            String url = networkPath + fileName;


            HashMap<String, Object> stringObjectHashMap = new HashMap<>();


            stringObjectHashMap.put("url", url);


            stringObjectHashMap.put("fileName", fileName);


            stringObjectHashMap.put("newFileName", FileUtils.getName(fileName));


            stringObjectHashMap.put("originalFilename", file.getOriginalFilename());


            stringObjectHashMap.put("name", FileUtils.getName(fileName));


//            stringObjectHashMap.put("newFileName", FileUtils.getName(fileName));


//            stringObjectHashMap.put("originalFilename", file.getOriginalFilename());


            AjaxResult ajax = AjaxResult.success(stringObjectHashMap);




            return ajax;


@@ -167,7 +171,7 @@


            {


                // 上传并返回新文件名称


                String fileName = FileUploadUtils.upload(filePath, file);


                String url = serverConfig.getUrl() + fileName;


                String url = networkPath + fileName;


                urls.add(url);


                fileNames.add(fileName);


                newFileNames.add(FileUtils.getName(fileName));