Merge branch 'master' into pim_meet

buhuazhen

7 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

 src/main/java/com/ruoyi/project/common/CommonController.java

@@ -5,6 +5,11 @@
import java.util.List;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import com.ruoyi.basic.service.StorageBlobService;

import com.ruoyi.framework.web.domain.R;

import io.swagger.annotations.Api;

import io.swagger.annotations.ApiOperation;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

@@ -27,6 +32,7 @@
 * 

 * @author ruoyi

 */

@Api(tags = "通用接口")

@RestController

@RequestMapping("/common")

public class CommonController

@@ -69,6 +75,20 @@
        }

    }



    @Autowired

    private StorageBlobService storageBlobService;





    /**

     * minio通用上传请求（多个）

     */

    @PostMapping("/minioUploads")

    @ApiOperation(value = "minio通用上传请求")

    public AjaxResult minioUploadFiles(List<MultipartFile> files, String bucketName, Long type) throws Exception

    {

        return AjaxResult.success(storageBlobService.updateStorageBlobs(files, bucketName,type));

    }



    /**

     * 通用上传请求（单个）

     */