Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-05 11b6cfb2d3312b018b68eecadc798dfa3e2ec6db

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/FileController.java

File was renamed from ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/FileController.java
@@ -1,6 +1,6 @@
package com.ruoyi.chargingPile.controller;
package com.ruoyi.account.controller;

import com.ruoyi.chargingPile.config.FileUploadConfig;
import com.ruoyi.account.config.FileUploadConfig;
import com.ruoyi.common.core.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,7 +37,6 @@
        }
        String TimeDir =new SimpleDateFormat("yyyy-MM-dd").format(new Date());
        String realPath = fileUploadConfig.getLocation() + TimeDir;
//        String realPath = "D:\\file\\" + TimeDir;
        File file = new File(realPath);
        // 没有目录就创建
        if (!file.exists()) {
@@ -57,7 +56,6 @@
        mf.transferTo(targetFile);
        //拼接数据
        String imgstr = fileUploadConfig.getAccessPath() + TimeDir +"/"+ filename;
//        String imgstr = TimeDir +"/"+ filename;
        return AjaxResult.success(imgstr);
    }