新增日志

wujianwei

2025-12-23 9f41c41fc1c60e572c137cd93a6b45b0e05f34e2

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

@@ -1,7 +1,9 @@
package com.ruoyi.web.controller.common;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@@ -11,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;
@@ -40,6 +43,9 @@
    private ServerConfig serverConfig;

    private static final String FILE_DELIMETER = ",";

    @Value("${custom.upload.network-path}")
    private String networkPath;

    @Autowired
    private RedisCache redisCache;
@@ -109,12 +115,36 @@
            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);
            ajax.put("newFileName", FileUtils.getName(fileName));
            ajax.put("originalFilename", file.getOriginalFilename());
            return ajax;
        }
        catch (Exception e)
        {
            return AjaxResult.error(e.getMessage());
        }
    }
    @PostMapping("/upload2")
    public AjaxResult uploadFile2(MultipartFile file) throws Exception
    {
        try
        {
            // 上传文件路径
            String filePath = RuoYiConfig.getUploadPath();
            // 上传并返回新文件名称
            String fileName = FileUploadUtils.upload(filePath, file);
            String url = networkPath + fileName;
            HashMap<String, Object> stringObjectHashMap = new HashMap<>();
            stringObjectHashMap.put("url", url);
            stringObjectHashMap.put("name", FileUtils.getName(fileName));
//            stringObjectHashMap.put("newFileName", FileUtils.getName(fileName));
//            stringObjectHashMap.put("originalFilename", file.getOriginalFilename());
            AjaxResult ajax = AjaxResult.success(stringObjectHashMap);

            return ajax;
        }
        catch (Exception e)
@@ -141,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));